Use new --bless option of run-tests.php

php · Jul 17, 2021 · 722a2ad · 722a2ad
1 parent bf979a4
commit 722a2ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/appveyor/test_task.bat b/appveyor/test_task.bat
@@ -112,15 +112,14 @@ 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%
 
 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
@@ -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;
     }