Skip to content

Commit 0acaeef

Browse files
swift-ciswift-ci
committed
---
yaml --- r: 347429 b: refs/heads/master c: 803d48e h: refs/heads/master i: 347427: 65090e6
1 parent 54e9d3c commit 0acaeef

File tree

5 files changed

+25
-22
lines changed

5 files changed

+25
-22
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 32720a32a88b6585067f10ea3f79aa550d7a8578
2+
refs/heads/master: 803d48eaf5cbf62f5951c1891b1e32ebbdfb8714
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

‎trunk/test/Driver/profiling.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
// watchOS: {{(bin/)?ld(.exe)?"? }}
4242
// watchOS: lib{{(\\\\|/)}}swift{{(\\\\|/)}}clang{{(\\\\|/)}}lib{{(\\\\|/)}}darwin{{(\\\\|/)}}libclang_rt.profile_watchos.a
4343

44-
// watchOS_SIM: {{(bin/)?ld"? }}
44+
// watchOS_SIM: {{(bin/)?ld(.exe)?"? }}
4545
// watchOS_SIM: lib{{(\\\\|/)}}swift{{(\\\\|/)}}clang{{(\\\\|/)}}lib{{(\\\\|/)}}darwin{{(\\\\|/)}}libclang_rt.profile_watchossim.a
4646

4747
// LINUX: clang++{{(\.exe)?"? }}

‎trunk/test/ParseableInterface/ModuleCache/SDKDependencies.swift

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
// RUN: llvm-bcanalyzer -dump %t/prebuilt-cache/SdkLib.swiftmodule | %FileCheck %s -check-prefix=PREBUILT
1313
//
1414
// PREBUILT: MODULE_BLOCK
15-
// PREBUILT-NOT: FILE_DEPENDENCY {{.*}}/MCP/{{.*}}
16-
// PREBUILT-NOT: FILE_DEPENDENCY {{.*}}/prebuilt-cache/{{.*}}
17-
// PREBUILD-NOT: FILE_DEPENDENCY {{.*}}/lib/swift/{{.*}}
15+
// PREBUILT-NOT: FILE_DEPENDENCY {{.*[/\\]MCP[/\\]}}
16+
// PREBUILT-NOT: FILE_DEPENDENCY {{.*[/\\]prebuilt-cache[/\\]}}
17+
// PREBUILD-NOT: FILE_DEPENDENCY {{.*[/\\]lib[/\\]swift[/\\]}}
1818
//
1919
// Re-build them in the opposite order
2020
// RUN: %empty-directory(%t/prebuilt-cache)
@@ -50,8 +50,8 @@
5050
// RUN: cat %t/dummy.d | %FileCheck %s -check-prefix=DEPFILE-NEGATIVE
5151
// RUN: cat %t/dummy.d | %FileCheck %s -check-prefix=DEPFILE
5252
//
53-
// DEPFILE-NEGATIVE-NOT: /MCP/
54-
// DEPFILE-NEGATIVE-NOT: /prebuilt-cache/
53+
// DEPFILE-NEGATIVE-NOT: {{[/\\]MCP[/\\]}}
54+
// DEPFILE-NEGATIVE-NOT: {{[/\\]prebuilt-cache[/\\]}}
5555
//
5656
// DEPFILE-DAG: SomeCModule.h
5757
// DEPFILE-DAG: SdkLib.swiftinterface
@@ -79,21 +79,21 @@
7979
// RUN: cat %t/MCP/SdkLib-*.swiftmodule | %FileCheck %s -check-prefixes=EXLIB,SDKLIB
8080
//
8181
// EXLIB: dependencies:
82-
// EXLIB-DAG: /my-sdk/usr/include/module.modulemap
83-
// EXLIB-DAG: /my-sdk/usr/include/SomeCModule.h
84-
// EXLIB-DAG: /my-sdk/ExportedLib.swiftinterface
85-
// SDKLIB-DAG: /my-sdk/SdkLib.swiftinterface
82+
// EXLIB-DAG: {{[/\\]my-sdk[/\\]usr[/\\]include[/\\]}}module.modulemap
83+
// EXLIB-DAG: {{[/\\]my-sdk[/\\]usr[/\\]include[/\\]}}SomeCModule.h
84+
// EXLIB-DAG: {{[/\\]my-sdk[/\\]}}ExportedLib.swiftinterface
85+
// SDKLIB-DAG: {{[/\\]my-sdk[/\\]}}SdkLib.swiftinterface
8686
//
8787
// Check they don't contain any dependencies from either cache other than themselves
8888
// RUN: cat %t/MCP/ExportedLib-*.swiftmodule | %FileCheck %s -check-prefix=NOCACHE -DLIB_NAME=ExportedLib
8989
// RUN: cat %t/MCP/SdkLib-*.swiftmodule | %FileCheck %s -check-prefix=NOCACHE -DLIB_NAME=SdkLib
9090
//
9191
// NOCACHE: dependencies:
92-
// NOCACHE-NOT: /prebuilt-cache/
93-
// NOCACHE-NOT: /MCP/
94-
// NOCACHE: /prebuilt-cache/[[LIB_NAME]].swiftmodule
95-
// NOCACHE-NOT: /prebuilt-cache/
96-
// NOCACHE-NOT: /MCP/
92+
// NOCACHE-NOT: {{[/\\]prebuilt-cache[/\\]}}
93+
// NOCACHE-NOT: {{[/\\]MCP[/\\]}}
94+
// NOCACHE: {{[/\\]prebuilt-cache[/\\]}}[[LIB_NAME]].swiftmodule
95+
// NOCACHE-NOT: {{[/\\]prebuilt-cache[/\\]}}
96+
// NOCACHE-NOT: {{[/\\]MCP[/\\]}}
9797
//
9898
// Check we didn't emit anything from the cache in the .d file either
9999
// RUN: cat %t/dummy.d | %FileCheck %s -check-prefix=DEPFILE-NEGATIVE
@@ -122,10 +122,10 @@
122122
// RUN: cat %t/MCP/ExportedLib-*.swiftmodule | %FileCheck %s -check-prefix=NEW-EXLIB
123123
// RUN: cat %t/MCP/SdkLib-*.swiftmodule | %FileCheck %s -check-prefixes=NEW-EXLIB,NEW-SDKLIB
124124
//
125-
// NEW-EXLIB-DAG: /my-new-sdk/usr/include/module.modulemap
126-
// NEW-EXLIB-DAG: /my-new-sdk/usr/include/SomeCModule.h
127-
// NEW-EXLIB-DAG: /my-new-sdk/ExportedLib.swiftinterface
128-
// NEW-SDKLIB-DAG: /my-new-sdk/SdkLib.swiftinterface
125+
// NEW-EXLIB-DAG: {{[/\\]my-new-sdk[/\\]usr[/\\]include[/\\]}}module.modulemap
126+
// NEW-EXLIB-DAG: {{[/\\]my-new-sdk[/\\]usr[/\\]include[/\\]}}SomeCModule.h
127+
// NEW-EXLIB-DAG: {{[/\\]my-new-sdk[/\\]}}ExportedLib.swiftinterface
128+
// NEW-SDKLIB-DAG: {{[/\\]my-new-sdk[/\\]}}SdkLib.swiftinterface
129129
//
130130
// Check they don't contain dependencies from the module cache, old prebuilt
131131
// cache, or new prebuilt cache

‎trunk/test/ParseableInterface/ModuleCache/SystemDependencies.swiftinterface

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@
3535

3636
// Check that it picked a different cache key.
3737
// RUN: %empty-directory(%t/MCP-combined)
38-
// RUN: cp -n %t/MCP/SystemDependencies*.swiftmodule %t/MCP-combined
39-
// RUN: cp -n %t/MCP-system/SystemDependencies*.swiftmodule %t/MCP-combined
38+
// RUN: cp %t/MCP/SystemDependencies*.swiftmodule %t/MCP-combined
39+
// RUN: cp %t/MCP-system/SystemDependencies*.swiftmodule %t/MCP-combined
40+
// RUN: ls -1 %t/MCP-combined | %FileCheck %s -check-prefix=MODULECACHE
4041

4142
// NEGATIVE-NOT: SomeCModule.h
4243
// CHECK: SomeCModule.h
44+
// MODULECACHE-COUNT-2: SystemDependencies-{{[^ ]+}}.swiftmodule
4345

4446
import SomeCModule

‎trunk/utils/build-script-impl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3089,6 +3089,7 @@ for host in "${ALL_HOSTS[@]}"; do
30893089
LIBDISPATCH_BUILD_DIR="$(build_directory ${host} libdispatch)"
30903090
FOUNDATION_BUILD_DIR=$(build_directory ${host} foundation)
30913091
DOTEST_EXTRA="-I${FOUNDATION_BUILD_DIR}"
3092+
DOTEST_EXTRA="-Xcc -F${FOUNDATION_BUILD_DIR}"
30923093
DOTEST_EXTRA="-Xcc -F${FOUNDATION_BUILD_DIR}/CoreFoundation-prefix/System/Library/Frameworks"
30933094
DOTEST_EXTRA="${DOTEST_EXTRA} -I${FOUNDATION_BUILD_DIR}/swift"
30943095
DOTEST_EXTRA="${DOTEST_EXTRA} -I${LIBDISPATCH_SOURCE_DIR}"

0 commit comments

Comments
 (0)