Skip to content

build-toolchain: Use the same behavior on macOS as we do on Linux #15428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 23, 2018
Merged

build-toolchain: Use the same behavior on macOS as we do on Linux #15428

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
21 changes: 4 additions & 17 deletions utils/build-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,8 @@ function usage() {
echo "-n --dry-run"
echo "Do a dry run."
echo ""
if [[ "$(uname -s)" == "Linux" ]] ; then
echo "-t --test"
echo "Run tests."
echo ""
fi
echo "-nt --no-test"
echo "Don't run tests."
echo "-t --test"
echo "Run tests."
echo ""
}

Expand All @@ -41,7 +36,7 @@ DRY_RUN=
BUNDLE_PREFIX=
case $(uname -s) in
Darwin)
SWIFT_PACKAGE=buildbot_osx_package
SWIFT_PACKAGE=buildbot_osx_package,no_test
;;
Linux)
SWIFT_PACKAGE=buildbot_linux,no_test
Expand All @@ -63,15 +58,7 @@ while [ $# -ne 0 ]; do
if [ "$(uname -s)" == "Linux" ]; then
SWIFT_PACKAGE=buildbot_linux
else
echo "--test is not supported on \"$(uname -s)\". See --help"
exit 1
fi
;;
-nt|--no-test)
if [ "$(uname -s)" == "Linux" ]; then
SWIFT_PACKAGE=buildbot_linux,no_test
else
SWIFT_PACKAGE=buildbot_osx_package,no_test
SWIFT_PACKAGE=buildbot_osx_package
fi
;;
-h|--help)
Expand Down