]> granicus.if.org Git - php/commitdiff
Increase timeout on asan job
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 30 Jul 2020 07:54:51 +0000 (09:54 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 30 Jul 2020 07:59:08 +0000 (09:59 +0200)
We now also run tests with function JIT here, which makes this
slower.

Probably, this job should be split up into asan and ubsan, and
possibly run with optimization.

[ci skip]

azure-pipelines.yml
azure/community_job.yml

index f8af8e4db4e26a5b182382545648ba2fd7d38e83..8b466508608dd2233939cb4ca8dba1d8b6db35b1 100644 (file)
@@ -69,7 +69,7 @@ jobs:
             CFLAGS='-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC'
             LDFLAGS='-fsanitize=undefined,address'
         runTestsParameters: --asan
-        timeoutInMinutes: 210
+        timeoutInMinutes: 240
     - template: azure/msan_job.yml
       parameters:
         configurationName: DEBUG_ZTS_MSAN
index 450eb1cfc4b0590caed44bdea2ab1a0e55b640c3..e7b99cd37486938ca962c785b348f3fb66c0b624 100644 (file)
@@ -59,7 +59,7 @@ jobs:
         sed -i "s/function_exists('pcntl_fork')/false/" tests/Filesystem/FilesystemTest.php
         # Work around PHP 8 incompatibility in Doctrine
         sed -i 's/function query()/function query(...$args)/' vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOConnection.php
-        sed -i 's/function setFetchMode($fetchMode, $arg2 = null, $arg3 = null)/setFetchMode($fetchMode, $arg2 = null, $arg3 = null, ...$args)/' vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOStatement.php
+        sed -i 's/function setFetchMode($fetchMode, $arg2 = null, $arg3 = null)/function setFetchMode($fetchMode, $arg2 = null, $arg3 = null, ...$args)/' vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOStatement.php
         sed -i 's/public function getMessage();//' vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/DriverException.php
         php vendor/bin/phpunit
       displayName: 'Test Laravel'