From 39c5188adc149e8411e1997d88e1832f6e9d4399 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 28 Feb 2017 17:05:01 -0800 Subject: [PATCH] Allow user to zip tests even when not building against packages Commit migrated from https://github.com/dotnet/coreclr/commit/1a3918cc9944c68b1b68b6a0c255a4c01860f138 --- src/coreclr/build-test.cmd | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd index a214aef..b766c17 100644 --- a/src/coreclr/build-test.cmd +++ b/src/coreclr/build-test.cmd @@ -31,9 +31,9 @@ set "__args= %*" set processedArgs= set __unprocessedBuildArgs= set __RunArgs= -set __BuildAgainstPackages= set __BuildAgainstPackagesArg= set __RuntimeId= +set __ZipTests= :Arg_Loop if "%1" == "" goto ArgsDone @@ -54,9 +54,10 @@ if /i "%1" == "checked" (set __BuildType=Checked&set processedArgs if /i "%1" == "skipmanaged" (set __SkipManaged=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "updateinvalidpackages" (set __UpdateInvalidPackagesArg=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "toolset_dir" (set __ToolsetDir=%2&set __PassThroughArgs=%__PassThroughArgs% %2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) -if /i "%1" == "buildagainstpackages" (set __BuildAgainstPackages=1&set __BuildAgainstPackagesArg=-BuildTestsAgainstPackages&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) +if /i "%1" == "buildagainstpackages" (set __ZipTests=1&set __BuildAgainstPackagesArg=-BuildTestsAgainstPackages&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) +if /i "%1" == "ziptests" (set __ZipTests=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "runtimeid" (set __RuntimeId=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) -if /i "%1" == "Exclude" (set __Exclude=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) +if /i "%1" == "Exclude" (set __Exclude=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) if [!processedArgs!]==[] ( call set __UnprocessedBuildArgs=!__args! @@ -195,7 +196,7 @@ set __msbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%" set "__TestWorkingDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildType%" -if not defined __BuildAgainstPackages goto SkipRestoreProduct +if not defined __BuildAgainstPackagesArg goto SkipRestoreProduct REM ========================================================================================= REM === REM === Restore product binaries from packages @@ -322,7 +323,7 @@ if errorlevel 1 ( exit /b 1 ) -if not defined __BuildAgainstPackages goto SkipPrepForPublish +if not defined __ZipTests goto SkipPrepForPublish set __BuildLogRootName=Helix_Prep set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log @@ -376,6 +377,7 @@ echo rhel.7-x64: Builds overlay for RHEL 7 or CentOS echo ubuntu.14.04-x64: Builds overlay for Ubuntu 14.04 echo ubuntu.16.04-x64: Builds overlay for Ubuntu 16.04 echo ubuntu.16.10-x64: Builds overlay for Ubuntu 16.10 +echo ziptests: zips CoreCLR tests & Core_Root for a Helix run echo Exclude- Optional parameter - specify location of default exclusion file (defaults to tests\issues.targets if not specified) echo Set to "" to disable default exclusion file. echo -- ... : all arguments following this tag will be passed directly to msbuild. -- 2.7.4