Enable STACK_LIMIT_DEFAULTS_CHECK in CI

php · Dec 9, 2022 · ad5fe4c · ad5fe4c
1 parent e2f97eb
commit ad5fe4c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -28,6 +28,7 @@ environment:
         #PDO_MYSQL_TEST_PASS: Password12!
         #PGSQL_TEST_CONNSTR: "host=127.0.0.1 dbname=test port=5432 user=postgres password=Password12!"
         #PDO_PGSQL_TEST_DSN: "pgsql:host=127.0.0.1 port=5432 dbname=test user=postgres password=Password12!"
+        STACK_LIMIT_DEFAULTS_CHECK: 1
         #build permutations
         matrix:
                 - THREAD_SAFE: 0

diff --git a/.cirrus.yml b/.cirrus.yml
@@ -201,4 +201,5 @@ freebsd_task:
   tests_script:
     - export SKIP_IO_CAPTURE_TESTS=1
     - export CI_NO_IPV6=1
+    - export STACK_LIMIT_DEFAULTS_CHECK=1
     - sapi/cli/php run-tests.php -P -q -j2 -g FAIL,BORK,LEAK,XLEAK --no-progress --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so
diff --git a/.github/actions/test-linux/action.yml b/.github/actions/test-linux/action.yml
@@ -30,6 +30,7 @@ runs:
         export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8"
         export SKIP_IO_CAPTURE_TESTS=1
         export TEST_PHP_JUNIT=junit.out.xml
+        export STACK_LIMIT_DEFAULTS_CHECK=1
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
           -j$(/usr/bin/nproc) \
           -g FAIL,BORK,LEAK,XLEAK \

diff --git a/.github/actions/test-macos/action.yml b/.github/actions/test-macos/action.yml
@@ -15,6 +15,7 @@ runs:
         export SKIP_IO_CAPTURE_TESTS=1
         export CI_NO_IPV6=1
         export TEST_PHP_JUNIT=junit.out.xml
+        export STACK_LIMIT_DEFAULTS_CHECK=1
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
           -j$(sysctl -n hw.ncpu) \
           -g FAIL,BORK,LEAK,XLEAK \

diff --git a/Zend/tests/stack_limit/stack_limit_010.phpt b/Zend/tests/stack_limit/stack_limit_010.phpt
@@ -19,7 +19,10 @@ $expectedMaxSize = match(php_uname('s')) {
         'amd64' => 512*1024*1024 - 4096,
         'i386' => 64*1024*1024 - 4096,
     },
-    'Linux' => 8*1024*1024,
+    'Linux' => match (getenv('GITHUB_ACTIONS')) {
+        'true' => 16*1024*1024, // https://github.com/actions/runner-images/pull/3328
+        default => 8*1024*1024,
+    },
     'Windows NT' => 67108864 - 4*4096, // Set by sapi/cli/config.w32
 };