Commit: 94eb81a9e90be9f8ad1f576d9bf043e7952cc81a Author: Dale Hirt <daleh...@microsoft.com> Thu, 14 Nov 2019 10:58:57 -0800 Committer: Christoph M. Becker <cmbecke...@gmx.de> Fri, 15 Nov 2019 09:56:45 +0100 Parents: fea34403b052f966fe795268d1e8d28b27c50499 Branches: master
Link: http://git.php.net/?p=pftt2.git;a=commitdiff;h=94eb81a9e90be9f8ad1f576d9bf043e7952cc81a Log: Moving PHP_BUILDS environmental variable declaration to set_env.cmd. Make sure we are only using environmental variable. Changed paths: M bin/auto_test_snap.cmd M bin/get_qa.cmd M bin/get_release.cmd M bin/get_snapshot.cmd M bin/set_env.cmd M bin/test_qa.cmd M bin/test_release.cmd Diff: diff --git a/bin/auto_test_snap.cmd b/bin/auto_test_snap.cmd index 94852405..96d037ed 100644 --- a/bin/auto_test_snap.cmd +++ b/bin/auto_test_snap.cmd @@ -6,10 +6,8 @@ IF DEFINED PFTT_SHELL GOTO :skip_set_env CALL %~dp0set_env.cmd :skip_set_env -SET PHP_BUILDS=%~d0\PHPBuilds - if not exist %PHP_BUILDS% ( - md %~d0\PHPBuilds + md %PHP_BUILDS% ) SET branch[0]=7.1 diff --git a/bin/get_qa.cmd b/bin/get_qa.cmd index ea326930..513e49df 100644 --- a/bin/get_qa.cmd +++ b/bin/get_qa.cmd @@ -28,11 +28,10 @@ IF DEFINED PFTT_SHELL GOTO :skip_set_env CALL %~dp0set_env.cmd :skip_set_env -SET PHP_BUILDS=%~d0\PHPBuilds - REM Create cache folder if it does not exist if not exist %PHP_BUILDS% ( - md %~d0\PHPBuilds + md %PHP_BUILDS% + ) if not exist %PFTT_CACHE% ( diff --git a/bin/get_release.cmd b/bin/get_release.cmd index e2f1dfbe..0e79acd9 100644 --- a/bin/get_release.cmd +++ b/bin/get_release.cmd @@ -28,11 +28,9 @@ IF DEFINED PFTT_SHELL GOTO :skip_set_env CALL %~dp0set_env.cmd :skip_set_env -SET PHP_BUILDS=%~d0\PHPBuilds - REM Create cache folder if it does not exist if not exist %PHP_BUILDS% ( - md %~d0\PHPBuilds + md %PHP_BUILDS% ) if not exist %PFTT_CACHE% ( diff --git a/bin/get_snapshot.cmd b/bin/get_snapshot.cmd index 0f29795c..551dbc6e 100644 --- a/bin/get_snapshot.cmd +++ b/bin/get_snapshot.cmd @@ -31,11 +31,9 @@ IF DEFINED PFTT_SHELL GOTO :skip_set_env CALL %~dp0set_env.cmd :skip_set_env -SET PHP_BUILDS=%~d0\PHPBuilds - REM Create cache folder if it does not exist if not exist %PHP_BUILDS% ( - md %~d0\PHPBuilds + md %PHP_BUILDS% ) if not exist %PFTT_CACHE% ( diff --git a/bin/set_env.cmd b/bin/set_env.cmd index 1c5e8fbd..7a9ef114 100644 --- a/bin/set_env.cmd +++ b/bin/set_env.cmd @@ -1,5 +1,7 @@ @ECHO OFF +SET PHP_BUILDS=%~d0\PHPBuilds + pushd %~dp0.. SET PFTT_ROOT_DIR=%CD% SET PFTT_HOME=%CD% diff --git a/bin/test_qa.cmd b/bin/test_qa.cmd index 77598557..e4163821 100644 --- a/bin/test_qa.cmd +++ b/bin/test_qa.cmd @@ -33,9 +33,6 @@ SET thread[2]=TS SET thread[3]=TS set test_pack=php-test-pack-%branch% -SET PHP_BUILDS=%~d0\PHPBuilds - - for /L %%j in (0,1,3) do ( call %~dp0get_qa.cmd %branch% !thread[%%j]! !cpu[%%j]! diff --git a/bin/test_release.cmd b/bin/test_release.cmd index f8621195..c53ba5b7 100644 --- a/bin/test_release.cmd +++ b/bin/test_release.cmd @@ -33,8 +33,6 @@ SET thread[2]=TS SET thread[3]=TS set test_pack=php-test-pack-%branch%-latest -SET PHP_BUILDS=%~d0\PHPBuilds - if %branch%==7.1 ( set build=vc14 ) else (
