diff options
Diffstat (limited to 'src/test/java/com/google')
9 files changed, 30 insertions, 14 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java index 76b2c11e03..db0744db75 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java @@ -71,7 +71,9 @@ abstract class ArtifactFunctionTestCase { setupRoot(new CustomInMemoryFs()); AtomicReference<PathPackageLocator> pkgLocator = new AtomicReference<>(new PathPackageLocator( root.getFileSystem().getPath("/outputbase"), ImmutableList.of(root))); - ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(pkgLocator, false); + BlazeDirectories directories = new BlazeDirectories(root, root, root); + ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( + pkgLocator, false, directories); differencer = new RecordingDifferencer(); evaluator = new InMemoryMemoizingEvaluator( @@ -95,7 +97,7 @@ abstract class ArtifactFunctionTestCase { new WorkspaceFileFunction( TestRuleClassProvider.getRuleClassProvider(), new PackageFactory(TestRuleClassProvider.getRuleClassProvider()), - new BlazeDirectories(root, root, root))) + directories)) .put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()) .build(), differencer); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java index aa6dcd974d..22a8dbeb73 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertTrue; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.testing.EqualsTester; +import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.events.NullEventHandler; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; @@ -59,7 +60,8 @@ public class ContainingPackageLookupFunctionTest extends FoundationTestCase { AtomicReference<PathPackageLocator> pkgLocator = new AtomicReference<>(new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory))); deletedPackages = new AtomicReference<>(ImmutableSet.<PackageIdentifier>of()); - ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(pkgLocator, false); + ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( + pkgLocator, false, new BlazeDirectories(rootDirectory, rootDirectory, rootDirectory)); Map<SkyFunctionName, SkyFunction> skyFunctions = new HashMap<>(); skyFunctions.put(SkyFunctions.PACKAGE_LOOKUP, new PackageLookupFunction(deletedPackages)); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java index 7e1e1cb040..b0469509b1 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java @@ -122,8 +122,9 @@ public class FileFunctionTest { private SequentialBuildDriver makeDriver(boolean errorOnExternalFiles) { AtomicReference<PathPackageLocator> pkgLocatorRef = new AtomicReference<>(pkgLocator); + BlazeDirectories directories = new BlazeDirectories(pkgRoot, outputBase, pkgRoot); ExternalFilesHelper externalFilesHelper = - new ExternalFilesHelper(pkgLocatorRef, errorOnExternalFiles); + new ExternalFilesHelper(pkgLocatorRef, errorOnExternalFiles, directories); differencer = new RecordingDifferencer(); MemoizingEvaluator evaluator = new InMemoryMemoizingEvaluator( @@ -152,7 +153,7 @@ public class FileFunctionTest { new WorkspaceFileFunction( TestRuleClassProvider.getRuleClassProvider(), new PackageFactory(TestRuleClassProvider.getRuleClassProvider()), - new BlazeDirectories(pkgRoot, outputBase, pkgRoot))) + directories)) .put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()) .build(), differencer); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java index da88d1f7f4..0dcc58f0dc 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java @@ -30,6 +30,7 @@ import com.google.devtools.build.lib.actions.FilesetTraversalParams; import com.google.devtools.build.lib.actions.FilesetTraversalParams.PackageBoundaryMode; import com.google.devtools.build.lib.actions.FilesetTraversalParamsFactory; import com.google.devtools.build.lib.actions.Root; +import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.events.NullEventHandler; @@ -82,7 +83,8 @@ public final class FilesetEntryFunctionTest extends FoundationTestCase { new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory))); AtomicReference<ImmutableSet<PackageIdentifier>> deletedPackages = new AtomicReference<>(ImmutableSet.<PackageIdentifier>of()); - ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(pkgLocator, false); + ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( + pkgLocator, false, new BlazeDirectories(outputBase, outputBase, rootDirectory)); Map<SkyFunctionName, SkyFunction> skyFunctions = new HashMap<>(); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java index 6be70e2c7a..75a9429f09 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java @@ -103,7 +103,9 @@ public class FilesystemValueCheckerTest { AtomicReference<PathPackageLocator> pkgLocator = new AtomicReference<>(new PathPackageLocator( fs.getPath("/output_base"), ImmutableList.of(pkgRoot))); - ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(pkgLocator, false); + BlazeDirectories directories = new BlazeDirectories(pkgRoot, pkgRoot, pkgRoot); + ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( + pkgLocator, false, directories); skyFunctions.put(SkyFunctions.FILE_STATE, new FileStateFunction( new AtomicReference<TimestampGranularityMonitor>(), externalFilesHelper)); skyFunctions.put(SkyFunctions.FILE, new FileFunction(pkgLocator)); @@ -121,7 +123,7 @@ public class FilesystemValueCheckerTest { skyFunctions.put(SkyFunctions.WORKSPACE_FILE, new WorkspaceFileFunction(TestRuleClassProvider.getRuleClassProvider(), new PackageFactory(TestRuleClassProvider.getRuleClassProvider()), - new BlazeDirectories(pkgRoot, pkgRoot, pkgRoot))); + directories)); skyFunctions.put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()); differencer = new RecordingDifferencer(); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java index 95bf419ed8..850a510877 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java @@ -26,6 +26,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.testing.EqualsTester; +import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.events.NullEventHandler; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; @@ -122,7 +123,8 @@ public abstract class GlobFunctionTest { private Map<SkyFunctionName, SkyFunction> createFunctionMap() { AtomicReference<ImmutableSet<PackageIdentifier>> deletedPackages = new AtomicReference<>(ImmutableSet.<PackageIdentifier>of()); - ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(pkgLocator, false); + ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( + pkgLocator, false, new BlazeDirectories(root, root, root)); Map<SkyFunctionName, SkyFunction> skyFunctions = new HashMap<>(); skyFunctions.put(SkyFunctions.GLOB, new GlobFunction(alwaysUseDirListing())); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java index 07edc60c1d..df83967caf 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java @@ -72,8 +72,9 @@ public class PackageLookupFunctionTest extends FoundationTestCase { AtomicReference<PathPackageLocator> pkgLocator = new AtomicReference<>( new PathPackageLocator(outputBase, ImmutableList.of(emptyPackagePath, rootDirectory))); deletedPackages = new AtomicReference<>(ImmutableSet.<PackageIdentifier>of()); - ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(pkgLocator, false); BlazeDirectories directories = new BlazeDirectories(rootDirectory, outputBase, rootDirectory); + ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( + pkgLocator, false, directories); Map<SkyFunctionName, SkyFunction> skyFunctions = new HashMap<>(); skyFunctions.put(SkyFunctions.PACKAGE_LOOKUP, diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java index 507e93a8f2..b2a02fba91 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java @@ -85,7 +85,9 @@ public final class RecursiveFilesystemTraversalFunctionTest extends FoundationTe new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory))); AtomicReference<ImmutableSet<PackageIdentifier>> deletedPackages = new AtomicReference<>(ImmutableSet.<PackageIdentifier>of()); - ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(pkgLocator, false); + BlazeDirectories directories = new BlazeDirectories(rootDirectory, outputBase, rootDirectory); + ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( + pkgLocator, false, directories); Map<SkyFunctionName, SkyFunction> skyFunctions = new HashMap<>(); @@ -110,7 +112,7 @@ public final class RecursiveFilesystemTraversalFunctionTest extends FoundationTe skyFunctions.put(SkyFunctions.WORKSPACE_FILE, new WorkspaceFileFunction(TestRuleClassProvider.getRuleClassProvider(), new PackageFactory(TestRuleClassProvider.getRuleClassProvider()), - new BlazeDirectories(rootDirectory, outputBase, rootDirectory))); + directories)); skyFunctions.put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()); progressReceiver = new RecordingEvaluationProgressReceiver(); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java index e4e15ef894..35afe3ccc6 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java @@ -139,7 +139,9 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { AtomicReference<PathPackageLocator> pkgLocator = new AtomicReference<>(new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory))); AtomicReference<TimestampGranularityMonitor> tsgmRef = new AtomicReference<>(tsgm); - ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(pkgLocator, false); + BlazeDirectories directories = new BlazeDirectories(rootDirectory, outputBase, rootDirectory); + ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( + pkgLocator, false, directories); differencer = new RecordingDifferencer(); ActionExecutionStatusReporter statusReporter = @@ -174,7 +176,7 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { new WorkspaceFileFunction( TestRuleClassProvider.getRuleClassProvider(), new PackageFactory(TestRuleClassProvider.getRuleClassProvider()), - new BlazeDirectories(rootDirectory, outputBase, rootDirectory))) + directories)) .put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()) .build(), differencer, |