diff options
author | Googler <noreply@google.com> | 2018-02-05 00:58:07 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-02-05 00:59:34 -0800 |
commit | 152b22dd9d817e7f01f88cd8b62928052f0a32df (patch) | |
tree | 5352145f8ef9f0090811adf80485f099367546f6 /src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java | |
parent | 45a0ffedf7b4cb3a9e8a12199565a89b05f29833 (diff) |
Convert "-" to "" when generating module name
RELNOTES: None.
PiperOrigin-RevId: 184492828
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java index 4a1599024c..b477492ed4 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java @@ -598,17 +598,18 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { useConfiguration( "--crosstool_top=" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL, "--experimental_objc_enable_module_maps"); - createLibraryTargetWriter("//objc:lib") + String target = "//objc/library:lib@a-foo_foobar"; + createLibraryTargetWriter(target) .setAndCreateFiles("srcs", "a.m", "b.m", "private.h") .setAndCreateFiles("hdrs", "c.h") .write(); - CommandAction compileActionA = compileAction("//objc:lib", "a.o"); + CommandAction compileActionA = compileAction(target, "a.o"); assertThat(compileActionA.getArguments()) - .containsAllIn(moduleMapArtifactArguments("//objc", "lib")); + .containsAllIn(moduleMapArtifactArguments("//objc/library", "lib@a-foo_foobar")); assertThat(compileActionA.getArguments()).contains("-fmodule-maps"); assertThat(Artifact.toRootRelativePaths(compileActionA.getInputs())) - .doesNotContain("objc/lib.modulemaps/module.modulemap"); + .doesNotContain("objc/library/lib@a-foo_foobar.modulemaps/module.modulemap"); } @Test |