diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java | 8 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java | 11 |
2 files changed, 4 insertions, 15 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java index b4e87827f2..ad23526dd9 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java @@ -85,27 +85,27 @@ public final class BazelMockCcSupport extends MockCcSupport { "cc_toolchain(name = 'cc-compiler-k8', all_files = ':empty', compiler_files = ':empty',", " cpu = 'local', dwp_files = ':empty', dynamic_runtime_libs = [':empty'], ", " linker_files = ':empty',", - " module_map = 'crosstool.cppmap', supports_header_parsing = 1,", + " module_map = 'crosstool.cppmap',", " objcopy_files = ':empty', static_runtime_libs = [':empty'], strip_files = ':empty',", ")", "cc_toolchain(name = 'cc-compiler-piii', all_files = ':empty', compiler_files = ':empty',", " cpu = 'local', dwp_files = ':empty', dynamic_runtime_libs = [':empty'], ", " linker_files = ':empty',", - " module_map = 'crosstool.cppmap', supports_header_parsing = 1,", + " module_map = 'crosstool.cppmap',", " objcopy_files = ':empty', static_runtime_libs = [':empty'], strip_files = ':empty',", ")", "cc_toolchain(name = 'cc-compiler-darwin', all_files = ':empty', ", " compiler_files = ':empty',", " cpu = 'local', dwp_files = ':empty', dynamic_runtime_libs = [':empty'], ", " linker_files = ':empty',", - " module_map = 'crosstool.cppmap', supports_header_parsing = 1,", + " module_map = 'crosstool.cppmap',", " objcopy_files = ':empty', static_runtime_libs = [':empty'], strip_files = ':empty',", ")", "cc_toolchain(name = 'cc-compiler-armeabi-v7a', all_files = ':empty', ", " compiler_files = ':empty',", " cpu = 'local', dwp_files = ':empty', dynamic_runtime_libs = [':empty'], ", " linker_files = ':empty',", - " module_map = 'crosstool.cppmap', supports_header_parsing = 1,", + " module_map = 'crosstool.cppmap',", " objcopy_files = ':empty', static_runtime_libs = [':empty'], strip_files = ':empty',", ")"); diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java index a11b7d7c3e..1dad94f569 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java @@ -668,17 +668,6 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { } @Test - public void testDoNotCompileSourceFilesInHeaders() throws Exception { - AnalysisMock.get() - .ccSupport() - .setupCrosstool(mockToolsConfig, MockCcSupport.HEADER_PROCESSING_FEATURE_CONFIGURATION); - useConfiguration("--features=parse_headers"); - ConfiguredTarget x = - scratchConfiguredTarget("x", "x", "cc_library(name = 'x', hdrs = ['x.cc'])"); - assertThat(getGeneratingAction(getBinArtifact("_objs/x/x/x.pic.o", x))).isNull(); - } - - @Test public void testIncludePathOrder() throws Exception { scratch.file("foo/BUILD", "cc_library(", |