From 26aaea260d970e2022a7bdc911a01aa3679e0f3a Mon Sep 17 00:00:00 2001 From: hlopko Date: Tue, 26 Jun 2018 09:47:04 -0700 Subject: Remove support for header preprocessing This was never used. We thought it will be useful, but it's not. RELNOTES: None. PiperOrigin-RevId: 202143524 --- .../devtools/build/lib/packages/util/MockCcSupport.java | 15 ++------------- .../lib/rules/cpp/CcLibraryConfiguredTargetTest.java | 13 ++++++------- .../build/lib/rules/cpp/CompileCommandLineTest.java | 1 - 3 files changed, 8 insertions(+), 21 deletions(-) (limited to 'src/test') diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java index 6e22abb3fc..6fda1b5c93 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java @@ -80,10 +80,8 @@ public abstract class MockCcSupport { + " }" + "}"; - /** - * A feature configuration snippet useful for testing header processing. - */ - public static final String HEADER_PROCESSING_FEATURE_CONFIGURATION = + /** A feature configuration snippet useful for testing header processing. */ + public static final String PARSE_HEADERS_FEATURE_CONFIGURATION = "" + "feature {" + " name: 'parse_headers'" @@ -93,15 +91,6 @@ public abstract class MockCcSupport { + " flag: ''" + " }" + " }" - + "}" - + "feature {" - + " name: 'preprocess_headers'" - + " flag_set {" - + " action: 'c++-header-preprocessing'" - + " flag_group {" - + " flag: ''" - + " }" - + " }" + "}"; /** A feature configuration snippet useful for testing the layering check. */ 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 9505f052ff..0ceaee87c0 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 @@ -1078,7 +1078,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { public void testDoNotCompileSourceFilesInHeaders() throws Exception { AnalysisMock.get() .ccSupport() - .setupCrosstool(mockToolsConfig, MockCcSupport.HEADER_PROCESSING_FEATURE_CONFIGURATION); + .setupCrosstool(mockToolsConfig, MockCcSupport.PARSE_HEADERS_FEATURE_CONFIGURATION); useConfiguration("--features=parse_headers"); ConfiguredTarget x = scratchConfiguredTarget("x", "x", "cc_library(name = 'x', hdrs = ['x.cc'])"); @@ -1089,7 +1089,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { public void testProcessHeadersInDependencies() throws Exception { AnalysisMock.get() .ccSupport() - .setupCrosstool(mockToolsConfig, MockCcSupport.HEADER_PROCESSING_FEATURE_CONFIGURATION); + .setupCrosstool(mockToolsConfig, MockCcSupport.PARSE_HEADERS_FEATURE_CONFIGURATION); useConfiguration("--features=parse_headers", "--process_headers_in_dependencies"); ConfiguredTarget x = scratchConfiguredTarget( @@ -1105,7 +1105,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { public void testProcessHeadersInDependenciesOfBinaries() throws Exception { AnalysisMock.get() .ccSupport() - .setupCrosstool(mockToolsConfig, MockCcSupport.HEADER_PROCESSING_FEATURE_CONFIGURATION); + .setupCrosstool(mockToolsConfig, MockCcSupport.PARSE_HEADERS_FEATURE_CONFIGURATION); useConfiguration("--features=parse_headers", "--process_headers_in_dependencies"); ConfiguredTarget x = scratchConfiguredTarget( @@ -1124,7 +1124,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { public void testDoNotProcessHeadersInDependencies() throws Exception { AnalysisMock.get() .ccSupport() - .setupCrosstool(mockToolsConfig, MockCcSupport.HEADER_PROCESSING_FEATURE_CONFIGURATION); + .setupCrosstool(mockToolsConfig, MockCcSupport.PARSE_HEADERS_FEATURE_CONFIGURATION); useConfiguration("--features=parse_headers"); ConfiguredTarget x = scratchConfiguredTarget( @@ -1140,7 +1140,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { public void testProcessHeadersInCompileOnlyMode() throws Exception { AnalysisMock.get() .ccSupport() - .setupCrosstool(mockToolsConfig, MockCcSupport.HEADER_PROCESSING_FEATURE_CONFIGURATION); + .setupCrosstool(mockToolsConfig, MockCcSupport.PARSE_HEADERS_FEATURE_CONFIGURATION); useConfiguration("--features=parse_headers", "--process_headers_in_dependencies"); ConfiguredTarget y = scratchConfiguredTarget( @@ -1497,8 +1497,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { public void testProcessedHeadersWithPicSharedLibsAndNoPicBinaries() throws Exception { AnalysisMock.get() .ccSupport() - .setupCrosstool(mockToolsConfig, - MockCcSupport.HEADER_PROCESSING_FEATURE_CONFIGURATION); + .setupCrosstool(mockToolsConfig, MockCcSupport.PARSE_HEADERS_FEATURE_CONFIGURATION); useConfiguration("--features=parse_headers", "-c", "opt"); // Should not crash scratchConfiguredTarget("a", "a", "cc_library(name='a', hdrs=['a.h'])"); diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java index 1dffb0f870..37f32f1316 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java @@ -60,7 +60,6 @@ public class CompileCommandLineTest extends BuildViewTestCase { CppActionNames.C_COMPILE, CppActionNames.CPP_COMPILE, CppActionNames.CPP_HEADER_PARSING, - CppActionNames.CPP_HEADER_PREPROCESSING, CppActionNames.CPP_MODULE_CODEGEN, CppActionNames.CPP_MODULE_COMPILE)); } -- cgit v1.2.3