summaryrefslogtreecommitdiff
path: root/tests/setup-runtime-dependencies.cmd
diff options
context:
space:
mode:
authorSejong Oh <sejooh@microsoft.com>2016-03-28 13:41:42 -0700
committerSejong Oh <sejooh@microsoft.com>2016-03-28 15:07:59 -0700
commitb7f5398362e05e2ce6921af781ea4af7f3f75837 (patch)
tree5e19c9836ca5a0931dc3dc535bebcd62b3c5ba46 /tests/setup-runtime-dependencies.cmd
parente25eb2cc4e9fd8ea56364aad99c3be9f16f671d8 (diff)
downloadcoreclr-b7f5398362e05e2ce6921af781ea4af7f3f75837.tar.gz
coreclr-b7f5398362e05e2ce6921af781ea4af7f3f75837.tar.bz2
coreclr-b7f5398362e05e2ce6921af781ea4af7f3f75837.zip
Add architeture information to a script downloading coredistools
Diffstat (limited to 'tests/setup-runtime-dependencies.cmd')
-rwxr-xr-xtests/setup-runtime-dependencies.cmd8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/setup-runtime-dependencies.cmd b/tests/setup-runtime-dependencies.cmd
index 6c7f6d10b1..c6a098bc10 100755
--- a/tests/setup-runtime-dependencies.cmd
+++ b/tests/setup-runtime-dependencies.cmd
@@ -12,6 +12,7 @@ REM ===
REM =========================================================================================
set __OutputDir=
+set __Arch=
:Arg_Loop
if "%1" == "" goto ArgsDone
@@ -23,6 +24,7 @@ if /i "%1" == "-h" goto Usage
if /i "%1" == "/help" goto Usage
if /i "%1" == "-help" goto Usage
+if /i "%1" == "/arch" (set __Arch=%2&shift&shift&goto Arg_Loop)
if /i "%1" == "/outputdir" (set __OutputDir=%2&shift&shift&goto Arg_Loop)
echo Invalid command-line argument: %1
@@ -31,6 +33,7 @@ goto Usage
:ArgsDone
if not defined __OutputDir goto Usage
+if not defined __Arch goto Usage
REM =========================================================================================
@@ -87,9 +90,8 @@ set DOTNETCMD="%__DotNetCmd%" restore "%__JasonFilePath%" --source https://dotne
echo %DOTNETCMD%
call %DOTNETCMD%
if errorlevel 1 goto Fail
-
REM Get downloaded dll path
-FOR /F "delims=" %%i IN ('dir %__PackageDir%\coredistools.dll /b/s') DO set __LibPath=%%i
+FOR /F "delims=" %%i IN ('dir %__PackageDir%\coredistools.dll /b/s ^| findstr /R "runtime.win[0-9]*-%__Arch%"') DO set __LibPath=%%i
if not exist "%__LibPath%" (
echo Failed to locate the downloaded library: %__LibPath%
goto Fail
@@ -123,6 +125,6 @@ echo.
echo Download coredistool for GC stress testing
echo.
echo Usage:
-echo %__ThisScriptShort% /outputdir ^<coredistools_lib_install_path^>
+echo %__ThisScriptShort% /arch ^<TargetArch^> /outputdir ^<coredistools_lib_install_path^>
echo.
exit /b 1