Skip to content

Commit ce4273d

Browse files
committed
Revert "Swift: use -typecheck in QL tests"
This reverts commit 34b8b43.
1 parent 3aa7123 commit ce4273d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

swift/tools/qltest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RESOURCE_DIR="$CODEQL_EXTRACTOR_SWIFT_ROOT/resource-dir/$CODEQL_PLATFORM"
99
export CODEQL_EXTRACTOR_SWIFT_LOG_LEVELS=${CODEQL_EXTRACTOR_SWIFT_LOG_LEVELS:-out:text:no_logs,out:console:info}
1010
for src in *.swift; do
1111
env=()
12-
opts=(-resource-dir "$RESOURCE_DIR" -typecheck -primary-file "$src")
12+
opts=(-resource-dir "$RESOURCE_DIR" -c -primary-file "$src")
1313
opts+=($(sed -n '1 s=//codeql-extractor-options:==p' $src))
1414
expected_status=$(sed -n 's=//codeql-extractor-expected-status:[[:space:]]*==p' $src)
1515
expected_status=${expected_status:-0}

swift/tools/test/qltest/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def assert_extractor_executed_with(*flags):
6060
for actual, expected in itertools.zip_longest(execution, flags):
6161
if actual:
6262
actual = actual.strip()
63-
expected_prefix = f"-resource-dir {swift_root}/resource-dir/{platform} -typecheck -primary-file "
63+
expected_prefix = f"-resource-dir {swift_root}/resource-dir/{platform} -c -primary-file "
6464
assert actual.startswith(expected_prefix), f"correct options not found in\n{actual}"
6565
actual = actual[len(expected_prefix):]
6666
assert actual, f"\nnot encountered: {expected}"

0 commit comments

Comments
 (0)