Skip to content

[SR-237] Move SKIP_TEST_* arguments to Python #1396

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 3, 2016
Merged

[SR-237] Move SKIP_TEST_* arguments to Python #1396

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
100 changes: 93 additions & 7 deletions utils/build-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,9 @@ build the Debug variant of the Swift standard library and SDK overlay""",
run_tests_group.add_argument("-T", "--validation-test",
help="run the validation test suite (implies --test)",
action="store_true")
run_tests_group.add_argument("--host-test",
help="run executable tests on host devices (such as iOS or tvOS)",
action="store_true")
run_tests_group.add_argument("-B", "--benchmark",
help="run the Swift Benchmark Suite after building",
action="store_true")
Expand Down Expand Up @@ -530,6 +533,42 @@ build the Debug variant of the Swift standard library and SDK overlay""",
help="skip building Swift Benchmark Suite",
action="store_true")

skip_test_group = parser.add_argument_group(
title="Skip testing specified targets")
skip_test_group.add_argument("--skip-test-ios",
help="skip testing all iOS targets. Equivalent to specifying both "
"--skip-test-ios-simulator and --skip-test-ios-host",
action="store_true")
skip_test_group.add_argument("--skip-test-ios-simulator",
help="skip testing iOS simulator targets",
action="store_true")
skip_test_group.add_argument("--skip-test-ios-host",
help="skip testing iOS device targets on the host machine (the phone "
"itself)",
action="store_true")
skip_test_group.add_argument("--skip-test-tvos",
help="skip testing all tvOS targets. Equivalent to specifying both "
"--skip-test-tvos-simulator and --skip-test-tvos-host",
action="store_true")
skip_test_group.add_argument("--skip-test-tvos-simulator",
help="skip testing tvOS simulator targets",
action="store_true")
skip_test_group.add_argument("--skip-test-tvos-host",
help="skip testing tvOS device targets on the host machine (the TV "
"itself)",
action="store_true")
skip_test_group.add_argument("--skip-test-watchos",
help="skip testing all tvOS targets. Equivalent to specifying both "
"--skip-test-watchos-simulator and --skip-test-watchos-host",
action="store_true")
skip_test_group.add_argument("--skip-test-watchos-simulator",
help="skip testing watchOS simulator targets",
action="store_true")
skip_test_group.add_argument("--skip-test-watchos-host",
help="skip testing watchOS device targets on the host machine (the "
"watch itself)",
action="store_true")

parser.add_argument("-i", "--ios",
help="""
also build for iOS, but disallow tests that require an iOS device""",
Expand Down Expand Up @@ -602,6 +641,15 @@ the number of parallel build jobs to use""",
'--install-prefix',
'--install-symroot',
'--symbols-package',
'--skip-test-ios',
'--skip-test-ios-simulator',
'--skip-test-ios-host',
'--skip-test-tvos',
'--skip-test-tvos-simulator',
'--skip-test-tvos-host',
'--skip-test-watchos',
'--skip-test-watchos-simulator',
'--skip-test-watchos-host',
]))

if args.host_target is None:
Expand Down Expand Up @@ -681,6 +729,19 @@ the number of parallel build jobs to use""",
if args.test_optimized:
args.test = True

# --skip-test-ios is merely a shorthand for host and simulator tests.
if args.skip_test_ios:
args.skip_test_ios_host = True
args.skip_test_ios_simulator = True
# --skip-test-tvos is merely a shorthand for host and simulator tests.
if args.skip_test_tvos:
args.skip_test_tvos_host = True
args.skip_test_tvos_simulator = True
# --skip-test-watchos is merely a shorthand for host and simulator tests.
if args.skip_test_watchos:
args.skip_test_watchos_host = True
args.skip_test_watchos_simulator = True

build_script_impl_inferred_args = []

if args.export_compile_commands:
Expand Down Expand Up @@ -708,16 +769,26 @@ the number of parallel build jobs to use""",
"--skip-test-freebsd",
"--skip-test-cygwin",
"--skip-test-osx",
"--skip-test-ios",
"--skip-test-tvos",
"--skip-test-watchos",
"--skip-test-ios-simulator",
"--skip-test-ios-host",
"--skip-test-tvos-simulator",
"--skip-test-tvos-host",
"--skip-test-watchos-simulator",
"--skip-test-watchos-host",
]

if not args.validation_test:
build_script_impl_inferred_args += [
"--skip-test-validation"
]

if not args.host_test:
build_script_impl_inferred_args += [
"--skip-test-ios-host",
"--skip-test-tvos-host",
"--skip-test-watchos-host",
]

if not args.benchmark:
build_script_impl_inferred_args += [
"--skip-test-benchmarks"
Expand All @@ -731,19 +802,22 @@ the number of parallel build jobs to use""",
if not args.ios:
build_script_impl_inferred_args += [
"--skip-build-ios",
"--skip-test-ios"
"--skip-test-ios-simulator",
"--skip-test-ios-host",
]

if not args.tvos:
build_script_impl_inferred_args += [
"--skip-build-tvos",
"--skip-test-tvos",
"--skip-test-tvos-simulator",
"--skip-test-tvos-host",
]

if not args.watchos:
build_script_impl_inferred_args += [
"--skip-build-watchos",
"--skip-test-watchos",
"--skip-test-watchos-simulator",
"--skip-test-watchos-host",
]

if not args.build_lldb:
Expand Down Expand Up @@ -794,7 +868,7 @@ the number of parallel build jobs to use""",
"--skip-build-ios-device",
"--skip-build-ios-simulator",
"--skip-build-tvos",
"--skip-build-tvos_device",
"--skip-build-tvos-device",
"--skip-build-tvos-simulator",
"--skip-build-watchos",
"--skip-build-watchos-device",
Expand Down Expand Up @@ -931,6 +1005,18 @@ the number of parallel build jobs to use""",
build_script_impl_args += ["--skip-test-freebsd"]
if args.skip_test_cygwin:
build_script_impl_args += ["--skip-test-cygwin"]
if args.skip_test_ios_host:
build_script_impl_args += ["--skip-test-ios-host"]
if args.skip_test_ios_simulator:
build_script_impl_args += ["--skip-test-ios-simulator"]
if args.skip_test_tvos_host:
build_script_impl_args += ["--skip-test-tvos-host"]
if args.skip_test_tvos_simulator:
build_script_impl_args += ["--skip-test-tvos-simulator"]
if args.skip_test_watchos_host:
build_script_impl_args += ["--skip-test-watchos-host"]
if args.skip_test_watchos_simulator:
build_script_impl_args += ["--skip-test-watchos-simulator"]
build_script_impl_args += build_script_impl_inferred_args

# If we have extra_swift_args, combine all of them together and then add
Expand Down
24 changes: 0 additions & 24 deletions utils/build-script-impl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,10 @@ KNOWN_SETTINGS=(
skip-test-freebsd "" "set to skip testing Swift stdlibs for FreeBSD"
skip-test-cygwin "" "set to skip testing Swift stdlibs for Cygwin"
skip-test-osx "" "set to skip testing Swift stdlibs for OSX"
skip-test-ios "" "set to skip testing Swift stdlibs for iOS"
skip-test-ios-simulator "" "set to skip testing Swift stdlibs for iOS simulators (i.e. test devices only)"
skip-test-ios-host "" "set to skip testing the host parts of the iOS toolchain"
skip-test-tvos "" "set to skip testing Swift stdlibs for tvOS"
skip-test-tvos-simulator "" "set to skip testing Swift stdlibs for tvOS simulators (i.e. test devices only)"
skip-test-tvos-host "" "set to skip testing the host parts of the tvOS toolchain"
skip-test-watchos "" "set to skip testing Swift stdlibs for Apple watchOS"
skip-test-watchos-simulator "" "set to skip testing Swift stdlibs for Apple watchOS simulators (i.e. test devices only)"
skip-test-watchos-host "" "set to skip testing the host parts of the watchOS toolchain"
skip-test-validation "" "set to skip validation test suite"
Expand Down Expand Up @@ -564,7 +561,6 @@ if [[ "${SKIP_IOS}" ]] ; then
SKIP_BUILD_IOS=1
SKIP_BUILD_IOS_DEVICE=1
SKIP_BUILD_IOS_SIMULATOR=1
SKIP_TEST_IOS=1
SKIP_TEST_IOS_HOST=1
SKIP_TEST_IOS_SIMULATOR=1
fi
Expand All @@ -573,7 +569,6 @@ if [[ "${SKIP_TVOS}" ]] ; then
SKIP_BUILD_TVOS=1
SKIP_BUILD_TVOS_DEVICE=1
SKIP_BUILD_TVOS_SIMULATOR=1
SKIP_TEST_TVOS=1
SKIP_TEST_TVOS_HOST=1
SKIP_TEST_TVOS_SIMULATOR=1
fi
Expand All @@ -582,7 +577,6 @@ if [[ "${SKIP_WATCHOS}" ]] ; then
SKIP_BUILD_WATCHOS=1
SKIP_BUILD_WATCHOS_DEVICE=1
SKIP_BUILD_WATCHOS_SIMULATOR=1
SKIP_TEST_WATCHOS=1
SKIP_TEST_WATCHOS_HOST=1
SKIP_TEST_WATCHOS_SIMULATOR=1
fi
Expand All @@ -591,7 +585,6 @@ if [[ "${SKIP_BUILD_IOS}" ]] ; then
SKIP_BUILD_IOS=1
SKIP_BUILD_IOS_DEVICE=1
SKIP_BUILD_IOS_SIMULATOR=1
SKIP_TEST_IOS=1
SKIP_TEST_IOS_HOST=1
SKIP_TEST_IOS_SIMULATOR=1
fi
Expand All @@ -600,7 +593,6 @@ if [[ "${SKIP_BUILD_TVOS}" ]] ; then
SKIP_BUILD_TVOS=1
SKIP_BUILD_TVOS_DEVICE=1
SKIP_BUILD_TVOS_SIMULATOR=1
SKIP_TEST_TVOS=1
SKIP_TEST_TVOS_HOST=1
SKIP_TEST_TVOS_SIMULATOR=1
fi
Expand All @@ -609,7 +601,6 @@ if [[ "${SKIP_BUILD_WATCHOS}" ]] ; then
SKIP_BUILD_WATCHOS=1
SKIP_BUILD_WATCHOS_DEVICE=1
SKIP_BUILD_WATCHOS_SIMULATOR=1
SKIP_TEST_WATCHOS=1
SKIP_TEST_WATCHOS_HOST=1
SKIP_TEST_WATCHOS_SIMULATOR=1
fi
Expand Down Expand Up @@ -641,21 +632,6 @@ if [[ "${SKIP_BUILD_WATCHOS_SIMULATOR}" ]] ; then
SKIP_TEST_WATCHOS_SIMULATOR=1
fi

if [[ "${SKIP_TEST_IOS}" ]] ; then
SKIP_TEST_IOS_HOST=1
SKIP_TEST_IOS_SIMULATOR=1
fi

if [[ "${SKIP_TEST_TVOS}" ]] ; then
SKIP_TEST_TVOS_HOST=1
SKIP_TEST_TVOS_SIMULATOR=1
fi

if [[ "${SKIP_TEST_WATCHOS}" ]] ; then
SKIP_TEST_WATCHOS_HOST=1
SKIP_TEST_WATCHOS_SIMULATOR=1
fi

# WORKSPACE, BUILD_DIR and INSTALLABLE_PACKAGE must be absolute paths
case "${WORKSPACE}" in
/*) ;;
Expand Down