Skip to content

Commit ddb13d1

Browse files
committed
Tests: Update tests importing AppKit from the SDK to use a local cache
Tests importing AppKit have a tendency to be flaky when they share a module cache with other builds using a different set of framework search flags. Make sure they use a local cache, otherwise the compiler can reuse incompatible cached modules. Alternatively, we could align all builds using the same cache to have exactly the same framework search paths or enable explicit module builds. I picked the module cache as it's the most reliable solution in the short and long term. rdar://142949965
1 parent 09edc47 commit ddb13d1

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

test/ClangImporter/SceneKit_test.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// RUN: %target-typecheck-verify-swift
1+
// RUN: %empty-directory(%t/cache)
2+
// RUN: %target-typecheck-verify-swift -module-cache-path %t/cache
23

34
// REQUIRES: objc_interop
45
// REQUIRES: OS=macosx

test/Interpreter/SDK/GLKit.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// RUN: %target-run-simple-swift | %FileCheck %s
1+
// RUN: %empty-directory(%t/cache)
2+
// RUN: %target-run-simple-swift(-module-cache-path %t/cache) | %FileCheck %s
23
// REQUIRES: executable_test
34

45
// NOTE: Clang used to miscompile GLKit functions on i386. rdar://problem/19184403

test/Interpreter/SDK/cf_extensions.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// RUN: %target-run-simple-swift
1+
// RUN: %empty-directory(%t/cache)
2+
// RUN: %target-run-simple-swift(-module-cache-path %t/cache)
23
// REQUIRES: executable_test
34

45
// REQUIRES: objc_interop

test/Interpreter/SDK/cf_type_bridging.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// RUN: %target-run-simple-swift
1+
// RUN: %empty-directory(%t/cache)
2+
// RUN: %target-run-simple-swift(-module-cache-path %t/cache)
23
// REQUIRES: executable_test
34

45
// REQUIRES: objc_interop

test/Interpreter/SDK/mapkit_header_static.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// RUN: %target-run-simple-swift | %FileCheck %s
1+
// RUN: %empty-directory(%t/cache)
2+
// RUN: %target-run-simple-swift(-module-cache-path %t/cache) | %FileCheck %s
23
// REQUIRES: executable_test
34

45
// REQUIRES: objc_interop

test/Interpreter/SDK/objc_ns_enum.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// RUN: %target-run-simple-swift
1+
// RUN: %empty-directory(%t/cache)
2+
// RUN: %target-run-simple-swift(-module-cache-path %t/cache)
23
// REQUIRES: executable_test
34

45
// NSButtonType (from AppKit) and UIViewAnimationCurve (from UIKit) both have

0 commit comments

Comments
 (0)