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.
This commit is contained in:
Paolo Tranquilli
2024-02-19 13:28:48 +01:00
parent d1d213d285
commit 2311e1c5ab
4 changed files with 1 additions and 27 deletions

View File

@@ -75,13 +75,6 @@ pkg_filegroup(
visibility = ["//visibility:public"],
)
pkg_files(
name = "swift-test-sdk-arch",
srcs = ["//swift/third_party/swift-llvm-support:swift-test-sdk"],
prefix = "qltest/" + codeql_platform,
strip_prefix = strip_prefix.from_pkg(),
)
pkg_filegroup(
name = "extractor-pack-arch",
srcs = select({
@@ -89,7 +82,6 @@ pkg_filegroup(
"//conditions:default": [
":extractor",
":resource-dir-arch",
":swift-test-sdk-arch",
],
}) + select({
"@platforms//os:macos": [

View File

@@ -32,12 +32,3 @@ cc_library(
}),
visibility = ["//visibility:public"],
)
pkg_files(
name = "swift-test-sdk",
srcs = glob([
"sdk/**/*",
]),
strip_prefix = strip_prefix.from_pkg(),
visibility = ["//visibility:public"],
)

View File

@@ -8,14 +8,6 @@ alias(
}),
)
alias(
name = "swift-test-sdk",
actual = select({
"@bazel_tools//src/conditions:linux": "@swift_prebuilt_linux//:swift-test-sdk",
"@bazel_tools//src/conditions:darwin": "@swift_prebuilt_darwin_x86_64//:swift-test-sdk",
}),
)
alias(
name = "swift-resource-dir",
actual = select({

View File

@@ -5,12 +5,11 @@ mkdir -p "$CODEQL_EXTRACTOR_SWIFT_TRAP_DIR"
QLTEST_LOG="$CODEQL_EXTRACTOR_SWIFT_LOG_DIR"/qltest.log
EXTRACTOR="$CODEQL_EXTRACTOR_SWIFT_ROOT/tools/$CODEQL_PLATFORM/extractor"
SDK="$CODEQL_EXTRACTOR_SWIFT_ROOT/qltest/$CODEQL_PLATFORM/sdk"
RESOURCE_DIR="$CODEQL_EXTRACTOR_SWIFT_ROOT/resource-dir/$CODEQL_PLATFORM"
export CODEQL_EXTRACTOR_SWIFT_LOG_LEVELS=${CODEQL_EXTRACTOR_SWIFT_LOG_LEVELS:-out:text:no_logs,out:console:info}
for src in *.swift; do
env=()
opts=(-sdk "$SDK" -resource-dir "$RESOURCE_DIR" -c -primary-file "$src")
opts=(-resource-dir "$RESOURCE_DIR" -c -primary-file "$src")
opts+=($(sed -n '1 s=//codeql-extractor-options:==p' $src))
expected_status=$(sed -n 's=//codeql-extractor-expected-status:[[:space:]]*==p' $src)
expected_status=${expected_status:-0}