Skip to content

Commit 1ee3bcd

Browse files
shahmishalshahmishal
authored
Merge pull request #20504 from apple/revert-20160-build-script-skstresstester
Revert "[build-script] Update build-script to support building and installing the SourceKit stress tester"
2 parents a3fe730 + e7d501c commit 1ee3bcd

File tree

6 files changed

+10
-115
lines changed

6 files changed

+10
-115
lines changed

‎utils/build-presets.ini

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,8 +1021,6 @@ watchos
10211021
lldb
10221022
llbuild
10231023
swiftpm
1024-
swiftsyntax
1025-
skstresstester
10261024
playgroundsupport
10271025

10281026
# Build with debug info, this allows us to symbolicate crashes from
@@ -1046,9 +1044,6 @@ install-swift
10461044
install-lldb
10471045
install-llbuild
10481046
install-swiftpm
1049-
install-swiftsyntax
1050-
skip-install-swiftsyntax-module
1051-
install-skstresstester
10521047
install-playgroundsupport
10531048

10541049
install-destdir=%(install_destdir)s
@@ -1156,7 +1151,10 @@ skip-test-lldb
11561151
skip-test-cmark
11571152
skip-test-playgroundsupport
11581153
skip-test-swiftsyntax
1159-
skip-test-skstresstester
1154+
1155+
swiftsyntax
1156+
install-swiftsyntax
1157+
skip-install-swiftsyntax-module
11601158

11611159
#===------------------------------------------------------------------------===#
11621160
# LLDB build configurations

‎utils/build-script

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,6 @@ class BuildScriptInvocation(object):
474474
"--xctest-build-type", args.build_variant,
475475
"--swiftpm-build-type", args.build_variant,
476476
"--swiftsyntax-build-type", args.build_variant,
477-
"--skstresstester-build-type", args.build_variant,
478477
"--llbuild-build-type", args.build_variant,
479478
"--swift-enable-assertions", str(args.swift_assertions).lower(),
480479
"--swift-stdlib-enable-assertions", str(
@@ -594,8 +593,6 @@ class BuildScriptInvocation(object):
594593
impl_args += ["--skip-build-swiftpm"]
595594
if not args.build_swiftsyntax:
596595
impl_args += ["--skip-build-swiftsyntax"]
597-
if not args.build_skstresstester:
598-
impl_args += ["--skip-build-skstresstester"]
599596
if not args.build_playgroundsupport:
600597
impl_args += ["--skip-build-playgroundsupport"]
601598
if args.build_swift_dynamic_stdlib:
@@ -640,7 +637,6 @@ class BuildScriptInvocation(object):
640637
"--skip-test-llbuild",
641638
"--skip-test-swiftpm",
642639
"--skip-test-swiftsyntax",
643-
"--skip-test-skstresstester",
644640
"--skip-test-xctest",
645641
"--skip-test-foundation",
646642
"--skip-test-libdispatch",

‎utils/build-script-impl

Lines changed: 6 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ KNOWN_SETTINGS=(
8383
xctest-build-type "Debug" "the build variant for xctest"
8484
swiftpm-build-type "Debug" "the build variant for swiftpm"
8585
swiftsyntax-build-type "Debug" "the build variant for swiftSyntax"
86-
skstresstester-build-type "Debug" "the build variant for the SourceKit stress tester"
8786
llbuild-enable-assertions "1" "enable assertions in llbuild"
8887
enable-asan "" "enable Address Sanitizer"
8988
enable-ubsan "" "enable Undefined Behavior Sanitizer"
@@ -125,7 +124,6 @@ KNOWN_SETTINGS=(
125124
skip-build-llbuild "" "set to skip building llbuild"
126125
skip-build-swiftpm "" "set to skip building swiftpm"
127126
skip-build-swiftsyntax "" "set to skip building swiftSyntax"
128-
skip-build-skstresstester "" "set to skip building the SourceKit stress tester"
129127
skip-build-xctest "" "set to skip building xctest"
130128
skip-build-foundation "" "set to skip building foundation"
131129
skip-build-libdispatch "" "set to skip building libdispatch"
@@ -139,7 +137,6 @@ KNOWN_SETTINGS=(
139137
skip-test-llbuild "" "set to skip testing llbuild"
140138
skip-test-swiftpm "" "set to skip testing swiftpm"
141139
skip-test-swiftsyntax "" "set to skip testing swiftSyntax"
142-
skip-test-skstresstester "" "set to skip testing the SourceKit stress tester"
143140
skip-test-xctest "" "set to skip testing xctest"
144141
skip-test-foundation "" "set to skip testing foundation"
145142
skip-test-libdispatch "" "set to skip testing libdispatch"
@@ -196,7 +193,6 @@ KNOWN_SETTINGS=(
196193
install-swiftpm "" "whether to install swiftpm"
197194
install-swiftsyntax "" "whether to install swiftsyntax"
198195
skip-install-swiftsyntax-module "" "set to skip installing swiftsyntax modules"
199-
install-skstresstester "" "whether to install the SourceKit stress tester"
200196
install-xctest "" "whether to install xctest"
201197
install-foundation "" "whether to install foundation"
202198
install-libdispatch "" "whether to install libdispatch"
@@ -1175,7 +1171,6 @@ LLDB_SOURCE_DIR="${WORKSPACE}/lldb"
11751171
LLBUILD_SOURCE_DIR="${WORKSPACE}/llbuild"
11761172
SWIFTPM_SOURCE_DIR="${WORKSPACE}/swiftpm"
11771173
SWIFTSYNTAX_SOURCE_DIR="${WORKSPACE}/swift-syntax"
1178-
SKSTRESSTESTER_SOURCE_DIR="${WORKSPACE}/swift-stress-tester/SourceKitStressTester"
11791174
XCTEST_SOURCE_DIR="${WORKSPACE}/swift-corelibs-xctest"
11801175
FOUNDATION_SOURCE_DIR="${WORKSPACE}/swift-corelibs-foundation"
11811176
LIBDISPATCH_SOURCE_DIR="${WORKSPACE}/swift-corelibs-libdispatch"
@@ -1216,9 +1211,8 @@ PRODUCTS=("${PRODUCTS[@]}" swift)
12161211
if [[ ! "${SKIP_BUILD_LLDB}" ]] ; then
12171212
PRODUCTS=("${PRODUCTS[@]}" lldb)
12181213
fi
1219-
# LLBuild, SwiftPM, SwiftSyntax, the SourceKit stress tester and XCTest are
1220-
# dependent on Foundation, so Foundation must be added to the list of build
1221-
# products first.
1214+
# LLBuild, SwiftPM, SwiftSyntax and XCTest are dependent on Foundation, so Foundation must be
1215+
# added to the list of build products first.
12221216
if [[ ! "${SKIP_BUILD_LIBDISPATCH}" ]] ; then
12231217
PRODUCTS=("${PRODUCTS[@]}" libdispatch)
12241218
fi
@@ -1231,24 +1225,19 @@ fi
12311225
if [[ ! "${SKIP_BUILD_PLAYGROUNDSUPPORT}" ]] ; then
12321226
PRODUCTS=("${PRODUCTS[@]}" playgroundsupport)
12331227
fi
1234-
# SwiftPM, SwiftSyntax and the SourceKit stress tester are dependent on XCTest,
1235-
# so XCTest must be added to the list of build products first.
1228+
# SwiftPM and SwiftSyntax are dependent on XCTest, so XCTest must be added to the list of
1229+
# build products first.
12361230
if [[ ! "${SKIP_BUILD_XCTEST}" ]] ; then
12371231
PRODUCTS=("${PRODUCTS[@]}" xctest)
12381232
fi
1239-
# SwiftSyntax and the SourceKit stress tester are dependent on SwiftPM, so
1240-
# SwiftPM must be added to the list of build products first.
1233+
# SwiftSyntax is dependent on SwiftPM, so SwiftPM must be added to the list of
1234+
# build products first.
12411235
if [[ ! "${SKIP_BUILD_SWIFTPM}" ]] ; then
12421236
PRODUCTS=("${PRODUCTS[@]}" swiftpm)
12431237
fi
1244-
# The SourceKit stress tester is dependent on SwiftSyntax, so it must be added
1245-
# to the list of build products first.
12461238
if [[ ! "${SKIP_BUILD_SWIFTSYNTAX}" ]] ; then
12471239
PRODUCTS=("${PRODUCTS[@]}" swiftsyntax)
12481240
fi
1249-
if [[ ! "${SKIP_BUILD_SKSTRESSTESTER}" ]] ; then
1250-
PRODUCTS=("${PRODUCTS[@]}" skstresstester)
1251-
fi
12521241

12531242
# Checks if a given product is enabled (i.e. part of $PRODUCTS array)
12541243
function contains_product() {
@@ -1559,9 +1548,6 @@ function build_directory_bin() {
15591548
swiftsyntax)
15601549
echo "${root}/${SWIFTSYNTAX_BUILD_TYPE}/bin"
15611550
;;
1562-
skstresstester)
1563-
echo "${root}/${SKSTRESSTESTER_BUILD_TYPE}/bin"
1564-
;;
15651551
xctest)
15661552
echo "${root}/${XCTEST_BUILD_TYPE}/bin"
15671553
;;
@@ -1701,9 +1687,6 @@ function cmake_config_opt() {
17011687
swiftsyntax)
17021688
echo "--config ${SWIFTSYNTAX_BUILD_TYPE}"
17031689
;;
1704-
skstresstester)
1705-
echo "--config ${SKSTRESSTESTER_BUILD_TYPE}"
1706-
;;
17071690
xctest)
17081691
echo "--config ${XCTEST_BUILD_TYPE}"
17091692
;;
@@ -1813,36 +1796,6 @@ function set_swiftsyntax_build_command() {
18131796
--filecheck-exec="$(build_directory_bin ${LOCAL_HOST} llvm)/FileCheck")
18141797
}
18151798

1816-
function set_skstresstester_build_command() {
1817-
if [ "${SKIP_BUILD_SWIFTSYNTAX}" ]; then
1818-
echo "Error: Cannot build the SourceKit stress tester without SwiftSyntax."
1819-
exit 1
1820-
fi
1821-
1822-
local swiftsyntax_config="debug"
1823-
if [[ $(is_cmake_release_build_type "${SWIFTSYNTAX_BUILD_TYPE}") ]] ; then
1824-
swiftsyntax_config="release"
1825-
fi
1826-
local config="debug"
1827-
if [[ $(is_cmake_release_build_type "${SKSTRESSTESTER_BUILD_TYPE}") ]] ; then
1828-
config="release"
1829-
fi
1830-
1831-
skstresstester_build_command=("${SKSTRESSTESTER_SOURCE_DIR}/Utilities/build-script-helper.py")
1832-
if [[ "${VERBOSE_BUILD}" ]] ; then
1833-
skstresstester_build_command+=(-v)
1834-
fi
1835-
1836-
skstresstester_build_command+=(
1837-
--build-dir="${build_dir}"
1838-
--swiftc-exec="$(build_directory_bin ${LOCAL_HOST} swift)/swiftc"
1839-
--swift-build-exec="${SWIFT_BUILD}"
1840-
--swift-test-exec="${SWIFT_TEST}"
1841-
--sourcekitd-dir="$(build_directory ${host} swift)/lib"
1842-
--swiftsyntax-dir="$(build_directory ${host} swiftsyntax)/${swiftsyntax_config}"
1843-
--config="${config}")
1844-
}
1845-
18461799
# Construct the appropriate options to pass to an Xcode
18471800
# build of any LLDB target.
18481801
function set_lldb_xcodebuild_options() {
@@ -2521,16 +2474,6 @@ for host in "${ALL_HOSTS[@]}"; do
25212474
set_swiftsyntax_build_command
25222475
call "${swiftsyntax_build_command[@]}"
25232476

2524-
continue
2525-
;;
2526-
skstresstester)
2527-
if [[ "$(uname -s)" != "Darwin" ]]; then
2528-
echo "error: unable to build swift-stress-tester on this platform"
2529-
continue
2530-
fi
2531-
set_skstresstester_build_command
2532-
call "${skstresstester_build_command[@]}"
2533-
25342477
continue
25352478
;;
25362479
xctest)
@@ -3145,14 +3088,6 @@ for host in "${ALL_HOSTS[@]}"; do
31453088
# As swiftSyntax tests itself, we break early here.
31463089
continue
31473090
;;
3148-
skstresstester)
3149-
if [[ "${SKIP_TEST_SKSTRESSTESTER}" ]]; then
3150-
continue
3151-
fi
3152-
echo "--- Running tests for ${product} ---"
3153-
call "${skstresstester_build_command[@]}" test
3154-
continue
3155-
;;
31563091
xctest)
31573092
if [[ "${SKIP_TEST_XCTEST}" ]]; then
31583093
continue
@@ -3466,23 +3401,6 @@ for host in "${ALL_HOSTS[@]}"; do
34663401
call "${swiftsyntax_build_command[@]}" --dylib-dir="${DYLIB_DIR}" --install
34673402
fi
34683403

3469-
continue
3470-
;;
3471-
skstresstester)
3472-
if [[ -z "${INSTALL_SKSTRESSTESTER}" ]] ; then
3473-
continue
3474-
fi
3475-
if [[ -z "${INSTALL_DESTDIR}" ]] ; then
3476-
echo "--install-destdir is required to install products."
3477-
exit 1
3478-
fi
3479-
if [[ -z "${INSTALL_SWIFTSYNTAX}" ]] ; then
3480-
echo "--install-swiftsyntax is required to install the SourceKit stress tester"
3481-
exit 1
3482-
fi
3483-
3484-
echo "--- Installing ${product} ---"
3485-
call "${skstresstester_build_command[@]}" --prefix="${host_install_destdir}${host_install_prefix}" install
34863404
continue
34873405
;;
34883406
xctest)

‎utils/build_swift/driver_arguments.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -518,9 +518,6 @@ def create_argument_parser():
518518
option(['--swiftsyntax'], store_true('build_swiftsyntax'),
519519
help='build swiftSyntax')
520520

521-
option(['--skstresstester'], store_true('build_skstresstester'),
522-
help='build the SourceKit stress tester')
523-
524521
option('--xctest', toggle_true('build_xctest'),
525522
help='build xctest')
526523

@@ -988,8 +985,6 @@ def create_argument_parser():
988985
/llbuild (optional)
989986
/swiftpm (optional, requires llbuild)
990987
/swift-syntax (optional, requires swiftpm)
991-
/swift-stress-tester (optional,
992-
requires swift-syntax)
993988
/compiler-rt (optional)
994989
/swift-corelibs-xctest (optional)
995990
/swift-corelibs-foundation (optional)

‎utils/build_swift/tests/expected_options.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
'build_swift_stdlib_unittest_extra': False,
8181
'build_swiftpm': False,
8282
'build_swiftsyntax': False,
83-
'build_skstresstester': False,
8483
'build_tvos': True,
8584
'build_tvos_device': False,
8685
'build_tvos_simulator': False,
@@ -397,7 +396,6 @@ class IgnoreOption(_BaseOption):
397396
SetTrueOption('--skip-build'),
398397
SetTrueOption('--swiftpm', dest='build_swiftpm'),
399398
SetTrueOption('--swiftsyntax', dest='build_swiftsyntax'),
400-
SetTrueOption('--skstresstester', dest='build_skstresstester'),
401399
SetTrueOption('-B', dest='benchmark'),
402400
SetTrueOption('-S', dest='skip_build'),
403401
SetTrueOption('-b', dest='build_llbuild'),

‎utils/update_checkout/update-checkout-config.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
"remote": { "id": "apple/swift-package-manager" } },
1919
"swift-syntax": {
2020
"remote": { "id": "apple/swift-syntax" } },
21-
"swift-stress-tester": {
22-
"remote": { "id": "apple/swift-stress-tester" } },
2321
"compiler-rt": {
2422
"remote": { "id": "apple/swift-compiler-rt" } },
2523
"swift-corelibs-xctest": {
@@ -52,7 +50,6 @@
5250
"llbuild": "master",
5351
"swiftpm": "master",
5452
"swift-syntax": "master",
55-
"swift-stress-tester": "master",
5653
"compiler-rt": "stable",
5754
"swift-corelibs-xctest": "master",
5855
"swift-corelibs-foundation": "master",
@@ -77,7 +74,6 @@
7774
"llbuild": "master",
7875
"swiftpm": "master",
7976
"swift-syntax": "master",
80-
"swift-stress-tester": "master",
8177
"swift-corelibs-xctest": "master",
8278
"swift-corelibs-foundation": "master",
8379
"swift-corelibs-libdispatch": "master",
@@ -98,7 +94,6 @@
9894
"llbuild": "swift-3.0-branch",
9995
"swiftpm": "swift-3.0-branch",
10096
"swift-syntax": "master",
101-
"swift-stress-tester": "master",
10297
"compiler-rt": "swift-3.0-branch",
10398
"swift-corelibs-xctest": "swift-3.0-branch",
10499
"swift-corelibs-foundation": "swift-3.0-branch",
@@ -119,7 +114,6 @@
119114
"llbuild": "swift-3.1-branch",
120115
"swiftpm": "swift-3.1-branch",
121116
"swift-syntax": "master",
122-
"swift-stress-tester": "master",
123117
"compiler-rt": "swift-3.1-branch",
124118
"swift-corelibs-xctest": "swift-3.1-branch",
125119
"swift-corelibs-foundation": "swift-3.1-branch",
@@ -140,7 +134,6 @@
140134
"llbuild": "swift-4.0-branch",
141135
"swiftpm": "swift-4.0-branch",
142136
"swift-syntax": "master",
143-
"swift-stress-tester": "master",
144137
"compiler-rt": "swift-4.0-branch",
145138
"swift-corelibs-xctest": "swift-4.0-branch",
146139
"swift-corelibs-foundation": "swift-4.0-branch",
@@ -161,7 +154,6 @@
161154
"llbuild": "swift-4.1-branch",
162155
"swiftpm": "swift-4.1-branch",
163156
"swift-syntax": "master",
164-
"swift-stress-tester": "master",
165157
"compiler-rt": "swift-4.1-branch",
166158
"swift-corelibs-xctest": "swift-4.1-branch",
167159
"swift-corelibs-foundation": "swift-4.1-branch",
@@ -182,7 +174,6 @@
182174
"llbuild": "swift-4.2-branch",
183175
"swiftpm": "swift-4.2-branch",
184176
"swift-syntax": "swift-4.2-branch",
185-
"swift-stress-tester": "master",
186177
"compiler-rt": "swift-4.2-branch",
187178
"swift-corelibs-xctest": "swift-4.2-branch",
188179
"swift-corelibs-foundation": "swift-4.2-branch",
@@ -204,7 +195,6 @@
204195
"llbuild": "swift-5.0-branch",
205196
"swiftpm": "swift-5.0-branch",
206197
"swift-syntax": "swift-5.0-branch",
207-
"swift-stress-tester": "swift-5.0-branch",
208198
"swift-corelibs-xctest": "swift-5.0-branch",
209199
"swift-corelibs-foundation": "swift-5.0-branch",
210200
"swift-corelibs-libdispatch": "swift-5.0-branch",

0 commit comments

Comments
 (0)