summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Andreenko <seandree@microsoft.com>2019-03-22 22:13:12 -0700
committerGitHub <noreply@github.com>2019-03-22 22:13:12 -0700
commit22c4ff5c1d339119c12547ac2d1b35211162df49 (patch)
tree29bf27b10d91a16b66b1f147d13c272d0ec7f057
parent125e7c95e72629d5eb560844791c0b3507973998 (diff)
downloadcoreclr-22c4ff5c1d339119c12547ac2d1b35211162df49.tar.gz
coreclr-22c4ff5c1d339119c12547ac2d1b35211162df49.tar.bz2
coreclr-22c4ff5c1d339119c12547ac2d1b35211162df49.zip
Add call to setup-stress-dependencies.sh to build-test.sh. (#23354)
* Add call to setup-stress-dependencies.sh to build-test.sh. * Fix args. * hack __DistroRid * Do not use bash source. * Do not use bash source 2. * Fix init-distro-rid permissions. * Fix tabs. * return deleted source where it was needed
-rwxr-xr-xbuild-test.sh4
-rwxr-xr-x[-rw-r--r--]init-distro-rid.sh0
-rwxr-xr-xtests/setup-stress-dependencies.sh4
3 files changed, 7 insertions, 1 deletions
diff --git a/build-test.sh b/build-test.sh
index d845185bcd..81b59eb3cc 100755
--- a/build-test.sh
+++ b/build-test.sh
@@ -154,6 +154,10 @@ generate_layout()
# Make sure to copy over the pulled down packages
cp -r $__BinDir/* $CORE_ROOT/ > /dev/null
+
+ nextCommand="\"$__TestDir/setup-stress-dependencies.sh\" --outputDir=$CORE_ROOT"
+ echo "Resolve runtime dependences via $nextCommand"
+ eval $nextCommand
}
generate_testhost()
diff --git a/init-distro-rid.sh b/init-distro-rid.sh
index ebf77fc42e..ebf77fc42e 100644..100755
--- a/init-distro-rid.sh
+++ b/init-distro-rid.sh
diff --git a/tests/setup-stress-dependencies.sh b/tests/setup-stress-dependencies.sh
index 8c695b379f..56c37b20f8 100755
--- a/tests/setup-stress-dependencies.sh
+++ b/tests/setup-stress-dependencies.sh
@@ -147,7 +147,7 @@ initDistroRidGlobal ${__BuildOS} x64 ${isPortable}
# The CoreDisTools package is currently manually packaged and we only have
# 14.04 and 16.04 packages. Use the oldest package which will work on newer
# platforms.
-if [[ ${__DistroRid} == "ubuntu"* ]]; then
+if [[ ${__BuildOS} == "Linux" ]]; then
__DistroRid=ubuntu.14.04
fi
@@ -170,6 +170,8 @@ fi
# Get library path
libPath=`find $packageDir | grep $rid | grep -m 1 libcoredistools`
+echo "libPath to be used: ${libPath}"
+
if [ ! -e $libPath ] || [ -z "$libPath" ]; then
exit_with_error 1 'Failed to locate the downloaded library'
fi