From: Russ Keldorph Date: Fri, 27 May 2016 17:43:35 +0000 (-0700) Subject: Fix environment settings for Unix JIT stress scenarios X-Git-Tag: submit/tizen/20210909.063632~11030^2~10344^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=18c52bd6cf7fd270f0af85e8820bd3a9aae50fa3;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Fix environment settings for Unix JIT stress scenarios The environment settings necessary to run tests in these modes were being dropped. They need to be tunneled through properly in a couple of places. Fixes dotnet/coreclr#5278 Commit migrated from https://github.com/dotnet/coreclr/commit/c0d6ce3b32f591b91d57a409b3640cc3d760d520 --- diff --git a/src/coreclr/netci.groovy b/src/coreclr/netci.groovy index 5bdeb28..f38ca55 100755 --- a/src/coreclr/netci.groovy +++ b/src/coreclr/netci.groovy @@ -181,15 +181,15 @@ def static genStressModeScriptStep(def os, def stressModeName, def stressModeVar } } else { - // For these we don't use a script, we use directly stepScript += "echo Setting variables for ${stressModeName}\n" - stepScript += "rm -f ${stepScriptLocation}\n" + stepScript += "echo \\#\\!/usr/bin/env bash > ${stepScriptLocation}\n" stressModeVars.each{ k, v -> // Write out what we are writing to the script file stepScript += "echo Setting ${k}=${v}\n" // Write out the set itself to the script file` stepScript += "echo export ${k}=${v} >> ${stepScriptLocation}\n" } + stepScript += "chmod +x ${stepScriptLocation}\n" } return stepScript } diff --git a/src/coreclr/tests/runtest.sh b/src/coreclr/tests/runtest.sh index 2a70c1b..945088dd 100755 --- a/src/coreclr/tests/runtest.sh +++ b/src/coreclr/tests/runtest.sh @@ -918,6 +918,8 @@ fi scriptPath=$(dirname $0) ${scriptPath}/setup-runtime-dependencies.sh --outputDir=$coreOverlayDir +export __TestEnv=$testEnv + cd "$testRootDir" time_start=$(date +"%s") if [ -z "$testDirectories" ]