Try 3

xdebug · Dec 3, 2017 · 9ef2c75 · 9ef2c75
1 parent 284160c
commit 9ef2c75
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.appveyor/build_task.cmd b/.appveyor/build_task.cmd
@@ -46,9 +46,9 @@ setlocal enableextensions enabledelayedexpansion
 	set SKIP_IPV6_TESTS=1
 	set REPORT_EXIT_STATUS=1
 	echo !TEST_PHP_EXECUTABLE! !TEST_PHP_ARGS! -v
-	echo !TEST_PHP_EXECUTABLE! -n run-tests.php -q -x --show-diff %APPVEYOR_BUILD_FOLDER%\ext\xdebug\tests
+	echo !TEST_PHP_EXECUTABLE! -n run-tests.php -q -x --show-diff %APPVEYOR_BUILD_FOLDER%\xdebug\tests
 	!TEST_PHP_EXECUTABLE! !TEST_PHP_ARGS! -v
-	!TEST_PHP_EXECUTABLE! -n run-tests.php -q -x --show-diff %APPVEYOR_BUILD_FOLDER%\ext\xdebug\tests
+	!TEST_PHP_EXECUTABLE! -n run-tests.php -q -x --show-diff %APPVEYOR_BUILD_FOLDER%\xdebug\tests
 
 	set EXIT_CODE=%errorlevel%
 	powershell -Command "$wc = New-Object 'System.Net.WebClient'; $wc.UploadFile('https://ci.appveyor.com/api/testresults/junit/%APPVEYOR_JOB_ID%', 'c:\tests_tmp\tests.junit.xml')"

diff --git a/.appveyor/install.cmd b/.appveyor/install.cmd
@@ -51,9 +51,10 @@ setlocal enableextensions enabledelayedexpansion
 		for /f "delims=" %%l in (php_xdebug.h) do (
 			if not "%%l"=="" (
 				set line=%%l
-				echo Line: !line:~9,22!
-				if "!line:~9,22!"=="XDEBUG_VERSION" (
-					set APPVEYOR_REPO_TAG_NAME=!line:~23,-1!-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT:~0,8%
+				echo Line: !line:~8,13!
+				if "!line:~8,13!"=="XDEBUG_VERSION" (
+					echo Line: !line:~26,~1!
+					set APPVEYOR_REPO_TAG_NAME=!line:~26,-1!-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT:~0,8%
 				)
 			)
 		)