From 2d83f73b3b1e870dc0012e822f8a98336a0320e1 Mon Sep 17 00:00:00 2001
From: Sergey Andreenko <seandree@microsoft.com>
Date: Tue, 19 Mar 2019 17:35:53 -0700
Subject: [PATCH] Add call to setup-stress-dependencies.sh to build-test.sh.

---
 build-test.sh                      | 6 ++++++
 init-distro-rid.sh                 | 0
 tests/setup-stress-dependencies.sh | 4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 init-distro-rid.sh

diff --git a/build-test.sh b/build-test.sh
index d845185bcdcc..2785ecb811f3 100755
--- a/build-test.sh
+++ b/build-test.sh
@@ -154,6 +154,12 @@ generate_layout()
 
     # Make sure to copy over the pulled down packages
     cp -r $__BinDir/* $CORE_ROOT/ > /dev/null
+
+    if [ "$__BuildOS" != "OSX" ]; then
+        nextCommand="\"$__TestDir/setup-stress-dependencies.sh\" --outputDir=$CORE_ROOT"
+        echo "Resolve runtime dependences via $nextCommand"
+        eval $nextCommand
+    fi
 }
 
 generate_testhost()
diff --git a/init-distro-rid.sh b/init-distro-rid.sh
old mode 100644
new mode 100755
diff --git a/tests/setup-stress-dependencies.sh b/tests/setup-stress-dependencies.sh
index 8c695b379f55..56c37b20f83e 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