diff options
author | Sergey Andreenko <seandree@microsoft.com> | 2019-03-22 22:13:12 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-22 22:13:12 -0700 |
commit | 22c4ff5c1d339119c12547ac2d1b35211162df49 (patch) | |
tree | 29bf27b10d91a16b66b1f147d13c272d0ec7f057 /tests/setup-stress-dependencies.sh | |
parent | 125e7c95e72629d5eb560844791c0b3507973998 (diff) | |
download | coreclr-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
Diffstat (limited to 'tests/setup-stress-dependencies.sh')
-rwxr-xr-x | tests/setup-stress-dependencies.sh | 4 |
1 files changed, 3 insertions, 1 deletions
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 |