diff options
| author | Sergey Andreenko <seandree@microsoft.com> | 2019-03-23 02:00:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-23 02:00:53 -0700 |
| commit | 8343724ab5f0d9fc21cca7fa676301040f26bd69 (patch) | |
| tree | d9748405cb5774dfeed3bea060a51729f62c9aa4 | |
| parent | 22c4ff5c1d339119c12547ac2d1b35211162df49 (diff) | |
| download | coreclr-8343724ab5f0d9fc21cca7fa676301040f26bd69.tar.gz coreclr-8343724ab5f0d9fc21cca7fa676301040f26bd69.tar.bz2 coreclr-8343724ab5f0d9fc21cca7fa676301040f26bd69.zip | |
Revert "Add call to setup-stress-dependencies.sh to build-test.sh. (#23354)" (#23419)
This reverts commit 22c4ff5c1d339119c12547ac2d1b35211162df49.
| -rwxr-xr-x | build-test.sh | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | init-distro-rid.sh | 0 | ||||
| -rwxr-xr-x | tests/setup-stress-dependencies.sh | 4 |
3 files changed, 1 insertions, 7 deletions
diff --git a/build-test.sh b/build-test.sh index 81b59eb3cc..d845185bcd 100755 --- a/build-test.sh +++ b/build-test.sh @@ -154,10 +154,6 @@ 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 100755..100644 --- 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 56c37b20f8..8c695b379f 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 [[ ${__BuildOS} == "Linux" ]]; then +if [[ ${__DistroRid} == "ubuntu"* ]]; then __DistroRid=ubuntu.14.04 fi @@ -170,8 +170,6 @@ 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 |