Revert "Add architeture information to a script downloading coredistools"

Commit migrated from https://github.com/dotnet/coreclr/commit/72c2da31f0f4136daa5be81ef24e1b7289b781fb

diff --git a/src/coreclr/tests/runtest.cmd b/src/coreclr/tests/runtest.cmd
index 8933fa3..80ed026 100644 (file)
--- a/src/coreclr/tests/runtest.cmd
+++ b/src/coreclr/tests/runtest.cmd
@@ -286,16 +286,8 @@ if defined __TestEnv call %__TestEnv%
 if defined COMPlus_GCStress set __Result=true
 endlocal & set __IsGCTest=%__Result%
 if "%__IsGCTest%"=="true" (
-@echo on
-    tests\setup-runtime-dependencies.cmd /arch %__BuildArch% /outputdir %CORE_ROOT%
-    if errorlevel 1 (
-        echo Failed to donwload runtime packages
-        exit /b 1
-    )
+    call tests\setup-runtime-dependencies.cmd /outputdir %CORE_ROOT%
 )
-
-exit /b 0
-
 set __BuildLogRootName=Tests_GenerateRuntimeLayout
 call :msbuild "%__ProjectFilesDir%\runtest.proj" /p:GenerateRuntimeLayout=true 
 if errorlevel 1 (

diff --git a/src/coreclr/tests/setup-runtime-dependencies.cmd b/src/coreclr/tests/setup-runtime-dependencies.cmd
index c6a098b..6c7f6d1 100755 (executable)
--- a/src/coreclr/tests/setup-runtime-dependencies.cmd
+++ b/src/coreclr/tests/setup-runtime-dependencies.cmd
@@ -12,7 +12,6 @@ REM ===
 REM =========================================================================================
 
 set __OutputDir=
-set __Arch=
 
 :Arg_Loop
 if "%1" == "" goto ArgsDone
@@ -24,7 +23,6 @@ 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
@@ -33,7 +31,6 @@ goto Usage
 :ArgsDone
 
 if not defined __OutputDir goto Usage
-if not defined __Arch goto Usage
 
 
 REM =========================================================================================
@@ -90,8 +87,9 @@ 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 ^| findstr /R "runtime.win[0-9]*-%__Arch%"') DO set __LibPath=%%i
+FOR /F "delims=" %%i IN ('dir %__PackageDir%\coredistools.dll /b/s') DO set __LibPath=%%i
 if not exist "%__LibPath%" (
     echo Failed to locate the downloaded library: %__LibPath%
     goto Fail
@@ -125,6 +123,6 @@ echo.
 echo Download coredistool for GC stress testing
 echo.
 echo Usage:
-echo     %__ThisScriptShort% /arch ^<TargetArch^> /outputdir ^<coredistools_lib_install_path^>
+echo     %__ThisScriptShort% /outputdir ^<coredistools_lib_install_path^>
 echo.
 exit /b 1

diff --git a/src/coreclr/tests/setup-runtime-dependencies.sh b/src/coreclr/tests/setup-runtime-dependencies.sh
index ab0b2c4..17fbb16 100755 (executable)
--- a/src/coreclr/tests/setup-runtime-dependencies.sh
+++ b/src/coreclr/tests/setup-runtime-dependencies.sh
@@ -109,17 +109,10 @@ if [ ! -e $libInstallDir ]; then
     mkdir -p $libInstallDir
 fi
 
-# Query runtime Id
-rid=`$dotnetCmd --version | grep 'Runtime Id:' | sed 's/^ *Runtime Id: *//g'`    
-if [ -z "$rid" ]; then
-    exit_with_error 1 "Failed to query runtime Id"
-fi    
-
 # Write dependency information to project.json
-packageName='runtime.'$rid'.Microsoft.NETCore.CoreDisTools'
 echo {  \
     \"dependencies\": { \
-    \"$packageName\": \"1.0.0-prerelease-00001\" \
+    \"Microsoft.NETCore.CoreDisTools\": \"1.0.0-prerelease-00001\" \
     }, \
     \"frameworks\": { \"dnxcore50\": { } } \
     } > $jsonFilePath
@@ -133,7 +126,7 @@ then
 fi
 
 # Get library path
-libPath=`find $packageDir | grep $rid | grep -m 1 libcoredistools`
+libPath=`find $packageDir | grep -m 1 libcoredistools`
 if [ ! -e $libPath ]; then
     exit_with_error 1 'Failed to locate the downloaded library'
 fi