diff options
| author | Rama Krishnan Raghupathy <ramarag@microsoft.com> | 2016-09-15 13:45:04 -0700 |
|---|---|---|
| committer | Rama Krishnan Raghupathy <ramarag@microsoft.com> | 2016-09-19 18:07:03 -0700 |
| commit | 9a236ce1619e8c3df173fbff55ff7184bb76de22 (patch) | |
| tree | da95cda55541a21f72f7e546e41afc5fd4dbd46d /tests | |
| parent | a3d93afa96c7bf488347d139c5f0affb0517674c (diff) | |
| download | coreclr-9a236ce1619e8c3df173fbff55ff7184bb76de22.tar.gz coreclr-9a236ce1619e8c3df173fbff55ff7184bb76de22.tar.bz2 coreclr-9a236ce1619e8c3df173fbff55ff7184bb76de22.zip | |
Fix GC Stress testing on non windows platforms
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/runtest.sh | 9 | ||||
| -rwxr-xr-x | tests/setup-runtime-dependencies.sh | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/tests/runtest.sh b/tests/runtest.sh index cd5da9484d..adf7895d2f 100755 --- a/tests/runtest.sh +++ b/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/tests/setup-runtime-dependencies.sh b/tests/setup-runtime-dependencies.sh index 06586736a0..4573e084bd 100755 --- a/tests/setup-runtime-dependencies.sh +++ b/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 |