Skip to content

Commit 2311e1c

Browse files
committed
Swift: remove test sdk
The test sdk that we were prebuilding to run ql tests is actually not needed, as the `resource-dir` we package for cross-version compatibility is enough for running qltests as well.
1 parent d1d213d commit 2311e1c

File tree

4 files changed

+1
-27
lines changed

4 files changed

+1
-27
lines changed

swift/BUILD.bazel

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,21 +75,13 @@ pkg_filegroup(
7575
visibility = ["//visibility:public"],
7676
)
7777

78-
pkg_files(
79-
name = "swift-test-sdk-arch",
80-
srcs = ["//swift/third_party/swift-llvm-support:swift-test-sdk"],
81-
prefix = "qltest/" + codeql_platform,
82-
strip_prefix = strip_prefix.from_pkg(),
83-
)
84-
8578
pkg_filegroup(
8679
name = "extractor-pack-arch",
8780
srcs = select({
8881
"@platforms//os:windows": [],
8982
"//conditions:default": [
9083
":extractor",
9184
":resource-dir-arch",
92-
":swift-test-sdk-arch",
9385
],
9486
}) + select({
9587
"@platforms//os:macos": [

swift/third_party/BUILD.swift-llvm-support.bazel

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,3 @@ cc_library(
3232
}),
3333
visibility = ["//visibility:public"],
3434
)
35-
36-
pkg_files(
37-
name = "swift-test-sdk",
38-
srcs = glob([
39-
"sdk/**/*",
40-
]),
41-
strip_prefix = strip_prefix.from_pkg(),
42-
visibility = ["//visibility:public"],
43-
)

swift/third_party/swift-llvm-support/BUILD.bazel

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ alias(
88
}),
99
)
1010

11-
alias(
12-
name = "swift-test-sdk",
13-
actual = select({
14-
"@bazel_tools//src/conditions:linux": "@swift_prebuilt_linux//:swift-test-sdk",
15-
"@bazel_tools//src/conditions:darwin": "@swift_prebuilt_darwin_x86_64//:swift-test-sdk",
16-
}),
17-
)
18-
1911
alias(
2012
name = "swift-resource-dir",
2113
actual = select({

swift/tools/qltest.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ mkdir -p "$CODEQL_EXTRACTOR_SWIFT_TRAP_DIR"
55
QLTEST_LOG="$CODEQL_EXTRACTOR_SWIFT_LOG_DIR"/qltest.log
66

77
EXTRACTOR="$CODEQL_EXTRACTOR_SWIFT_ROOT/tools/$CODEQL_PLATFORM/extractor"
8-
SDK="$CODEQL_EXTRACTOR_SWIFT_ROOT/qltest/$CODEQL_PLATFORM/sdk"
98
RESOURCE_DIR="$CODEQL_EXTRACTOR_SWIFT_ROOT/resource-dir/$CODEQL_PLATFORM"
109
export CODEQL_EXTRACTOR_SWIFT_LOG_LEVELS=${CODEQL_EXTRACTOR_SWIFT_LOG_LEVELS:-out:text:no_logs,out:console:info}
1110
for src in *.swift; do
1211
env=()
13-
opts=(-sdk "$SDK" -resource-dir "$RESOURCE_DIR" -c -primary-file "$src")
12+
opts=(-resource-dir "$RESOURCE_DIR" -c -primary-file "$src")
1413
opts+=($(sed -n '1 s=//codeql-extractor-options:==p' $src))
1514
expected_status=$(sed -n 's=//codeql-extractor-expected-status:[[:space:]]*==p' $src)
1615
expected_status=${expected_status:-0}

0 commit comments

Comments
 (0)