Skip to content

Commit 722a2ad

Browse files
committed
Use new --bless option of run-tests.php
1 parent bf979a4 commit 722a2ad

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

appveyor/test_task.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,14 @@ mkdir c:\tests_tmp
112112
set TEST_PHP_JUNIT=c:\junit.out.xml
113113

114114
cd "%APPVEYOR_BUILD_FOLDER%"
115-
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%"
115+
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%"
116116

117117
set EXIT_CODE=%errorlevel%
118118

119119
appveyor PushArtifact %TEST_PHP_JUNIT%
120120

121121
if %EXIT_CODE% GEQ 1 (
122122
git checkout .
123-
nmake run ARGS="scripts\dev\bless_tests.php ."
124123
git diff > bless_tests.patch
125124
appveyor PushArtifact bless_tests.patch
126125
)

scripts/dev/bless_tests.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
$phpt = file_get_contents($path);
2222
$out = file_get_contents($outPath);
2323

24-
if (false !== strpos($phpt, '--XFAIL--') || preg_match('/die\([\'"]xfail/', $phpt)) {
24+
if (false !== strpos($phpt, '--XFAIL--')) {
2525
// Don't modify expected output of XFAIL tests
2626
continue;
2727
}

0 commit comments

Comments
 (0)