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

diff --git a/build-test.sh b/build-test.sh
index d845185..81b59eb 100755 (executable)
--- 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
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/tests/setup-stress-dependencies.sh b/tests/setup-stress-dependencies.sh
index 8c695b3..56c37b2 100755 (executable)
--- 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