diff options
Diffstat (limited to 'src')
6 files changed, 15 insertions, 40 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java index 33957cf570..66f46ce8e2 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java @@ -308,7 +308,7 @@ public class BazelRuleClassProvider { private static void initJava(ConfiguredRuleClassProvider.Builder builder) { builder.addConfigurationOptions(JavaOptions.class); - builder.addConfigurationFragment(new JvmConfigurationLoader(false, JAVA_CPU_SUPPLIER)); + builder.addConfigurationFragment(new JvmConfigurationLoader(JAVA_CPU_SUPPLIER)); builder.addConfigurationFragment(new JavaConfigurationLoader()); builder.addBuildInfoFactory(new BazelJavaBuildInfoFactory()); diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JvmConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/java/JvmConfigurationLoader.java index 4ac4a38ba7..89104f9d0e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JvmConfigurationLoader.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JvmConfigurationLoader.java @@ -52,16 +52,10 @@ import javax.annotation.Nullable; * <p>The loader also supports legacy mode, where the JVM can be defined with an abolute path. */ public final class JvmConfigurationLoader implements ConfigurationFragmentFactory { - private final boolean forceLegacy; private final JavaCpuSupplier cpuSupplier; - public JvmConfigurationLoader(boolean forceLegacy, JavaCpuSupplier cpuSupplier) { - this.forceLegacy = forceLegacy; - this.cpuSupplier = cpuSupplier; - } - public JvmConfigurationLoader(JavaCpuSupplier cpuSupplier) { - this(/*forceLegacy=*/ false, cpuSupplier); + this.cpuSupplier = cpuSupplier; } @Override @@ -78,12 +72,10 @@ public final class JvmConfigurationLoader implements ConfigurationFragmentFactor return null; } - if (!forceLegacy) { - try { - return createDefault(env, javaHome, cpu); - } catch (LabelSyntaxException e) { - // Try again with legacy - } + try { + return createDefault(env, javaHome, cpu); + } catch (LabelSyntaxException e) { + // Try again with legacy } return createLegacy(javaHome); diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java index 18bc7bd211..75a5f67c01 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java @@ -1083,7 +1083,7 @@ public class BuildViewTest extends BuildViewTestBase { "filegroup(name = 'jdk', srcs = [", " '//does/not/exist:a-piii', '//does/not/exist:b-k8', '//does/not/exist:c-default'])"); scratch.file("does/not/exist/BUILD"); - useConfigurationFactory(AnalysisMock.get().createFullConfigurationFactory()); + useConfigurationFactory(AnalysisMock.get().createConfigurationFactory()); useConfiguration("--javabase=//jdk"); reporter.removeHandler(failFastHandler); try { diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java index 7933e8a10f..c654be1d2b 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java @@ -136,22 +136,20 @@ public class BuildConfigurationTest extends ConfigurationTestCase { assertEquals(a.cacheKey(), b.cacheKey()); } - private void checkInvalidCpuError(String cpuOption, Pattern messageRegex) throws Exception { + @Test + public void testInvalidCpu() throws Exception { + // TODO(ulfjack): It would be better to get the better error message also if the Jvm is enabled. + // Currently: "No JVM target found under //tools/jdk:jdk that would work for bogus" try { - create("--" + cpuOption + "=bogus"); + create("--cpu=bogus", "--experimental_disable_jvm"); fail(); } catch (InvalidConfigurationException e) { - assertThat(e.getMessage()).matches(messageRegex); + assertThat(e.getMessage()).matches(Pattern.compile( + "No toolchain found for cpu 'bogus'. Valid cpus are: \\[\n( [\\w-]+,\n)+]")); } } @Test - public void testInvalidCpu() throws Exception { - checkInvalidCpuError("cpu", Pattern.compile( - "No toolchain found for cpu 'bogus'. Valid cpus are: \\[\n( [\\w-]+,\n)+]")); - } - - @Test public void testConfigurationsHaveUniqueOutputDirectories() throws Exception { assertConfigurationsHaveUniqueOutputDirectories(createCollection()); assertConfigurationsHaveUniqueOutputDirectories(createCollection("--compilation_mode=opt")); diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java index 1f97e5a764..9a663e5e55 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java @@ -208,7 +208,7 @@ public final class BazelAnalysisMock extends AnalysisMock { new CppConfigurationLoader(Functions.<String>identity()), new PythonConfigurationLoader(Functions.<String>identity()), new BazelPythonConfiguration.Loader(), - new JvmConfigurationLoader(false, BazelRuleClassProvider.JAVA_CPU_SUPPLIER), + new JvmConfigurationLoader(BazelRuleClassProvider.JAVA_CPU_SUPPLIER), new JavaConfigurationLoader(), new ObjcConfigurationLoader(), new AppleConfiguration.Loader(), @@ -217,11 +217,6 @@ public final class BazelAnalysisMock extends AnalysisMock { } @Override - public ConfigurationFactory createFullConfigurationFactory() { - return createConfigurationFactory(); - } - - @Override public ConfigurationCollectionFactory createConfigurationCollectionFactory() { return new BazelConfigurationCollection(); } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java index cd74384ac5..27351e4ff9 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java @@ -65,11 +65,6 @@ public abstract class AnalysisMock { public abstract ConfigurationFactory createConfigurationFactory(); - /** - * Creates a configuration factory that doesn't contain any mock parts. - */ - public abstract ConfigurationFactory createFullConfigurationFactory(); - public abstract ConfigurationCollectionFactory createConfigurationCollectionFactory(); public abstract ConfiguredRuleClassProvider createRuleClassProvider(); @@ -125,11 +120,6 @@ public abstract class AnalysisMock { } @Override - public ConfigurationFactory createFullConfigurationFactory() { - return delegate.createFullConfigurationFactory(); - } - - @Override public ConfigurationCollectionFactory createConfigurationCollectionFactory() { return delegate.createConfigurationCollectionFactory(); } |