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`
42 lines
1.8 KiB
Swift
42 lines
1.8 KiB
Swift
// REQUIRES: objc_interop
|
|
|
|
// RUN: %empty-directory(%t)
|
|
// RUN: mkdir -p %t/clang-module-cache
|
|
// RUN: mkdir -p %t/cas
|
|
|
|
// RUN: %target-swift-frontend -emit-module -module-cache-path %t/clang-module-cache %S/../ScanDependencies/Inputs/Swift/E.swiftinterface -o %t/E.swiftmodule -I %S/../ScanDependencies/Inputs/CHeaders -I %S/../ScanDependencies/Inputs/Swift -swift-version 4
|
|
// RUN: %target-swift-frontend -emit-module -module-cache-path %t/clang-module-cache %S/../ScanDependencies/Inputs/Swift/A.swiftinterface -o %t/A.swiftmodule -I %S/../ScanDependencies/Inputs/CHeaders -I %S/../ScanDependencies/Inputs/Swift -swift-version 4
|
|
// RUN: %target-swift-frontend -scan-dependencies -module-cache-path %t/clang-module-cache %s -o %t/deps.json -I %t -swift-version 4 -cache-compile-job -cas-path %t/cas
|
|
// RUN: %validate-json %t/deps.json | %FileCheck %s -DTEMP=%t
|
|
|
|
/// Test binary module key: binary module key is the CASID of itself.
|
|
// RUN: %S/Inputs/SwiftDepsExtractor.py %t/deps.json swiftPrebuiltExternal:A moduleCacheKey > %t/A.key.casid
|
|
// RUN: llvm-cas --cas %t/cas --cat-blob @%t/A.key.casid > %t/Loaded.swiftmodule
|
|
// RUN: diff %t/A.swiftmodule %t/Loaded.swiftmodule
|
|
|
|
import A
|
|
import E
|
|
|
|
|
|
/// Main module
|
|
// CHECK-LABEL: "swift": "deps"
|
|
// CHECK: "directDependencies": [
|
|
// CHECK: "swiftPrebuiltExternal": "A"
|
|
// CHECK: "swiftPrebuiltExternal": "E"
|
|
// CHECK: "details": {
|
|
// CHECK: "casFSRootID"
|
|
|
|
/// E.swiftmodule
|
|
// CHECK-LABEL: "modulePath": "{{.*}}{{/|\\}}E.swiftmodule",
|
|
// CHECK: "details": {
|
|
// CHECK: "swiftPrebuiltExternal": {
|
|
// CHECK: "compiledModulePath":
|
|
// CHECK: "moduleCacheKey":
|
|
|
|
/// A.swiftmodule
|
|
// CHECK-LABEL: "modulePath": "{{.*}}{{/|\\}}A.swiftmodule",
|
|
// CHECK: "details": {
|
|
// CHECK: "swiftPrebuiltExternal": {
|
|
// CHECK: "compiledModulePath":
|
|
// CHECK: "moduleCacheKey":
|