Migrate more tests to use Starlark cc_toolchain configuration.

Issue #5380 RELNOTES: None. PiperOrigin-RevId: 239168544
bazelbuild · Mar 19, 2019 · 43c0bb0 · 43c0bb0
1 parent 46defbc
commit 43c0bb0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 75 deletions.
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/cc_toolchain_config.bzl b/src/test/java/com/google/devtools/build/lib/analysis/mock/cc_toolchain_config.bzl
@@ -386,6 +386,7 @@ _thin_lto_feature = feature(
             ],
             flag_groups = [
                 flag_group(
+                    expand_if_available = "thinlto_param_file",
                     flags = ["thinlto_param_file=%{thinlto_param_file}"],
                 ),
             ],

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
@@ -120,6 +120,8 @@ public boolean apply(Artifact artifact) {
 
   public static final String SIMPLE_LAYERING_CHECK_FEATURE_CONFIGURATION = "simple_layering_check";
 
+  public static final String HEADER_MODULES_FEATURES = "header_modules_feature_configuration";
+
   /** A feature configuration snippet useful for testing header modules. */
   public static final String HEADER_MODULES_FEATURE_CONFIGURATION =
       "feature {"
@@ -252,28 +254,7 @@ public boolean apply(Artifact artifact) {
   public static final String HOST_AND_NONHOST_CONFIGURATION_FEATURES =
       "host_and_nonhost_configuration";
 
-  public static final String USER_COMPILE_FLAGS_CONFIGURATION =
-      "feature {"
-          + "  name: 'user_compile_flags'"
-          + "  enabled: true"
-          + "  flag_set {"
-          + "    action: 'assemble'"
-          + "    action: 'preprocess-assemble'"
-          + "    action: 'linkstamp-compile'"
-          + "    action: 'c-compile'"
-          + "    action: 'c++-compile'"
-          + "    action: 'c++-header-parsing'"
-          + "    action: 'c++-module-compile'"
-          + "    action: 'c++-module-codegen'"
-          + "    action: 'lto-backend'"
-          + "    action: 'clif-match'"
-          + "    flag_group {"
-          + "      flag: '%{user_compile_flags}'"
-          + "      iterate_over: 'user_compile_flags'"
-          + "      expand_if_all_available: 'user_compile_flags'"
-          + "    }"
-          + "  }"
-          + "}";
+  public static final String USER_COMPILE_FLAGS = "user_compile_flags";
 
   public static final String LEGACY_COMPILE_FLAGS_CONFIGURATION =
       "feature {"
@@ -349,57 +330,11 @@ public boolean apply(Artifact artifact) {
           + "  }"
           + "}";
 
-  public static final String THIN_LTO_LINKSTATIC_TESTS_USE_SHARED_NONLTO_BACKENDS_CONFIGURATION =
-      "feature {  name: 'thin_lto_linkstatic_tests_use_shared_nonlto_backends'}";
-
-  public static final String THIN_LTO_ALL_LINKSTATIC_USE_SHARED_NONLTO_BACKENDS_CONFIGURATION =
-      "feature {  name: 'thin_lto_all_linkstatic_use_shared_nonlto_backends'}";
-
-  public static final String ENABLE_AFDO_THINLTO_CONFIGURATION =
-      "feature {"
-          + "  name: 'enable_afdo_thinlto'"
-          + "  requires { feature: 'autofdo_implicit_thinlto' }"
-          + "  implies: 'thin_lto'"
-          + "}";
+  public static final String AUTOFDO_IMPLICIT_THINLTO = "autofdo_implicit_thinlto";
 
-  public static final String AUTOFDO_IMPLICIT_THINLTO_CONFIGURATION =
-      "feature {  name: 'autofdo_implicit_thinlto'}";
+  public static final String FDO_IMPLICIT_THINLTO = "fdo_implicit_thinlto";
 
-  public static final String ENABLE_FDO_THINLTO_CONFIGURATION =
-      "feature {"
-          + "  name: 'enable_fdo_thinlto'"
-          + "  requires { feature: 'fdo_implicit_thinlto' }"
-          + "  implies: 'thin_lto'"
-          + "}";
-
-  public static final String FDO_IMPLICIT_THINLTO_CONFIGURATION =
-      "feature {  name: 'fdo_implicit_thinlto'}";
-
-  public static final String ENABLE_XFDO_THINLTO_CONFIGURATION =
-      "feature {"
-          + "  name: 'enable_xbinaryfdo_thinlto'"
-          + "  requires { feature: 'xbinaryfdo_implicit_thinlto' }"
-          + "  implies: 'thin_lto'"
-          + "}";
-
-  public static final String XFDO_IMPLICIT_THINLTO_CONFIGURATION =
-      "feature {  name: 'xbinaryfdo_implicit_thinlto'}";
-
-  public static final String AUTO_FDO_CONFIGURATION =
-      "feature {"
-          + "  name: 'autofdo'"
-          + "  provides: 'profile'"
-          + "  flag_set {"
-          + "    action: 'c-compile'"
-          + "    action: 'c++-compile'"
-          + "    action: 'lto-backend'"
-          + "    flag_group {"
-          + "      expand_if_all_available: 'fdo_profile_path'"
-          + "      flag: '-fauto-profile=%{fdo_profile_path}'"
-          + "      flag: '-fprofile-correction'"
-          + "    }"
-          + "  }"
-          + "}";
+  public static final String XFDO_IMPLICIT_THINLTO = "xbinaryfdo_implicit_thinlto";
 
   public static final String IS_CC_FAKE_BINARY_CONFIGURATION =
       "feature { name: 'is_cc_fake_binary' }";

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportBaseConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportBaseConfiguredTargetTest.java
@@ -23,7 +23,7 @@
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.util.AnalysisMock;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
-import com.google.devtools.build.lib.packages.util.MockCcSupport;
+import com.google.devtools.build.lib.packages.util.Crosstool.CcToolchainConfig;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -117,10 +117,12 @@ public void testWrongCcImportDefinitions() throws Exception {
   public void testWrongCcImportDefinitionsOnWindows() throws Exception {
     AnalysisMock.get()
         .ccSupport()
-        .setupCrosstool(
+        .setupCcToolchainConfig(
             mockToolsConfig,
-            MockCcSupport.COPY_DYNAMIC_LIBRARIES_TO_BINARY_CONFIGURATION,
-            MockCcSupport.TARGETS_WINDOWS_CONFIGURATION);
+            CcToolchainConfig.builder()
+                .withFeatures(
+                    CppRuleClasses.COPY_DYNAMIC_LIBRARIES_TO_BINARY,
+                    CppRuleClasses.TARGETS_WINDOWS));
     useConfiguration();
     checkError(
         "a",