From 8343724ab5f0d9fc21cca7fa676301040f26bd69 Mon Sep 17 00:00:00 2001 From: Sergey Andreenko Date: Sat, 23 Mar 2019 02:00:53 -0700 Subject: Revert "Add call to setup-stress-dependencies.sh to build-test.sh. (#23354)" (#23419) This reverts commit 22c4ff5c1d339119c12547ac2d1b35211162df49. --- tests/setup-stress-dependencies.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tests') 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 -- cgit v1.2.3