averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Driver] Always quote file paths in the build record.

Browse Source 
rdar://problem/21753365

Swift SVN r30054
This commit is contained in:
Jordan Rose
2015-07-10 01:39:12 +00:00
parent bee5114781
commit 40cd9e479b
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Driver/Compilation.cpp
View File

@@ -158,7 +158,7 @@ static void writeCompilationRecord(StringRef path, StringRef argsHash,
out << "inputs: \n"; out << "inputs: \n";
for (auto &entry : inputs) { for (auto &entry : inputs) {
out << "\t" << llvm::yaml::escape(entry.first->getValue()) << ": "; out << "\t\"" << llvm::yaml::escape(entry.first->getValue()) << "\": ";
switch (entry.second.status) { switch (entry.second.status) {
case CompileJobAction::InputInfo::UpToDate: case CompileJobAction::InputInfo::UpToDate:

42
test/Driver/Dependencies/fail-chained.swift
View File

@@ -15,13 +15,13 @@
// CHECK-FIRST: Handled f.swift // CHECK-FIRST: Handled f.swift
// CHECK-FIRST: Handled bad.swift // CHECK-FIRST: Handled bad.swift
// CHECK-RECORD-CLEAN-DAG: ./a.swift: [ // CHECK-RECORD-CLEAN-DAG: "./a.swift": [
// CHECK-RECORD-CLEAN-DAG: ./b.swift: [ // CHECK-RECORD-CLEAN-DAG: "./b.swift": [
// CHECK-RECORD-CLEAN-DAG: ./c.swift: [ // CHECK-RECORD-CLEAN-DAG: "./c.swift": [
// CHECK-RECORD-CLEAN-DAG: ./d.swift: [ // CHECK-RECORD-CLEAN-DAG: "./d.swift": [
// CHECK-RECORD-CLEAN-DAG: ./e.swift: [ // CHECK-RECORD-CLEAN-DAG: "./e.swift": [
// CHECK-RECORD-CLEAN-DAG: ./f.swift: [ // CHECK-RECORD-CLEAN-DAG: "./f.swift": [
// CHECK-RECORD-CLEAN-DAG: ./bad.swift: [ // CHECK-RECORD-CLEAN-DAG: "./bad.swift": [
// RUN: touch -t 201401240006 %t/a.swift // RUN: touch -t 201401240006 %t/a.swift
@@ -38,13 +38,13 @@
// NEGATIVE-A-NOT: Handled e.swift // NEGATIVE-A-NOT: Handled e.swift
// NEGATIVE-A-NOT: Handled f.swift // NEGATIVE-A-NOT: Handled f.swift
// CHECK-RECORD-A-DAG: ./a.swift: [ // CHECK-RECORD-A-DAG: "./a.swift": [
// CHECK-RECORD-A-DAG: ./b.swift: [ // CHECK-RECORD-A-DAG: "./b.swift": [
// CHECK-RECORD-A-DAG: ./c.swift: !dirty [ // CHECK-RECORD-A-DAG: "./c.swift": !dirty [
// CHECK-RECORD-A-DAG: ./d.swift: !dirty [ // CHECK-RECORD-A-DAG: "./d.swift": !dirty [
// CHECK-RECORD-A-DAG: ./e.swift: !private [ // CHECK-RECORD-A-DAG: "./e.swift": !private [
// CHECK-RECORD-A-DAG: ./f.swift: [ // CHECK-RECORD-A-DAG: "./f.swift": [
// CHECK-RECORD-A-DAG: ./bad.swift: !dirty [ // CHECK-RECORD-A-DAG: "./bad.swift": !dirty [
// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/a2.txt 2>&1 // RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/a2.txt 2>&1
// RUN: FileCheck -check-prefix=CHECK-A2 %s < %t/a2.txt // RUN: FileCheck -check-prefix=CHECK-A2 %s < %t/a2.txt
@@ -79,13 +79,13 @@
// NEGATIVE-B-NOT: Handled e.swift // NEGATIVE-B-NOT: Handled e.swift
// NEGATIVE-B-NOT: Handled f.swift // NEGATIVE-B-NOT: Handled f.swift
// CHECK-RECORD-B-DAG: ./a.swift: [ // CHECK-RECORD-B-DAG: "./a.swift": [
// CHECK-RECORD-B-DAG: ./b.swift: [ // CHECK-RECORD-B-DAG: "./b.swift": [
// CHECK-RECORD-B-DAG: ./c.swift: [ // CHECK-RECORD-B-DAG: "./c.swift": [
// CHECK-RECORD-B-DAG: ./d.swift: [ // CHECK-RECORD-B-DAG: "./d.swift": [
// CHECK-RECORD-B-DAG: ./e.swift: [ // CHECK-RECORD-B-DAG: "./e.swift": [
// CHECK-RECORD-B-DAG: ./f.swift: [ // CHECK-RECORD-B-DAG: "./f.swift": [
// CHECK-RECORD-B-DAG: ./bad.swift: !private [ // CHECK-RECORD-B-DAG: "./bad.swift": !private [
// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b2.txt 2>&1 // RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b2.txt 2>&1
// RUN: FileCheck -check-prefix=CHECK-B2 %s < %t/b2.txt // RUN: FileCheck -check-prefix=CHECK-B2 %s < %t/b2.txt

6
test/Driver/Dependencies/fail-simple.swift
View File

@@ -18,6 +18,6 @@
// CHECK-SECOND-NOT: Handled main.swift // CHECK-SECOND-NOT: Handled main.swift
// CHECK-SECOND-NOT: Handled other.swift // CHECK-SECOND-NOT: Handled other.swift
// CHECK-RECORD-DAG: ./bad.swift: !dirty [ // CHECK-RECORD-DAG: "./bad.swift": !dirty [
// CHECK-RECORD-DAG: ./main.swift: !dirty [ // CHECK-RECORD-DAG: "./main.swift": !dirty [
// CHECK-RECORD-DAG: ./other.swift: !private [ // CHECK-RECORD-DAG: "./other.swift": !private [

4
test/Driver/Dependencies/whole-module-build-record.swift
View File

@@ -9,8 +9,8 @@
// CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: warning
// CHECK-FIRST: Produced main.o // CHECK-FIRST: Produced main.o
// CHECK-RECORD-DAG: ./main.swift: [ // CHECK-RECORD-DAG: "./main.swift": [
// CHECK-RECORD-DAG: ./other.swift: [ // CHECK-RECORD-DAG: "./other.swift": [
// RUN: touch -t 201401240006 %t/other.swift // RUN: touch -t 201401240006 %t/other.swift