Merge pull request #16034 from github/redsun82/swift-move-integration-tests-to-internal

Swift: prepare integration tests for internal running

Author: redsun82

codeql-workspace.yml

@@ -28,7 +28,6 @@ provide:
   - "misc/suite-helpers/qlpack.yml"
   - "ruby/extractor-pack/codeql-extractor.yml"
   - "swift/extractor-pack/codeql-extractor.yml"
-  - "swift/integration-tests/qlpack.yml"
   - "ql/extractor-pack/codeql-extractor.yml"
   - ".github/codeql/extensions/**/codeql-pack.yml"
 

swift/.python-version

@@ -1 +1 @@
-3.8.14
+3.11

swift/actions/run-integration-tests/action.yml

@@ -18,7 +18,7 @@ runs:
     - name: Run integration tests
       shell: bash
       run: |
-        python swift/integration-tests/runner.py --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
+        python swift/ql/integration-tests/runner.py --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
       env:
         SEMMLE_DEBUG_TRACER: 10000
     - name: Upload test logs
@@ -27,5 +27,5 @@ runs:
       with:
         name: swift-integration-tests-logs-${{ runner.os }}
         path: |
-          swift/integration-tests/**/db/log
+          swift/ql/integration-tests/**/db/log
         retention-days: 1

swift/integration-tests/posix-only/deduplication/Relevant.qll

@@ -17,5 +17,5 @@ py_test(
         "diagnostics.expected",
         ":assert-false",
     ],
-    deps = ["//swift/integration-tests:integration_tests"],
+    deps = ["//swift/ql/integration-tests:utils"],
 )

swift/integration-tests/qlpack.yml

@@ -2,7 +2,7 @@
 import os
 import subprocess
 # We have to use importlib due to the '-' in the path
-diagnostics_test_utils = importlib.import_module("swift.integration-tests.diagnostics_test_utils")
+diagnostics_test_utils = importlib.import_module("swift.ql.integration-tests.diagnostics_test_utils")
 
 test_dir = "swift/logging/tests/assertion-diagnostics"
 

swift/logging/tests/assertion-diagnostics/BUILD.bazel

@@ -6,5 +6,5 @@ xcuserdata/
 DerivedData/
 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 *.actual
-db
+test-db
 *.swiftmodule

swift/logging/tests/assertion-diagnostics/test.py

@@ -1,5 +1,5 @@
 py_library(
-    name = "integration_tests",
+    name = "utils",
     srcs = [
         "create_database_utils.py",
         "diagnostics_test_utils.py",