Skip to content
This repository was archived by the owner on Aug 15, 2024. It is now read-only.

Fixes #59: Updated scripts to tests snapshots better #65

Closed
lavturo wants to merge 2 commits into from
Closed

Fixes #59: Updated scripts to tests snapshots better #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ffa3b0
Fixes #59: Updated scripts to tests snapshots better
lavturo Aug 29, 2019
12ca87e
Fixes #59: Minor change
lavturo Aug 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified bin/PHP Snapshot Test.xml
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions bin/auto_test_snap.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ SET thread[3]=TS
SET vc[0]=vc14
SET vc[1]=vc15
SET vc[2]=vc15
SET vc[3]=vs16
SET vc[3]=vc15

REM Check php-7.1 for new snap builds
for /L %%i in (0,1,3) do (
Expand All @@ -44,7 +44,7 @@ for /L %%i in (0,1,3) do (
REM If the build does not exist, fetch and test it
if not exist %PHP_BUILDS%\!build[%%j]! (
call %~dp0get_snapshot.cmd !branch! !thread[%%j]! !cpu[%%j]! !revision!
call %~dp0pftt.cmd core_list %PHP_BUILDS%\!build[%%j]! %PHP_BUILDS%\!test_pack[%%j]! %PFTT_HOME%\tests-to-run.txt
call %~dp0pftt.cmd -results_only core_list %PHP_BUILDS%\!build[%%j]! %PHP_BUILDS%\!test_pack[%%j]! %PFTT_HOME%\tests-to-run.txt
) else (
echo Build already exists: !build[%%j]!
)
Expand Down
11 changes: 2 additions & 9 deletions bin/get_qa.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,9 @@ set test_pack=php-test-pack-%branch%

REM Add nts to file_name if needed
if /I %build%==nts (
set file_name=%file_name%-nts
)

REM Set file_name based on parameters
if not x%branch:7.2=%==x%branch% (
set file_name=%file_name%-win32-vc15-%cpu%
) else if not x%branch:7.3=%==x%branch% (
set file_name=%file_name%-nts-win32-vc15-%cpu%
) else (
set file_name=%file_name%-win32-vc15-%cpu%
) else if not x%branch:7.4=%==x%branch% (
set file_name=%file_name%-win32-vs16-%cpu%
)

REM Download the build if it is not available
Expand Down
6 changes: 1 addition & 5 deletions bin/get_release.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,8 @@ if /I %build%==nts (
REM Set file_name based on parameters
if %branch%==7.1 (
set file_name=%file_name%-win32-vc14-%cpu%-latest
) else if %branch%==7.2 (
set file_name=%file_name%-win32-vc15-%cpu%-latest
) else if %branch%==7.3 (
) else (
set file_name=%file_name%-win32-vc15-%cpu%-latest
) else if %branch%==7.4 (
set file_name=%file_name%-win32-vs16-%cpu%-latest
)

REM Download the build if it is not available
Expand Down
8 changes: 1 addition & 7 deletions bin/get_snapshot.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,9 @@ REM Set file_name and test_pack based on parameters
if %branch%==7.1 (
set file_name=php-%branch%-%build%-windows-vc14-%cpu%
set test_pack=php-test-pack-%branch%-%build%-windows-vc14-%cpu%
) else if %branch%==7.2 (
set file_name=php-%branch%-%build%-windows-vc15-%cpu%
set test_pack=php-test-pack-%branch%-%build%-windows-vc15-%cpu%
) else if %branch%==7.3 (
) else (
set file_name=php-%branch%-%build%-windows-vc15-%cpu%
set test_pack=php-test-pack-%branch%-%build%-windows-vc15-%cpu%
) else if %branch%==7.4 (
set file_name=php-%branch%-%build%-windows-vs16-%cpu%
set test_pack=php-test-pack-%branch%-%build%-windows-vs16-%cpu%
)

if /i %revision%==latest call get_latest_revision.cmd
Expand Down
2 changes: 2 additions & 0 deletions bin/pftt2_release.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ if exist %PFTT_BUILD% (
xcopy /s /i "%PFTT_BIN%" "%PFTT_RELEASE%\bin"
xcopy /s /i "%PFTT_CONF%" "%PFTT_RELEASE%\conf"
xcopy /s /i "%PFTT_LIB%" "%PFTT_RELEASE%\lib"

copy "%PFTT_HOME%\tests-to-run.txt" "%PFTT_RELEASE%"

REM Create pftt2.jar in lib of the package
jar cf pftt2.jar -C %PFTT_BUILD% com %PFTT_BUILD%\org\columba %PFTT_BUILD%\org\kxml2 %PFTT_BUILD%\org\incava
Expand Down
55 changes: 55 additions & 0 deletions bin/test_release.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
@ECHO OFF
setlocal enabledelayedexpansion

set branch=%1

REM Check if parameters are set
if %branch%.==. (
GOTO args_error
) else (
GOTO set_env
)


:args_error
echo User error: must specify branch
echo test_release "<branch>"
echo Branch can be any of: 7.1, 7.2, 7.3, 7.4
exit /b

:set_env
REM set important env vars
IF DEFINED PFTT_SHELL GOTO :skip_set_env
CALL %~dp0set_env.cmd
:skip_set_env

SET cpu[0]=x64
SET cpu[1]=x86
SET cpu[2]=x64
SET cpu[3]=x86
SET thread[0]=NTS
SET thread[1]=NTS
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 (
set build=vc15
)

for /L %%j in (0,1,3) do (
call %~dp0get_release.cmd %branch% !thread[%%j]! !cpu[%%j]!

if !thread[%%j]!==NTS (
set file_name=php-%branch%-!thread[%%j]!-win32-%build%-!cpu[%%j]!-latest
) else (
set file_name=php-%branch%-win32-%build%-!cpu[%%j]!-latest
)

call %~dp0pftt.cmd -results_only core_list %PHP_BUILDS%\!file_name! %PHP_BUILDS%\%test_pack% %PFTT_HOME%\tests-to-run.txt
call %~dp0pftt.cmd -config opcache -results_only core_list %PHP_BUILDS%\!file_name! %PHP_BUILDS%\%test_pack% %PFTT_HOME%\tests-to-run.txt
)