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`
50 lines
1.4 KiB
Swift
50 lines
1.4 KiB
Swift
// REQUIRES: objc_interop
|
|
|
|
// RUN: %empty-directory(%t)
|
|
// RUN: mkdir -p %t/clang-module-cache
|
|
// RUN: mkdir -p %t/cas
|
|
// RUN: split-file %s %t
|
|
// RUN: %hmaptool write %t/hmap.json %t/empty.hmap
|
|
|
|
// RUN: %target-swift-frontend -scan-dependencies -module-cache-path %t/clang-module-cache \
|
|
// RUN: %t/Test.swift -o %t/deps.json -cache-compile-job -cas-path %t/cas -clang-include-tree \
|
|
// RUN: -Xcc -fmodule-map-file=%t/module.modulemap -Xcc -ivfsoverlay -Xcc %t/empty.yaml \
|
|
// RUN: -Xcc -I%t/empty.hmap
|
|
// RUN: %validate-json %t/deps.json &>/dev/null
|
|
|
|
// RUN: %S/Inputs/SwiftDepsExtractor.py %t/deps.json deps casFSRootID > %t/fs.casid
|
|
// RUN: llvm-cas --cas %t/cas --ls-tree-recursive @%t/fs.casid | %FileCheck %s -DDIR=%basename_t -check-prefix FS_ROOT
|
|
// RUN: %S/Inputs/SwiftDepsExtractor.py %t/deps.json clang:Dummy clangIncludeTree > %t/tree.casid
|
|
// RUN: clang-cas-test --cas %t/cas --print-include-tree @%t/tree.casid | %FileCheck %s -DDIR=%basename_t -check-prefix INCLUDE_TREE
|
|
|
|
// FS_ROOT: [[DIR]].tmp/empty.hmap
|
|
// FS_ROOT: [[DIR]].tmp/empty.yaml
|
|
|
|
// INCLUDE_TREE: [[DIR]].tmp/Dummy.h
|
|
|
|
//--- Test.swift
|
|
import Dummy
|
|
func test() {}
|
|
|
|
//--- module.modulemap
|
|
module Dummy {
|
|
umbrella header "Dummy.h"
|
|
}
|
|
|
|
//--- Dummy.h
|
|
void dummy(void);
|
|
|
|
//--- hmap.json
|
|
{
|
|
"mappings": {}
|
|
}
|
|
|
|
//--- empty.yaml
|
|
{
|
|
"version": 0,
|
|
"case-sensitive": "false",
|
|
"use-external-names": true,
|
|
"roots": []
|
|
}
|
|
|