mirror of
https://github.com/apple/swift.git
synced 2025-12-14 20:36:38 +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`
66 lines
2.7 KiB
Swift
66 lines
2.7 KiB
Swift
// This test ensures that the parent invocation's '-Xcc X' flags are inherited when building dependency modules
|
|
// RUN: %empty-directory(%t)
|
|
|
|
// Just running a compile is useful to make sure it succeeds because that means the transitive Clang module dependency
|
|
// received the TANGERINE macro
|
|
// RUN: %target-swift-frontend -typecheck -strict-implicit-module-context %s -I %S/Inputs/macro-only-module -Xcc -DTANGERINE=1 -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import
|
|
|
|
// RUN: %target-swift-frontend -scan-dependencies -strict-implicit-module-context %s -o %t/deps.json -I %S/Inputs/macro-only-module -Xcc -DTANGERINE=1 -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import
|
|
// RUN: %validate-json %t/deps.json &>/dev/null
|
|
// RUN: %FileCheck %s < %t/deps.json
|
|
|
|
import ImportsMacroSpecificClangModule
|
|
|
|
// CHECK: "directDependencies": [
|
|
// CHECK-NEXT: {
|
|
// CHECK-DAG: "swift": "ImportsMacroSpecificClangModule"
|
|
// CHECK-NEXT: },
|
|
// CHECK-NEXT: {
|
|
// CHECK-DAG: "swift": "Swift"
|
|
// CHECK-NEXT: },
|
|
// CHECK-NEXT: {
|
|
// CHECK-DAG: "swift": "SwiftOnoneSupport"
|
|
// CHECK-NEXT: }
|
|
// CHECK-NEXT: ],
|
|
|
|
//CHECK: "swift": "ImportsMacroSpecificClangModule"
|
|
//CHECK-NEXT: },
|
|
//CHECK-NEXT: {
|
|
//CHECK-NEXT: "modulePath": "{{.*}}{{/|\\}}ImportsMacroSpecificClangModule-{{.*}}.swiftmodule",
|
|
//CHECK-NEXT: "sourceFiles": [
|
|
//CHECK-NEXT: ],
|
|
//CHECK-NEXT: "directDependencies": [
|
|
//CHECK-NEXT: {
|
|
//CHECK-NEXT: "swift": "SubImportsMacroSpecificClangModule"
|
|
//CHECK-NEXT: },
|
|
//CHECK-NEXT: {
|
|
//CHECK-NEXT: "swift": "SwiftOnoneSupport"
|
|
|
|
//CHECK: "swift": "SubImportsMacroSpecificClangModule"
|
|
//CHECK-NEXT: },
|
|
//CHECK-NEXT: {
|
|
//CHECK-NEXT: "modulePath": "{{.*}}{{/|\\}}SubImportsMacroSpecificClangModule-{{.*}}.swiftmodule",
|
|
//CHECK-NEXT: "sourceFiles": [
|
|
//CHECK-NEXT: ],
|
|
//CHECK-NEXT: "directDependencies": [
|
|
//CHECK-NEXT: {
|
|
//CHECK-NEXT: "clang": "OnlyWithMacro"
|
|
|
|
// CHECK: "clang": "OnlyWithMacro"
|
|
// CHECK-NEXT: },
|
|
// CHECK-NEXT: {
|
|
// CHECK-NEXT: "modulePath": "{{.*}}{{/|\\}}OnlyWithMacro-{{.*}}.pcm",
|
|
// CHECK-NEXT: "sourceFiles": [
|
|
// CHECK-DAG: "{{.*}}OnlyWithMacro.h"
|
|
// CHECK-DAG: "{{.*}}module.modulemap"
|
|
// CHECK-NEXT: ],
|
|
// CHECK-NEXT: "directDependencies": [
|
|
// CHECK-NEXT: ],
|
|
// CHECK-NEXT: "details": {
|
|
// CHECK-NEXT: "clang": {
|
|
// CHECK-NEXT: "moduleMapPath": "{{.*}}module.modulemap",
|
|
// CHECK-NEXT: "contextHash": "{{.*}}",
|
|
// CHECK-NEXT: "commandLine": [
|
|
|
|
// CHECK: "TANGERINE=1"
|