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

Revert "Add call to setup-stress-dependencies.sh to build-test.sh." #23419

Merged
merged 1 commit into from
Mar 23, 2019
Merged

Revert "Add call to setup-stress-dependencies.sh to build-test.sh." #23419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions build-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Empty file modified init-distro-rid.sh
100755 → 100644
View file
Open in desktop
Empty file.
4 changes: 1 addition & 3 deletions tests/setup-stress-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down