Skip to content

Commit f50708c

Browse files
authored
Merge pull request swiftlang#35781 from davezarzycki/pr35781
2 parents 24d2b6b + 9ab4c35 commit f50708c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

test/ModuleInterface/no-implicit-extra-clang-opts.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,20 @@ import SIMod
55

66
// Step 0: Copy relevant files into the temp dir which will serve as the search path
77
// RUN: cp %S/Inputs/implicit-options-inheritance/module.modulemap %t/module.modulemap
8+
// RUN: cp %S/Inputs/implicit-options-inheritance/test-dummy.modulemap %t/test-dummy.modulemap
89
// RUN: cp %S/Inputs/implicit-options-inheritance/CIMod.h %t/CIMod.h
910
// RUN: cp %S/Inputs/implicit-options-inheritance/SIMod.swiftinterface %t/SIMod.swiftinterface
1011

1112
// Step 1: Build this file, causing an implicit build of SIMod and CIMod into the module cache.
1213
// Pass in a clang arg pointing it to a modulemap that has nothing to do with downstream modules and is not on the search path.
1314

14-
// RUN: %target-swift-frontend -emit-module -module-name no-implicit-extra-clang-maps -o %t/no-implicit-extra-clang-maps.swiftmodule %s -I %t -Xcc -fmodule-map-file=%S/Inputs/implicit-options-inheritance/test-dummy.modulemap -module-cache-path %t/ModuleCache
15+
// RUN: %target-swift-frontend -emit-module -module-name no-implicit-extra-clang-maps -o %t/no-implicit-extra-clang-maps.swiftmodule %s -I %t -Xcc -fmodule-map-file=%t/test-dummy.modulemap -module-cache-path %t/ModuleCache
1516

1617
// Step 2: Touch the dummy modulemap we passed in with `-Xcc -fmodule-map-file` above.
17-
// RUN: touch %S/Inputs/implicit-options-inheritance/test-dummy.modulemap
18+
// RUN: touch %t/test-dummy.modulemap
1819

1920
// Step 3: Re-build this file, and ensure we are not re-building SIMod due to a dependency on the dummy file
20-
// RUN: %target-swift-frontend -emit-module -module-name no-implicit-extra-clang-maps -o %t/no-implicit-extra-clang-maps.swiftmodule %s -I %t -Xcc -fmodule-map-file=%S/Inputs/implicit-options-inheritance/test-dummy.modulemap -module-cache-path %t/ModuleCache -Rmodule-interface-rebuild 2>&1 | %FileCheck -allow-empty %s
21+
// RUN: %target-swift-frontend -emit-module -module-name no-implicit-extra-clang-maps -o %t/no-implicit-extra-clang-maps.swiftmodule %s -I %t -Xcc -fmodule-map-file=%t/test-dummy.modulemap -module-cache-path %t/ModuleCache -Rmodule-interface-rebuild 2>&1 | %FileCheck -allow-empty %s
2122

2223
// Step 4: Ensure that SIMod was not re-built
2324
// CHECK-NOT: remark: rebuilding module 'SIMod' from interface

0 commit comments

Comments
 (0)