mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
70376a15f0
The code of `ScanDependencies.cpp` was creating invalid JSON since #66031 because in the case of having `extraPcmArgs` and `swiftOverlayDependencies`, but not `bridgingHeader`, a comma will not be added at the end of `extraPcmArgs`, creating an invalid JSON file. Additionally that same PR added a trailing comma at the end of the `swiftOverlayDependencies`, which valid JSON does not allow, but that bug was removed in #66366. Both problems are, however, present in the 5.9 branch, because #66936 included #66031, but not #66366. Besides fixing the problem in `ScanDependencies.cpp` I modified every test that uses `--scan-dependencies` to pass the produced JSON through Python's `json.tool` in order to validate proper JSON is produced. In most cases I was able to pipe the output of the tool into `FileCheck`, but in some cases the validation is done by itself because the checks depend on the exact format generated by `--scan-dependencies`. In a couple of tests I added a call to `FileCheck` that seemed to be missing. Without these changes, two tests seems to be generating invalid JSON in my machine: - `ScanDependencies/local_cache_consistency.swift` (which outputs `Expecting ',' delimiter: line 525 column 11 (char 22799)`) - `ScanDependencies/placholder_overlay_deps.swift`
40 lines
2.5 KiB
Swift
40 lines
2.5 KiB
Swift
// RUN: %empty-directory(%t)
|
|
// RUN: %empty-directory(%t/Foo.swiftmodule)
|
|
// RUN: %empty-directory(%t/ResourceDir/%target-sdk-name/prebuilt-modules/Foo.swiftmodule)
|
|
// RUN: echo "public func foo() {}" > %t/Foo.swift
|
|
|
|
import Foo
|
|
|
|
// HAS_COMPILED: "compiledModuleCandidates": [
|
|
// HAS_COMPILED-NEXT: "{{.*}}Foo.swiftmodule{{.*}}.swiftmodule"
|
|
|
|
// HAS_NO_COMPILED-NOT: "{{.*}}Foo.swiftmodule{{.*}}.swiftmodule"
|
|
|
|
// Step 1: build swift interface and swift module side by side
|
|
// RUN: %target-swift-frontend -emit-module %t/Foo.swift -emit-module-path %t/Foo.swiftmodule/%target-swiftmodule-name -module-name Foo -emit-module-interface-path %t/Foo.swiftmodule/%target-swiftinterface-name
|
|
|
|
// Step 2: scan dependency should give us the binary module adjacent to the interface file.
|
|
// RUN: %target-swift-frontend -scan-dependencies %s -o %t/deps.json -I %t -emit-dependencies -emit-dependencies-path %t/deps.d
|
|
// RUN: %validate-json %t/deps.json | %FileCheck %s -check-prefix=HAS_COMPILED
|
|
|
|
// Step 3: remove the adjacent module.
|
|
// RUN: rm %t/Foo.swiftmodule/%target-swiftmodule-name
|
|
|
|
// Step 4: scan dependency should give us the interface file.
|
|
// RUN: %target-swift-frontend -scan-dependencies %s -o %t/deps.json -I %t -emit-dependencies -emit-dependencies-path %t/deps.d
|
|
// RUN: %validate-json %t/deps.json | %FileCheck %s -check-prefix=HAS_NO_COMPILED
|
|
|
|
// Step 4: build prebuilt module cache using the interface.
|
|
// RUN: %target-swift-frontend -compile-module-from-interface -o %t/ResourceDir/%target-sdk-name/prebuilt-modules/Foo.swiftmodule/%target-swiftmodule-name -module-name Foo -disable-interface-lock %t/Foo.swiftmodule/%target-swiftinterface-name
|
|
|
|
// Step 5: scan dependency now should give us the prebuilt module cache
|
|
// RUN: %target-swift-frontend -scan-dependencies %s -o %t/deps.json -I %t -emit-dependencies -emit-dependencies-path %t/deps.d -sdk %t -prebuilt-module-cache-path %t/ResourceDir/%target-sdk-name/prebuilt-modules
|
|
// RUN: %validate-json %t/deps.json | %FileCheck %s -check-prefix=HAS_COMPILED
|
|
|
|
// Step 6: update the interface file from where the prebuilt module cache was built.
|
|
// RUN: touch %t/Foo.swiftmodule/%target-swiftinterface-name
|
|
|
|
// Step 7: scan dependency should give us the prebuilt module file even though it's out-of-date.
|
|
// RUN: %target-swift-frontend -scan-dependencies %s -o %t/deps.json -I %t -emit-dependencies -emit-dependencies-path %t/deps.d -sdk %t -prebuilt-module-cache-path %t/ResourceDir/%target-sdk-name/prebuilt-modules
|
|
// RUN: %validate-json %t/deps.json | %FileCheck %s -check-prefix=HAS_COMPILED
|