From 9136a4e31f3a2a1bcd546cee1dae5a1d3f48b09f Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Wed, 23 Oct 2024 22:03:53 +0200
Subject: [PATCH] test

---
 .github/workflows/push.yml |  6 +++---
 Zend/zend_portability.h    |  2 +-
 ext/spl/tests/gh14639.phpt | 14 --------------
 tests/lang/bug45392.phpt   |  8 --------
 4 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 684934c7073ee..1e2392a993a5b 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -41,7 +41,7 @@ env:
   CXX: ccache g++
 jobs:
   LINUX_X64:
-    if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
+    if: false
     services:
       mysql:
         image: mysql:8.3
@@ -137,7 +137,7 @@ jobs:
         if: ${{ !matrix.asan }}
         uses: ./.github/actions/verify-generated-files
   LINUX_X32:
-    if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
+    if: false
     name: LINUX_X32_DEBUG_ZTS
     runs-on: ubuntu-latest
     timeout-minutes: 50
@@ -183,7 +183,7 @@ jobs:
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
   MACOS_DEBUG_NTS:
-    if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
+    if: false
     strategy:
       fail-fast: false
       matrix:
diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
index f4609428326c7..cdb0515eb4812 100644
--- a/Zend/zend_portability.h
+++ b/Zend/zend_portability.h
@@ -400,7 +400,7 @@ char *alloca();
 # define JMP_BUF sigjmp_buf
 #else
 # define SETJMP(a) setjmp(a)
-# define LONGJMP(a,b) longjmp(a, b)
+# define LONGJMP(a,b) do{((_JUMP_BUFFER*)&a)->Frame=0;longjmp(a, b);}while(0)
 # define JMP_BUF jmp_buf
 #endif
 
diff --git a/ext/spl/tests/gh14639.phpt b/ext/spl/tests/gh14639.phpt
index 520ee20839c28..8b230f5b4462b 100644
--- a/ext/spl/tests/gh14639.phpt
+++ b/ext/spl/tests/gh14639.phpt
@@ -2,20 +2,6 @@
 GH-14639 (Member access within null pointer in ext/spl/spl_observer.c)
 --INI--
 memory_limit=2M
---SKIPIF--
-<?php
-if (getenv("USE_ZEND_ALLOC") === "0") {
-    die("skip Zend MM disabled");
-}
-$tracing = extension_loaded("Zend OPcache")
-    && ($conf = opcache_get_configuration()["directives"])
-    && array_key_exists("opcache.jit", $conf)
-    &&  $conf["opcache.jit"] === "tracing";
-if (PHP_OS_FAMILY === "Windows" && PHP_INT_SIZE == 8 && $tracing) {
-    $url = "https://github.com/php/php-src/pull/14919#issuecomment-2259003979";
-    die("xfail Test fails on Windows x64 (VS17) and tracing JIT; see $url");
-}
-?>
 --FILE--
 <?php
 $b = new SplObjectStorage();
diff --git a/tests/lang/bug45392.phpt b/tests/lang/bug45392.phpt
index f470f2ccddbd7..27e3e994b64d9 100644
--- a/tests/lang/bug45392.phpt
+++ b/tests/lang/bug45392.phpt
@@ -5,14 +5,6 @@ Bug #45392 (ob_start()/ob_end_clean() and memory_limit)
 if (getenv("USE_ZEND_ALLOC") === "0") {
     die("skip Zend MM disabled");
 }
-$tracing = extension_loaded("Zend OPcache")
-    && ($conf = opcache_get_configuration()["directives"])
-    && array_key_exists("opcache.jit", $conf)
-    &&  $conf["opcache.jit"] === "tracing";
-if (PHP_OS_FAMILY === "Windows" && PHP_INT_SIZE == 8 && $tracing) {
-    $url = "https://github.com/php/php-src/pull/14919#issuecomment-2259003979";
-    die("xfail Test fails on Windows x64 (VS17) and tracing JIT; see $url");
-}
 ?>
 --FILE--
 <?php