diff options
Diffstat (limited to 'src/test')
3 files changed, 23 insertions, 47 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java index 7ab4d65212..9baa24938a 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java @@ -80,7 +80,7 @@ import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData; import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey; import com.google.devtools.build.lib.skyframe.SkyframeBuildView; import com.google.devtools.build.lib.skyframe.SkyframeExecutor; -import com.google.devtools.build.lib.skyframe.ToolchainUtil.ToolchainContextException; +import com.google.devtools.build.lib.skyframe.ToolchainException; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.util.OrderedSetMultimap; import com.google.devtools.build.skyframe.SkyKey; @@ -450,7 +450,7 @@ public class BuildViewForTesting { StoredEventHandler eventHandler, BuildConfigurationCollection configurations) throws EvalException, InvalidConfigurationException, InterruptedException, - InconsistentAspectOrderException, ToolchainContextException { + InconsistentAspectOrderException, ToolchainException { BuildConfiguration targetConfig = skyframeExecutor.getConfiguration(eventHandler, target.getConfigurationKey()); CachingAnalysisEnvironment env = @@ -476,7 +476,7 @@ public class BuildViewForTesting { AnalysisEnvironment env, BuildConfigurationCollection configurations) throws EvalException, InvalidConfigurationException, InterruptedException, - InconsistentAspectOrderException, ToolchainContextException { + InconsistentAspectOrderException, ToolchainException { BuildConfiguration targetConfig = skyframeExecutor.getConfiguration(eventHandler, configuredTarget.getConfigurationKey()); Target target = null; diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java index 7626ce5b0e..4ade87d5e9 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java @@ -114,8 +114,25 @@ public class RegisteredToolchainsFunctionTest extends ToolchainTestCase { } @Test + public void testRegisteredToolchains_invalidPattern() throws Exception { + rewriteWorkspace("register_toolchains('/:invalid:label:syntax')"); + + // Request the toolchains. + SkyKey toolchainsKey = RegisteredToolchainsValue.key(targetConfigKey); + EvaluationResult<RegisteredToolchainsValue> result = + requestToolchainsFromSkyframe(toolchainsKey); + assertThatEvaluationResult(result) + .hasErrorEntryForKeyThat(toolchainsKey) + .hasExceptionThat() + .hasMessageThat() + .contains( + "invalid registered toolchain '/:invalid:label:syntax': " + + "not a valid absolute pattern"); + } + + @Test public void testRegisteredToolchains_notToolchain() throws Exception { - rewriteWorkspace("register_toolchains(", " '//error:not_a_toolchain')"); + rewriteWorkspace("register_toolchains('//error:not_a_toolchain')"); scratch.file("error/BUILD", "filegroup(name = 'not_a_toolchain')"); // Request the toolchains. diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainUtilTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainUtilTest.java index fa3af8e923..4a78f59e8c 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainUtilTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainUtilTest.java @@ -29,7 +29,6 @@ import com.google.devtools.build.lib.rules.platform.ToolchainTestCase; import com.google.devtools.build.lib.skyframe.ToolchainUtil.InvalidConstraintValueException; import com.google.devtools.build.lib.skyframe.ToolchainUtil.InvalidPlatformException; import com.google.devtools.build.lib.skyframe.ToolchainUtil.NoMatchingPlatformException; -import com.google.devtools.build.lib.skyframe.ToolchainUtil.ToolchainContextException; import com.google.devtools.build.lib.skyframe.ToolchainUtil.UnresolvedToolchainsException; import com.google.devtools.build.lib.skyframe.util.SkyframeExecutorTestUtils; import com.google.devtools.build.skyframe.EvaluationResult; @@ -205,16 +204,10 @@ public class ToolchainUtilTest extends ToolchainTestCase { assertThatEvaluationResult(result) .hasErrorEntryForKeyThat(key) .hasExceptionThat() - .isInstanceOf(ToolchainContextException.class); - assertThatEvaluationResult(result) - .hasErrorEntryForKeyThat(key) - .hasExceptionThat() - .hasCauseThat() .isInstanceOf(UnresolvedToolchainsException.class); assertThatEvaluationResult(result) .hasErrorEntryForKeyThat(key) .hasExceptionThat() - .hasCauseThat() .hasMessageThat() .contains("no matching toolchains found for types //fake/toolchain:type_1"); } @@ -238,11 +231,6 @@ public class ToolchainUtilTest extends ToolchainTestCase { assertThatEvaluationResult(result) .hasErrorEntryForKeyThat(key) .hasExceptionThat() - .isInstanceOf(ToolchainContextException.class); - assertThatEvaluationResult(result) - .hasErrorEntryForKeyThat(key) - .hasExceptionThat() - .hasCauseThat() .isInstanceOf(UnresolvedToolchainsException.class); // Only one of the missing types will be reported, so do not check the specific error message. } @@ -261,16 +249,10 @@ public class ToolchainUtilTest extends ToolchainTestCase { assertThatEvaluationResult(result) .hasErrorEntryForKeyThat(key) .hasExceptionThat() - .isInstanceOf(ToolchainContextException.class); - assertThatEvaluationResult(result) - .hasErrorEntryForKeyThat(key) - .hasExceptionThat() - .hasCauseThat() .isInstanceOf(InvalidPlatformException.class); assertThatEvaluationResult(result) .hasErrorEntryForKeyThat(key) .hasExceptionThat() - .hasCauseThat() .hasMessageThat() .contains("//invalid:not_a_platform"); } @@ -289,16 +271,10 @@ public class ToolchainUtilTest extends ToolchainTestCase { assertThatEvaluationResult(result) .hasErrorEntryForKeyThat(key) .hasExceptionThat() - .isInstanceOf(ToolchainContextException.class); - assertThatEvaluationResult(result) - .hasErrorEntryForKeyThat(key) - .hasExceptionThat() - .hasCauseThat() .isInstanceOf(InvalidPlatformException.class); assertThatEvaluationResult(result) .hasErrorEntryForKeyThat(key) .hasExceptionThat() - .hasCauseThat() .hasMessageThat() .contains("//invalid:not_a_platform"); } @@ -317,16 +293,10 @@ public class ToolchainUtilTest extends ToolchainTestCase { assertThatEvaluationResult(result) .hasErrorEntryForKeyThat(key) .hasExceptionThat() - .isInstanceOf(ToolchainContextException.class); - assertThatEvaluationResult(result) - .hasErrorEntryForKeyThat(key) - .hasExceptionThat() - .hasCauseThat() .isInstanceOf(InvalidPlatformException.class); assertThatEvaluationResult(result) .hasErrorEntryForKeyThat(key) .hasExceptionThat() - .hasCauseThat() .hasMessageThat() .contains("//invalid:not_a_platform"); } @@ -393,16 +363,10 @@ public class ToolchainUtilTest extends ToolchainTestCase { assertThatEvaluationResult(result) .hasErrorEntryForKeyThat(key) .hasExceptionThat() - .isInstanceOf(ToolchainContextException.class); - assertThatEvaluationResult(result) - .hasErrorEntryForKeyThat(key) - .hasExceptionThat() - .hasCauseThat() .isInstanceOf(InvalidConstraintValueException.class); assertThatEvaluationResult(result) .hasErrorEntryForKeyThat(key) .hasExceptionThat() - .hasCauseThat() .hasMessageThat() .contains("//platforms:linux"); } @@ -451,11 +415,6 @@ public class ToolchainUtilTest extends ToolchainTestCase { assertThatEvaluationResult(result) .hasErrorEntryForKeyThat(key) .hasExceptionThat() - .isInstanceOf(ToolchainContextException.class); - assertThatEvaluationResult(result) - .hasErrorEntryForKeyThat(key) - .hasExceptionThat() - .hasCauseThat() .isInstanceOf(NoMatchingPlatformException.class); } @@ -552,7 +511,7 @@ public class ToolchainUtilTest extends ToolchainTestCase { return null; } return CreateToolchainContextValue.create(toolchainContext); - } catch (ToolchainContextException e) { + } catch (ToolchainException e) { throw new CreateToolchainContextFunctionException(e); } } @@ -565,7 +524,7 @@ public class ToolchainUtilTest extends ToolchainTestCase { } private static class CreateToolchainContextFunctionException extends SkyFunctionException { - public CreateToolchainContextFunctionException(ToolchainContextException e) { + public CreateToolchainContextFunctionException(ToolchainException e) { super(e, Transience.PERSISTENT); } } |