summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-07-30 09:54:51 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-07-30 09:59:08 +0200
commit849c7415b5ee42a2a56be62404bf9fb07a5a630d (patch)
tree9e1500832be8d56713c9ebe7681ce0e894f55fce
parente8c4ae83cb6652833e0cfcd8b3f3567c7c4c7539 (diff)
downloadphp-git-849c7415b5ee42a2a56be62404bf9fb07a5a630d.tar.gz
Increase timeout on asan job
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]
-rw-r--r--azure-pipelines.yml2
-rw-r--r--azure/community_job.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f8af8e4db4..8b46650860 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -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
diff --git a/azure/community_job.yml b/azure/community_job.yml
index 450eb1cfc4..e7b99cd374 100644
--- a/azure/community_job.yml
+++ b/azure/community_job.yml
@@ -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'