Skip to content

Commit 9fc00f6

Browse files
committed
Rename modules in fixtures to reflect their intent
1 parent b0057e3 commit 9fc00f6

File tree

9 files changed

+10
-10
lines changed

9 files changed

+10
-10
lines changed

Fixtures/ClangModules/ModuleMapGenerationCases/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ import PackageDescription
33
let package = Package(
44
name: "ModuleMapGenerationCases",
55
targets: [
6-
Target(name: "Baz", dependencies: ["Foo", "Bar", "Jaz"])]
6+
Target(name: "Baz", dependencies: ["FlatInclude", "UmbrellaHeader", "UmbellaModuleNameInclude"])]
77
)

Fixtures/ClangModules/ModuleMapGenerationCases/Sources/Baz/main.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import Foo
2-
import Bar
3-
import Jaz
1+
import UmbellaModuleNameInclude
2+
import FlatInclude
3+
import UmbrellaHeader
44

55
let _ = foo()
66
let _ = bar()

Fixtures/ClangModules/ModuleMapGenerationCases/Sources/Bar/Bar.c renamed to Fixtures/ClangModules/ModuleMapGenerationCases/Sources/FlatInclude/FlatInclude.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "include/Bar.h"
1+
#include "include/FlatInclude.h"
22

33
int bar() {
44
int a = 6;

Fixtures/ClangModules/ModuleMapGenerationCases/Sources/Jaz/Jaz.c renamed to Fixtures/ClangModules/ModuleMapGenerationCases/Sources/UmbellaModuleNameInclude/Jaz.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "include/Jaz/Paz.h"
1+
#include "include/UmbellaModuleNameInclude/Paz.h"
22

33
int jaz() {
44
int a = 6;

Fixtures/ClangModules/ModuleMapGenerationCases/Sources/Foo/Foo.c renamed to Fixtures/ClangModules/ModuleMapGenerationCases/Sources/UmbrellaHeader/UmbrellaHeader.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "include/Foo/Foo.h"
1+
#include "include/UmbrellaHeader/UmbrellaHeader.h"
22

33
int foo() {
44
int a = 5;

Tests/Functional/TestClangModules.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ class TestClangModulesTestCase: XCTestCase {
8686
func testModuleMapGenerationCases() {
8787
fixture(name: "ClangModules/ModuleMapGenerationCases") { prefix in
8888
XCTAssertBuilds(prefix)
89-
XCTAssertFileExists(prefix, ".build", "debug", "libFoo.so")
90-
XCTAssertFileExists(prefix, ".build", "debug", "libBar.so")
91-
XCTAssertFileExists(prefix, ".build", "debug", "libJaz.so")
89+
XCTAssertFileExists(prefix, ".build", "debug", "libUmbrellaHeader.so")
90+
XCTAssertFileExists(prefix, ".build", "debug", "libFlatInclude.so")
91+
XCTAssertFileExists(prefix, ".build", "debug", "libUmbellaModuleNameInclude.so")
9292
XCTAssertFileExists(prefix, ".build", "debug", "libNoIncludeDir.so")
9393
XCTAssertFileExists(prefix, ".build", "debug", "Baz")
9494
}

0 commit comments

Comments
 (0)