diff options
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/BUILD | 18 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java | 11 |
2 files changed, 26 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index f3dd57262d..f3e0f829a4 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -1360,6 +1360,24 @@ java_test( ) java_test( + name = "repository-tests", + srcs = glob(["repository/*.java"]), + test_class = "com.google.devtools.build.lib.AllTests", + deps = [ + ":analysis_testutil", + "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib:events", + "//src/main/java/com/google/devtools/build/lib:io", + "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/skyframe", + "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", + "//third_party:auto_value", + "//third_party:guava", + "//third_party:truth", + ], +) + +java_test( name = "rules-tests", srcs = glob(["rules/*.java"]), test_class = "com.google.devtools.build.lib.AllTests", diff --git a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java index 6976f7942f..9d1607e36b 100644 --- a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java +++ b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java @@ -48,6 +48,7 @@ import com.google.devtools.build.lib.skyframe.SkyFunctions; import com.google.devtools.build.lib.skyframe.SkyframeExecutor; import com.google.devtools.build.lib.skyframe.WorkspaceASTFunction; import com.google.devtools.build.lib.skyframe.WorkspaceFileFunction; +import com.google.devtools.build.lib.syntax.SkylarkSemantics; import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor; import com.google.devtools.build.skyframe.EvaluationResult; import com.google.devtools.build.skyframe.InMemoryMemoizingEvaluator; @@ -82,8 +83,10 @@ public class ExternalPackageUtilTest extends BuildViewTestCase { AnalysisMock analysisMock = AnalysisMock.get(); AtomicReference<PathPackageLocator> pkgLocator = new AtomicReference<>( - new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)), - BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY); + new PathPackageLocator( + outputBase, + ImmutableList.of(rootDirectory), + BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY)); AtomicReference<ImmutableSet<PackageIdentifier>> deletedPackages = new AtomicReference<>(ImmutableSet.<PackageIdentifier>of()); BlazeDirectories directories = @@ -135,6 +138,7 @@ public class ExternalPackageUtilTest extends BuildViewTestCase { MemoizingEvaluator evaluator = new InMemoryMemoizingEvaluator(skyFunctions, differencer); driver = new SequentialBuildDriver(evaluator); PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get()); + PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, SkylarkSemantics.DEFAULT_SEMANTICS); } @Test @@ -182,7 +186,8 @@ public class ExternalPackageUtilTest extends BuildViewTestCase { assertThatEvaluationResult(result).hasNoError(); assertThat(result.get(key).registeredToolchainLabels()) - .containsExactly(makeLabel("//toolchain:tc1"), makeLabel("//toolchain:tc2")) + // There are default toolchains that are always registered, so just check for the ones added + .containsAllOf(makeLabel("//toolchain:tc1"), makeLabel("//toolchain:tc2")) .inOrder(); } |