Fix bazel tests depending on legacy gcc3 include path

#4683

Fixes one part of failures.

RELNOTES: None.
PiperOrigin-RevId: 186609441

2 files changed, 12 insertions, 11 deletions

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 5a7890c5ad..d5251d1113 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
@@ -36,7 +36,6 @@ import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.packages.ImplicitOutputsFunction;
 import com.google.devtools.build.lib.packages.util.MockCcSupport;
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget;
-import com.google.devtools.build.lib.testutil.TestConstants;
 import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
 import com.google.devtools.build.lib.util.FileType;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -939,10 +938,17 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
     CppCompileAction action = getCppCompileAction(target);
     String genfilesDir = target.getConfiguration().getGenfilesFragment().toString();
     // Local include paths come first.
-    assertContainsSublist(action.getCompilerOptions(), ImmutableList.of(
-        "-isystem", "foo/foo", "-isystem", genfilesDir + "/foo/foo",
-        "-isystem", "foo/bar", "-isystem", genfilesDir + "/foo/bar",
-        "-isystem", TestConstants.GCC_INCLUDE_PATH));
+    assertContainsSublist(
+        action.getCompilerOptions(),
+        ImmutableList.of(
+            "-isystem",
+            "foo/foo",
+            "-isystem",
+            genfilesDir + "/foo/foo",
+            "-isystem",
+            "foo/bar",
+            "-isystem",
+            genfilesDir + "/foo/bar"));
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProviderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProviderTest.java
index 641a581dc2..c79d7b0793 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProviderTest.java
@@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat;
 import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
 import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
-import com.google.devtools.build.lib.testutil.TestConstants;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -126,10 +125,6 @@ public class CcSkylarkApiProviderTest extends BuildViewTestCase {
         "    name = 'check_lib',",
         "    defines = ['foo'],",
         ")");
-    // The particular values for include directories are slightly
-    // fragile because the build system changes. But check for at
-    // least one normal include, one system include, and one define.
-    assertThat(getApi("//pkg:check").getCcFlags())
-        .containsAllOf("-iquote .", "-isystem " + TestConstants.GCC_INCLUDE_PATH, "-Dfoo");
+    assertThat(getApi("//pkg:check").getCcFlags()).contains("-Dfoo");
   }
 }