From 4fc474d3ffd30bfae734af70f8b41d0cc88a8c60 Mon Sep 17 00:00:00 2001 From: Sergey Andreenko Date: Sat, 23 Mar 2019 02:00:29 -0700 Subject: [PATCH] Revert "Add call to setup-stress-dependencies.sh to build-test.sh. (#23354)" This reverts commit 22c4ff5c1d339119c12547ac2d1b35211162df49. --- build-test.sh | 4 ---- init-distro-rid.sh | 0 tests/setup-stress-dependencies.sh | 4 +--- 3 files changed, 1 insertion(+), 7 deletions(-) mode change 100755 => 100644 init-distro-rid.sh diff --git a/build-test.sh b/build-test.sh index 81b59eb3cc8b..d845185bcdcc 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 old mode 100755 new mode 100644 diff --git a/tests/setup-stress-dependencies.sh b/tests/setup-stress-dependencies.sh index 56c37b20f83e..8c695b379f55 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