diff options
| author |  dannark <dannark@google.com> | 2018-06-27 13:35:04 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-27 13:36:25 -0700 |
| commit | 90e2b4b5e745fe2de9ca82bc8163c198e5be8ca9 (patch) | |
| tree | f827defac036acf55c4253c01f11126e0c502572 /src/test/java/com/google/devtools/build/lib/rules/cpp | |
| parent | 116971c08caa3f9bd94fc91066cd4cd1e432cafe (diff) | |
Automated refactor of Label.parseAbsolute() to always pass a repository mapping
RELNOTES: None
PiperOrigin-RevId: 202360925
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java | 2 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java index 18f661b953..49b14ea565 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java @@ -574,7 +574,7 @@ public class CcCommonTest extends BuildViewTestCase { "cc_library(name = 'lib',", " srcs = ['foo.cc'],", " includes = ['./'])"); - Label label = Label.parseAbsolute("@pkg//bar:lib"); + Label label = Label.parseAbsolute("@pkg//bar:lib", ImmutableMap.of()); ConfiguredTarget target = view.getConfiguredTargetForTesting(reporter, label, targetConfig); assertThat(view.hasErrors(target)).isFalse(); assertNoEvents(); diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java index 2f72860c2b..75071f359b 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java @@ -17,6 +17,7 @@ package com.google.devtools.build.lib.rules.cpp; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; @@ -67,7 +68,7 @@ public class CcToolchainSelectionTest extends BuildViewTestCase { (CcToolchainProvider) getRuleContext(target) .getToolchainContext() - .forToolchainType(Label.parseAbsolute(CPP_TOOLCHAIN_TYPE)); + .forToolchainType(Label.parseAbsolute(CPP_TOOLCHAIN_TYPE, ImmutableMap.of())); assertThat(Iterables.getOnlyElement(toolchain.getCompile()).getExecPathString()) .endsWith("piii"); } @@ -103,7 +104,7 @@ public class CcToolchainSelectionTest extends BuildViewTestCase { (CcToolchainProvider) getRuleContext(target) .getToolchainContext() - .forToolchainType(Label.parseAbsolute(CPP_TOOLCHAIN_TYPE)); + .forToolchainType(Label.parseAbsolute(CPP_TOOLCHAIN_TYPE, ImmutableMap.of())); assertThat(toolchain.getToolchainIdentifier()).endsWith("piii"); } @@ -164,7 +165,7 @@ public class CcToolchainSelectionTest extends BuildViewTestCase { (CcToolchainProvider) getRuleContext(target) .getToolchainContext() - .forToolchainType(Label.parseAbsolute(CPP_TOOLCHAIN_TYPE)); + .forToolchainType(Label.parseAbsolute(CPP_TOOLCHAIN_TYPE, ImmutableMap.of())); assertThat(toolchain.getToolPathFragment(CppConfiguration.Tool.LD).toString()) .contains("piii-ld"); } |