From 722a2ada6c0158cf92affc808ee879cf353c4be3 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sat, 17 Jul 2021 13:45:56 +0200 Subject: [PATCH] Use new --bless option of run-tests.php --- appveyor/test_task.bat | 3 +-- scripts/dev/bless_tests.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/appveyor/test_task.bat b/appveyor/test_task.bat index 5f3a2c7b6f2c3..f91355944cc2d 100644 --- a/appveyor/test_task.bat +++ b/appveyor/test_task.bat @@ -112,7 +112,7 @@ mkdir c:\tests_tmp set TEST_PHP_JUNIT=c:\junit.out.xml cd "%APPVEYOR_BUILD_FOLDER%" -nmake test TESTS="%OPCACHE_OPTS% -q --offline --show-diff --show-slow 1000 --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp %PARALLEL%" +nmake test TESTS="%OPCACHE_OPTS% -q --offline --show-diff --show-slow 1000 --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp --bless %PARALLEL%" set EXIT_CODE=%errorlevel% @@ -120,7 +120,6 @@ appveyor PushArtifact %TEST_PHP_JUNIT% if %EXIT_CODE% GEQ 1 ( git checkout . - nmake run ARGS="scripts\dev\bless_tests.php ." git diff > bless_tests.patch appveyor PushArtifact bless_tests.patch ) diff --git a/scripts/dev/bless_tests.php b/scripts/dev/bless_tests.php index fd76132827ba2..fa49647fcf480 100755 --- a/scripts/dev/bless_tests.php +++ b/scripts/dev/bless_tests.php @@ -21,7 +21,7 @@ $phpt = file_get_contents($path); $out = file_get_contents($outPath); - if (false !== strpos($phpt, '--XFAIL--') || preg_match('/die\([\'"]xfail/', $phpt)) { + if (false !== strpos($phpt, '--XFAIL--')) { // Don't modify expected output of XFAIL tests continue; }