Fix GC Stress testing on non windows platforms

Commit migrated from https://github.com/dotnet/coreclr/commit/9a236ce1619e8c3df173fbff55ff7184bb76de22

diff --git a/src/coreclr/tests/runtest.sh b/src/coreclr/tests/runtest.sh
index cd5da94..adf7895 100755 (executable)
--- a/src/coreclr/tests/runtest.sh
+++ b/src/coreclr/tests/runtest.sh
@@ -909,15 +909,9 @@ function coreclr_code_coverage {
 }
 
 function check_cpu_architecture {
-    # Use uname to determine what the CPU is.
-    local CPUName=$(uname -p)
+    local CPUName=$(uname -m)
     local __arch=
 
-    # Some Linux platforms report unknown for platform, but the arch for machine.
-    if [ "$CPUName" == "unknown" ]; then
-        CPUName=$(uname -m)
-    fi
-
     case $CPUName in
         i686)
             __arch=x86
@@ -941,6 +935,7 @@ function check_cpu_architecture {
 }
 
 ARCH=$(check_cpu_architecture)
+echo "Running on  CPU- $ARCH"
 
 # Exit code constants
 readonly EXIT_CODE_SUCCESS=0       # Script ran normally.

diff --git a/src/coreclr/tests/setup-runtime-dependencies.sh b/src/coreclr/tests/setup-runtime-dependencies.sh
index 0658673..4573e08 100755 (executable)
--- a/src/coreclr/tests/setup-runtime-dependencies.sh
+++ b/src/coreclr/tests/setup-runtime-dependencies.sh
@@ -87,6 +87,10 @@ fi
 
 # This script must be located in coreclr/tests.
 scriptDir=$(cd "$(dirname "$0")"; pwd -P)
+
+echo "Running init-tools.sh"
+$scriptDir/../init-tools.sh
+
 dotnetToolsDir=$scriptDir/../Tools
 dotnetCmd=${dotnetToolsDir}/dotnetcli/dotnet
 packageDir=${scriptDir}/../packages