Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 8343724

Browse files
author
Sergey Andreenko
authored
Revert "Add call to setup-stress-dependencies.sh to build-test.sh. (#23354)" (#23419)
This reverts commit 22c4ff5.
1 parent 22c4ff5 commit 8343724

File tree

3 files changed

+1
-7
lines changed

3 files changed

+1
-7
lines changed

build-test.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,6 @@ generate_layout()
154154

155155
# Make sure to copy over the pulled down packages
156156
cp -r $__BinDir/* $CORE_ROOT/ > /dev/null
157-
158-
nextCommand="\"$__TestDir/setup-stress-dependencies.sh\" --outputDir=$CORE_ROOT"
159-
echo "Resolve runtime dependences via $nextCommand"
160-
eval $nextCommand
161157
}
162158

163159
generate_testhost()

init-distro-rid.sh

100755100644
File mode changed.

tests/setup-stress-dependencies.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ initDistroRidGlobal ${__BuildOS} x64 ${isPortable}
147147
# The CoreDisTools package is currently manually packaged and we only have
148148
# 14.04 and 16.04 packages. Use the oldest package which will work on newer
149149
# platforms.
150-
if [[ ${__BuildOS} == "Linux" ]]; then
150+
if [[ ${__DistroRid} == "ubuntu"* ]]; then
151151
__DistroRid=ubuntu.14.04
152152
fi
153153

@@ -170,8 +170,6 @@ fi
170170

171171
# Get library path
172172
libPath=`find $packageDir | grep $rid | grep -m 1 libcoredistools`
173-
echo "libPath to be used: ${libPath}"
174-
175173
if [ ! -e $libPath ] || [ -z "$libPath" ]; then
176174
exit_with_error 1 'Failed to locate the downloaded library'
177175
fi

0 commit comments

Comments
 (0)