diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-27 11:20:48 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-27 11:20:48 +0200 |
| commit | 31ff9f3e2910b9cba35ed5a0706019b6546ce2a5 (patch) | |
| tree | 7e0550c37d342ea9085a92eac2b0c0ed124e606d | |
| parent | aa02c259f8c6f435a7ce41a030ee0f0f1b37ef23 (diff) | |
| parent | f2826954ac178fadbd2a0bb67f7f2e7ee5316e90 (diff) | |
| download | php-git-31ff9f3e2910b9cba35ed5a0706019b6546ce2a5.tar.gz | |
Merge branch 'PHP-7.4'
| -rw-r--r-- | azure/community_job.yml | 2 | ||||
| -rw-r--r-- | sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/azure/community_job.yml b/azure/community_job.yml index d785705d3d..be6c9837de 100644 --- a/azure/community_job.yml +++ b/azure/community_job.yml @@ -17,6 +17,8 @@ jobs: timeoutInMinutes: ${{ parameters.timeoutInMinutes }} pool: vmImage: 'ubuntu-latest' + variables: + ubsan_options: 'print_stacktrace=1' steps: - template: apt.yml - script: | diff --git a/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt b/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt index 376a972bac..22f2dd1600 100644 --- a/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt +++ b/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt @@ -2,6 +2,8 @@ FPM: Buffered worker output decorated log with multiple continuous messages (stdout/stderr mixed) --SKIPIF-- <?php include "skipif.inc"; ?> +--XFAIL-- +Fails regularly due to log line termination bug --FILE-- <?php |