diff options
| author |  hlopko <hlopko@google.com> | 2018-05-03 07:33:03 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-03 07:34:56 -0700 |
| commit | 70821069b0e39249eb0f23cf16ca4438c9703a7b (patch) | |
| tree | ec4406f1f9ca29f40be8659a1d4482bda5a9531b /src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java | |
| parent | ffb0913d9f2bd210717bccb9bdc00b39a6c1ba5f (diff) | |
Thread legacy compile flags through CcToolchainProvider for compile build variables
This cl shuffles code around so that compile build variables don't require rule
context and CppConfiguration.
RELNOTES: None.
PiperOrigin-RevId: 195249548
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java index e06dd63e2a..131bc9ce13 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java @@ -198,11 +198,11 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { .containsExactly(getToolPath("system-include-dir")); assertThat(ccProvider.getSysroot()).isNull(); - assertThat(CppHelper.getCompilerOptions(toolchain, ccProvider)) + assertThat(ccProvider.getLegacyCompileOptionsWithCopts()) .containsExactly("c", "fastbuild") .inOrder(); assertThat(toolchain.getCOptions()).isEmpty(); - assertThat(CppHelper.getCxxOptions(toolchain, ccProvider)) + assertThat(ccProvider.getCxxOptionsWithCopts()) .containsExactly("cxx", "cxx-fastbuild") .inOrder(); assertThat(ccProvider.getUnfilteredCompilerOptions()).containsExactly("unfiltered").inOrder(); @@ -511,11 +511,11 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { assertThat(ccProviderA.supportsEmbeddedRuntimes()).isTrue(); assertThat(ccProviderA.toolchainNeedsPic()).isTrue(); - assertThat(CppHelper.getCompilerOptions(toolchainA, ccProviderA)) + assertThat(ccProviderA.getLegacyCompileOptionsWithCopts()) .containsExactly( "compiler-flag-A-1", "compiler-flag-A-2", "fastbuild-flag-A-1", "fastbuild-flag-A-2") .inOrder(); - assertThat(CppHelper.getCxxOptions(toolchainA, ccProviderA)) + assertThat(ccProviderA.getCxxOptionsWithCopts()) .containsExactly( "cxx-flag-A-1", "cxx-flag-A-2", "cxx-fastbuild-flag-A-1", "cxx-fastbuild-flag-A-2") .inOrder(); @@ -622,9 +622,9 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { assertThat(ccProviderC.toolchainNeedsPic()).isFalse(); assertThat(ccProviderC.supportsFission()).isFalse(); - assertThat(CppHelper.getCompilerOptions(toolchainC, ccProviderC)).isEmpty(); + assertThat(ccProviderC.getLegacyCompileOptionsWithCopts()).isEmpty(); assertThat(toolchainC.getCOptions()).isEmpty(); - assertThat(CppHelper.getCxxOptions(toolchainC, ccProviderC)).isEmpty(); + assertThat(ccProviderC.getCxxOptionsWithCopts()).isEmpty(); assertThat(ccProviderC.getUnfilteredCompilerOptions()).isEmpty(); assertThat(CppHelper.getDynamicLinkOptions(toolchainC, ccProviderC, true)).isEmpty(); assertThat( @@ -673,7 +673,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { "linker-dbg-flag-B-2", "linker-lipo_" + lipoSuffix) .inOrder(); - assertThat(CppHelper.getCompilerOptions(toolchainB, ccProviderB)) + assertThat(ccProviderB.getLegacyCompileOptionsWithCopts()) .containsAllOf("compiler-flag-B-1", "compiler-flag-B-2", "lipo_" + lipoSuffix) .inOrder(); } |