Replace the occurrences of Constants.PRODUCT_NAME for a call to
BlazeRuntime#getProductName() or a reference to TestConstants.PRODUCT_NAME for tests.
This CL prepares the codebase in order to delete the constant.
--
MOS_MIGRATED_REVID=122993568
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BlazeDirectoriesTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BlazeDirectoriesTest.java
index 1340196..8daa197 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BlazeDirectoriesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BlazeDirectoriesTest.java
@@ -16,6 +16,7 @@
import static org.junit.Assert.assertEquals;
import com.google.devtools.build.lib.testutil.FoundationTestCase;
+import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.vfs.FileSystem;
import com.google.devtools.build.lib.vfs.Path;
@@ -35,16 +36,19 @@
Path installBase = fs.getPath("/my/install");
Path outputBase = fs.getPath("/my/output");
Path workspace = fs.getPath("/my/ws");
- BlazeDirectories directories = new BlazeDirectories(installBase, outputBase, workspace);
+ BlazeDirectories directories = new BlazeDirectories(installBase, outputBase, workspace,
+ TestConstants.PRODUCT_NAME);
assertEquals(directories.getExecRoot(), outputBase.getChild("ws"));
workspace = null;
- directories = new BlazeDirectories(installBase, outputBase, workspace);
+ directories = new BlazeDirectories(installBase, outputBase, workspace,
+ TestConstants.PRODUCT_NAME);
assertEquals(directories.getExecRoot(),
outputBase.getChild(BlazeDirectories.DEFAULT_EXEC_ROOT));
workspace = fs.getPath("/");
- directories = new BlazeDirectories(installBase, outputBase, workspace);
+ directories = new BlazeDirectories(installBase, outputBase, workspace,
+ TestConstants.PRODUCT_NAME);
assertEquals(directories.getExecRoot(),
outputBase.getChild(BlazeDirectories.DEFAULT_EXEC_ROOT));
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java
index 62ef7f7..216a333 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java
@@ -32,6 +32,7 @@
import com.google.devtools.build.lib.analysis.config.BinTools;
import com.google.devtools.build.lib.exec.util.TestExecutorBuilder;
import com.google.devtools.build.lib.testutil.FoundationTestCase;
+import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.util.io.FileOutErr;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
import com.google.devtools.build.lib.vfs.Path;
@@ -71,7 +72,8 @@
directories = new BlazeDirectories(
scratch.resolve("/install"),
scratch.resolve("/base"),
- scratch.resolve("/workspace"));
+ scratch.resolve("/workspace"),
+ TestConstants.PRODUCT_NAME);
binTools = BinTools.empty(directories);
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
index f9050cb..d4a8791 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
@@ -138,7 +138,8 @@
public final void createMocks() throws Exception {
analysisMock = AnalysisMock.get();
pkgLocator = new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory));
- directories = new BlazeDirectories(outputBase, outputBase, rootDirectory);
+ directories = new BlazeDirectories(outputBase, outputBase, rootDirectory,
+ TestConstants.PRODUCT_NAME);
workspaceStatusActionFactory =
new AnalysisTestUtil.DummyWorkspaceStatusActionFactory(directories);
@@ -170,7 +171,8 @@
Preprocessor.Factory.Supplier.NullSupplier.INSTANCE,
analysisMock.getSkyFunctions(),
getPrecomputedValues(),
- ImmutableList.<SkyValueDirtinessChecker>of());
+ ImmutableList.<SkyValueDirtinessChecker>of(),
+ TestConstants.PRODUCT_NAME);
skyframeExecutor.preparePackageLoading(
pkgLocator,
Options.getDefaults(PackageCacheOptions.class).defaultVisibility,
@@ -409,7 +411,7 @@
}
/**
- * Makes {@code rules} available in tests, in addition to all the rules available to Blaze at
+ * Makes {@code rules} available in tests, in addition to all the rules available to Blaze at
* running time (e.g., java_library).
*/
protected final void setRulesAvailableInTests(RuleDefinition... rules) throws Exception {
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
index 310a6a8..5c4b3a1 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
@@ -47,6 +47,7 @@
import com.google.devtools.build.lib.analysis.config.BuildConfigurationCollection;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.events.EventHandler;
+import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
import com.google.devtools.build.lib.vfs.PathFragment;
import com.google.devtools.build.skyframe.SkyFunction;
@@ -391,7 +392,7 @@
* Matches the output path prefix contributed by a C++ configuration fragment.
*/
public static final Pattern OUTPUT_PATH_CPP_PREFIX_PATTERN =
- Pattern.compile("(?<=(blaze|bazel)-out/)gcc[^/]*-grte-\\w+-");
+ Pattern.compile("(?<=" + TestConstants.PRODUCT_NAME + "-out/)gcc[^/]*-grte-\\w+-");
/**
* Given a collection of Artifacts, returns a corresponding set of strings of
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index 151a703..822774f 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -189,7 +189,8 @@
@Before
public final void initializeSkyframeExecutor() throws Exception {
AnalysisMock mock = getAnalysisMock();
- directories = new BlazeDirectories(outputBase, outputBase, rootDirectory);
+ directories = new BlazeDirectories(outputBase, outputBase, rootDirectory,
+ TestConstants.PRODUCT_NAME);
binTools = BinTools.forUnitTesting(directories, TestConstants.EMBEDDED_TOOLS);
mockToolsConfig = new MockToolsConfig(rootDirectory, false);
mock.setupMockClient(mockToolsConfig);
@@ -215,7 +216,8 @@
getPreprocessorFactorySupplier(),
mock.getSkyFunctions(),
getPrecomputedValues(),
- ImmutableList.<SkyValueDirtinessChecker>of());
+ ImmutableList.<SkyValueDirtinessChecker>of(),
+ TestConstants.PRODUCT_NAME);
skyframeExecutor.preparePackageLoading(
new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)),
ConstantRuleVisibility.PUBLIC, true, 7, "",
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
index e485597..60cef90 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
@@ -91,7 +91,8 @@
PathPackageLocator pkgLocator =
new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory));
final PackageFactory pkgFactory;
- BlazeDirectories directories = new BlazeDirectories(outputBase, outputBase, rootDirectory);
+ BlazeDirectories directories = new BlazeDirectories(outputBase, outputBase, rootDirectory,
+ TestConstants.PRODUCT_NAME);
pkgFactory = new PackageFactory(ruleClassProvider);
AnalysisTestUtil.DummyWorkspaceStatusActionFactory workspaceStatusActionFactory =
new AnalysisTestUtil.DummyWorkspaceStatusActionFactory(directories);
@@ -109,7 +110,8 @@
Preprocessor.Factory.Supplier.NullSupplier.INSTANCE,
analysisMock.getSkyFunctions(),
ImmutableList.<PrecomputedValue.Injected>of(),
- ImmutableList.<SkyValueDirtinessChecker>of());
+ ImmutableList.<SkyValueDirtinessChecker>of(),
+ TestConstants.PRODUCT_NAME);
skyframeExecutor.preparePackageLoading(
pkgLocator,
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
index 7af31ec..4cbff52 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
@@ -100,7 +100,7 @@
SkyframeExecutor skyframeExecutor =
SequencedSkyframeExecutor.create(
new PackageFactory(ruleClassProvider, environmentExtensions),
- new BlazeDirectories(outputBase, outputBase, rootDirectory),
+ new BlazeDirectories(outputBase, outputBase, rootDirectory, TestConstants.PRODUCT_NAME),
null, /* BinTools */
null, /* workspaceStatusActionFactory */
ruleClassProvider.getBuildInfoFactories(),
@@ -109,7 +109,8 @@
preprocessorFactorySupplier,
ImmutableMap.<SkyFunctionName, SkyFunction>of(),
ImmutableList.<PrecomputedValue.Injected>of(),
- ImmutableList.<SkyValueDirtinessChecker>of());
+ ImmutableList.<SkyValueDirtinessChecker>of(),
+ TestConstants.PRODUCT_NAME);
return skyframeExecutor;
}
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
index 053c5eb..32497bd 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
@@ -42,6 +42,7 @@
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
import com.google.devtools.build.lib.syntax.GlobList;
import com.google.devtools.build.lib.testutil.ManualClock;
+import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import com.google.devtools.build.lib.util.BlazeClock;
import com.google.devtools.build.lib.util.Preconditions;
@@ -468,7 +469,8 @@
skyframeExecutor =
SequencedSkyframeExecutor.create(
new PackageFactory(TestRuleClassProvider.getRuleClassProvider()),
- new BlazeDirectories(fs.getPath("/install"), fs.getPath("/output"), workspace),
+ new BlazeDirectories(fs.getPath("/install"), fs.getPath("/output"), workspace,
+ TestConstants.PRODUCT_NAME),
null, /* BinTools */
null, /* workspaceStatusActionFactory */
TestRuleClassProvider.getRuleClassProvider().getBuildInfoFactories(),
@@ -477,7 +479,8 @@
supplier,
ImmutableMap.<SkyFunctionName, SkyFunction>of(),
ImmutableList.<PrecomputedValue.Injected>of(),
- ImmutableList.<SkyValueDirtinessChecker>of());
+ ImmutableList.<SkyValueDirtinessChecker>of(),
+ TestConstants.PRODUCT_NAME);
skyframeExecutor.preparePackageLoading(
new PathPackageLocator(outputBase, ImmutableList.of(workspace)),
ConstantRuleVisibility.PUBLIC, true, 7, "",
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
index 6cb511d..5c94f04 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
@@ -629,7 +629,8 @@
PackageCacheOptions options = Options.getDefaults(PackageCacheOptions.class);
storedErrors = new StoredEventHandler();
BlazeDirectories directories =
- new BlazeDirectories(fs.getPath("/install"), fs.getPath("/output"), workspace);
+ new BlazeDirectories(fs.getPath("/install"), fs.getPath("/output"), workspace,
+ TestConstants.PRODUCT_NAME);
skyframeExecutor = SequencedSkyframeExecutor.create(pkgFactory,
directories,
null, /* binTools -- not used */
@@ -640,7 +641,8 @@
Preprocessor.Factory.Supplier.NullSupplier.INSTANCE,
AnalysisMock.get().getSkyFunctions(),
ImmutableList.<PrecomputedValue.Injected>of(),
- ImmutableList.<SkyValueDirtinessChecker>of());
+ ImmutableList.<SkyValueDirtinessChecker>of(),
+ TestConstants.PRODUCT_NAME);
PathPackageLocator pkgLocator = PathPackageLocator.create(
null, options.packagePath, storedErrors, workspace, workspace);
skyframeExecutor.preparePackageLoading(
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
index d3abf77..5873114 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
@@ -82,7 +82,8 @@
@Before
public final void initializeSkyframeExecutor() throws Exception {
ruleClassProvider = TestRuleClassProvider.getRuleClassProvider();
- BlazeDirectories directories = new BlazeDirectories(outputBase, outputBase, rootDirectory);
+ BlazeDirectories directories = new BlazeDirectories(outputBase, outputBase, rootDirectory,
+ TestConstants.PRODUCT_NAME);
skyframeExecutor =
SequencedSkyframeExecutor.create(
new PackageFactory(ruleClassProvider),
@@ -95,7 +96,8 @@
Preprocessor.Factory.Supplier.NullSupplier.INSTANCE,
AnalysisMock.get().getSkyFunctions(),
ImmutableList.<PrecomputedValue.Injected>of(),
- ImmutableList.<SkyValueDirtinessChecker>of());
+ ImmutableList.<SkyValueDirtinessChecker>of(),
+ TestConstants.PRODUCT_NAME);
setUpSkyframe(parsePackageCacheOptions());
}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java
index 9104187..07fdb53 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java
@@ -17,11 +17,11 @@
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
-import com.google.devtools.build.lib.Constants;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.FileProvider;
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;
@@ -69,9 +69,9 @@
linkAction,
"-shared",
"-o",
- Constants.PRODUCT_NAME + "-out/.+/genrule/thebinary.so",
+ TestConstants.PRODUCT_NAME + "-out/.+/genrule/thebinary.so",
"-Wl,-whole-archive",
- Constants.PRODUCT_NAME + "-out/.+/genrule/genlib.a",
+ TestConstants.PRODUCT_NAME + "-out/.+/genrule/genlib.a",
"-Wl,-no-whole-archive");
}
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java
index 9398b14..459a9cc 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java
@@ -131,7 +131,8 @@
public final void initializeRuntime() throws Exception {
BlazeDirectories directories =
new BlazeDirectories(
- scratch.dir("install_base"), scratch.dir("output_base"), scratch.dir("pkg"));
+ scratch.dir("install_base"), scratch.dir("output_base"), scratch.dir("pkg"),
+ TestConstants.PRODUCT_NAME);
this.runtime =
new BlazeRuntime.Builder()
.setDirectories(directories)
diff --git a/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategyTestCase.java b/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategyTestCase.java
index 77b3881..efafd3b 100644
--- a/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategyTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategyTestCase.java
@@ -28,6 +28,7 @@
import com.google.devtools.build.lib.events.Reporter;
import com.google.devtools.build.lib.exec.ExecutionOptions;
import com.google.devtools.build.lib.testutil.BlazeTestUtils;
+import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.testutil.TestFileOutErr;
import com.google.devtools.build.lib.testutil.TestUtils;
import com.google.devtools.build.lib.util.BlazeClock;
@@ -78,7 +79,8 @@
fakeSandboxDir = testRoot.getRelative("sandbox");
fakeSandboxDir.createDirectory();
- blazeDirs = new BlazeDirectories(outputBase, outputBase, workspaceDir);
+ blazeDirs = new BlazeDirectories(outputBase, outputBase, workspaceDir,
+ TestConstants.PRODUCT_NAME);
BlazeTestUtils.getIntegrationBinTools(blazeDirs);
OptionsParser optionsParser =
@@ -107,7 +109,8 @@
true,
false,
ImmutableList.<String>of(),
- false)),
+ false,
+ TestConstants.PRODUCT_NAME)),
ImmutableList.<ActionContextProvider>of());
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunctionTest.java
index ebc33fd..e466bd9 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunctionTest.java
@@ -20,13 +20,13 @@
import static org.junit.Assert.assertTrue;
import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.Constants;
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
import com.google.devtools.build.lib.packages.NoSuchPackageException;
import com.google.devtools.build.lib.skyframe.util.SkyframeExecutorTestUtils;
import com.google.devtools.build.lib.syntax.SkylarkImport;
+import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.vfs.FileStatus;
import com.google.devtools.build.lib.vfs.FileSystem;
import com.google.devtools.build.lib.vfs.Path;
@@ -56,7 +56,7 @@
if (statThrowsIoException
&& path.asFragment()
.getPathString()
- .equals("/workspace/tools/build_rules/prelude_" + Constants.PRODUCT_NAME)) {
+ .equals("/workspace/tools/build_rules/prelude_" + TestConstants.PRODUCT_NAME)) {
throw new IOException("bork");
}
return super.stat(path, followSymlinks);
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 db0744d..aa3fba5 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
@@ -22,6 +22,7 @@
import com.google.devtools.build.lib.packages.PackageFactory;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.skyframe.ActionLookupValue.ActionLookupKey;
+import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import com.google.devtools.build.lib.testutil.TestUtils;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
@@ -71,7 +72,8 @@
setupRoot(new CustomInMemoryFs());
AtomicReference<PathPackageLocator> pkgLocator = new AtomicReference<>(new PathPackageLocator(
root.getFileSystem().getPath("/outputbase"), ImmutableList.of(root)));
- BlazeDirectories directories = new BlazeDirectories(root, root, root);
+ BlazeDirectories directories = new BlazeDirectories(root, root, root,
+ TestConstants.PRODUCT_NAME);
ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(
pkgLocator, false, directories);
differencer = new RecordingDifferencer();
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 22a8dbe..b2fb2d8 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
@@ -25,6 +25,7 @@
import com.google.devtools.build.lib.events.NullEventHandler;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.testutil.FoundationTestCase;
+import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
import com.google.devtools.build.lib.vfs.PathFragment;
import com.google.devtools.build.skyframe.InMemoryMemoizingEvaluator;
@@ -61,7 +62,8 @@
new AtomicReference<>(new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)));
deletedPackages = new AtomicReference<>(ImmutableSet.<PackageIdentifier>of());
ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(
- pkgLocator, false, new BlazeDirectories(rootDirectory, rootDirectory, rootDirectory));
+ pkgLocator, false, new BlazeDirectories(rootDirectory, rootDirectory, rootDirectory,
+ TestConstants.PRODUCT_NAME));
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 b046950..fbfedc5 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
@@ -42,6 +42,7 @@
import com.google.devtools.build.lib.packages.PackageFactory;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.testutil.ManualClock;
+import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import com.google.devtools.build.lib.testutil.TestUtils;
import com.google.devtools.build.lib.util.Pair;
@@ -122,7 +123,8 @@
private SequentialBuildDriver makeDriver(boolean errorOnExternalFiles) {
AtomicReference<PathPackageLocator> pkgLocatorRef = new AtomicReference<>(pkgLocator);
- BlazeDirectories directories = new BlazeDirectories(pkgRoot, outputBase, pkgRoot);
+ BlazeDirectories directories = new BlazeDirectories(pkgRoot, outputBase, pkgRoot,
+ TestConstants.PRODUCT_NAME);
ExternalFilesHelper externalFilesHelper =
new ExternalFilesHelper(pkgLocatorRef, errorOnExternalFiles, directories);
differencer = new RecordingDifferencer();
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 0dcc58f..660773f 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
@@ -37,6 +37,7 @@
import com.google.devtools.build.lib.packages.FilesetEntry.SymlinkBehavior;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.testutil.FoundationTestCase;
+import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.util.Fingerprint;
import com.google.devtools.build.lib.util.Preconditions;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
@@ -84,7 +85,8 @@
AtomicReference<ImmutableSet<PackageIdentifier>> deletedPackages =
new AtomicReference<>(ImmutableSet.<PackageIdentifier>of());
ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(
- pkgLocator, false, new BlazeDirectories(outputBase, outputBase, rootDirectory));
+ pkgLocator, false, new BlazeDirectories(outputBase, outputBase, rootDirectory,
+ TestConstants.PRODUCT_NAME));
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 75a9429..85e1780 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
@@ -39,6 +39,7 @@
import com.google.devtools.build.lib.packages.PackageFactory;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.skyframe.DirtinessCheckerUtils.BasicFilesystemDirtinessChecker;
+import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
import com.google.devtools.build.lib.vfs.BatchStat;
@@ -103,7 +104,8 @@
AtomicReference<PathPackageLocator> pkgLocator = new AtomicReference<>(new PathPackageLocator(
fs.getPath("/output_base"), ImmutableList.of(pkgRoot)));
- BlazeDirectories directories = new BlazeDirectories(pkgRoot, pkgRoot, pkgRoot);
+ BlazeDirectories directories = new BlazeDirectories(pkgRoot, pkgRoot, pkgRoot,
+ TestConstants.PRODUCT_NAME);
ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(
pkgLocator, false, directories);
skyFunctions.put(SkyFunctions.FILE_STATE, new FileStateFunction(
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 850a510..dbef1f5 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
@@ -32,6 +32,7 @@
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.skyframe.GlobValue.InvalidGlobPatternException;
import com.google.devtools.build.lib.testutil.ManualClock;
+import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
import com.google.devtools.build.lib.vfs.Dirent;
import com.google.devtools.build.lib.vfs.FileStatus;
@@ -124,7 +125,7 @@
AtomicReference<ImmutableSet<PackageIdentifier>> deletedPackages =
new AtomicReference<>(ImmutableSet.<PackageIdentifier>of());
ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(
- pkgLocator, false, new BlazeDirectories(root, root, root));
+ pkgLocator, false, new BlazeDirectories(root, root, root, TestConstants.PRODUCT_NAME));
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 df83967..db6209e 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
@@ -31,6 +31,7 @@
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.skyframe.PackageLookupValue.ErrorReason;
import com.google.devtools.build.lib.testutil.FoundationTestCase;
+import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
import com.google.devtools.build.lib.vfs.Path;
@@ -72,7 +73,8 @@
AtomicReference<PathPackageLocator> pkgLocator = new AtomicReference<>(
new PathPackageLocator(outputBase, ImmutableList.of(emptyPackagePath, rootDirectory)));
deletedPackages = new AtomicReference<>(ImmutableSet.<PackageIdentifier>of());
- BlazeDirectories directories = new BlazeDirectories(rootDirectory, outputBase, rootDirectory);
+ BlazeDirectories directories = new BlazeDirectories(rootDirectory, outputBase, rootDirectory,
+ TestConstants.PRODUCT_NAME);
ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(
pkgLocator, false, directories);
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 b2a02fb..747bb56 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
@@ -37,6 +37,7 @@
import com.google.devtools.build.lib.skyframe.RecursiveFilesystemTraversalValue.ResolvedFile;
import com.google.devtools.build.lib.skyframe.RecursiveFilesystemTraversalValue.TraversalRequest;
import com.google.devtools.build.lib.testutil.FoundationTestCase;
+import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import com.google.devtools.build.lib.util.Preconditions;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
@@ -85,7 +86,8 @@
new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)));
AtomicReference<ImmutableSet<PackageIdentifier>> deletedPackages =
new AtomicReference<>(ImmutableSet.<PackageIdentifier>of());
- BlazeDirectories directories = new BlazeDirectories(rootDirectory, outputBase, rootDirectory);
+ BlazeDirectories directories = new BlazeDirectories(rootDirectory, outputBase, rootDirectory,
+ TestConstants.PRODUCT_NAME);
ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(
pkgLocator, false, directories);
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 e1d2b5e..9f6bf6c 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
@@ -46,6 +46,7 @@
import com.google.devtools.build.lib.packages.PackageFactory;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.testutil.FoundationTestCase;
+import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import com.google.devtools.build.lib.testutil.TestUtils;
import com.google.devtools.build.lib.util.AbruptExitException;
@@ -140,7 +141,8 @@
AtomicReference<PathPackageLocator> pkgLocator =
new AtomicReference<>(new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)));
AtomicReference<TimestampGranularityMonitor> tsgmRef = new AtomicReference<>(tsgm);
- BlazeDirectories directories = new BlazeDirectories(rootDirectory, outputBase, rootDirectory);
+ BlazeDirectories directories = new BlazeDirectories(rootDirectory, outputBase, rootDirectory,
+ TestConstants.PRODUCT_NAME);
ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(
pkgLocator, false, directories);
differencer = new RecordingDifferencer();
diff --git a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
index 6e4bfd2..733c4ad 100644
--- a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
@@ -89,7 +89,8 @@
Path outputBase = testRoot.getRelative("outputBase");
outputBase.createDirectory();
- BlazeDirectories directories = new BlazeDirectories(outputBase, outputBase, workspaceDir);
+ BlazeDirectories directories = new BlazeDirectories(outputBase, outputBase, workspaceDir,
+ TestConstants.PRODUCT_NAME);
BlazeTestUtils.getIntegrationBinTools(directories);
OptionsParser optionsParser = OptionsParser.newOptionsParser(ExecutionOptions.class);
optionsParser.parse("--verbose_failures");
@@ -106,7 +107,8 @@
/* showSubcommands */ false,
ImmutableList.<ActionContext>of(),
ImmutableMap.<String, SpawnActionContext>of("",
- new StandaloneSpawnStrategy(directories.getExecRoot(), false)),
+ new StandaloneSpawnStrategy(directories.getExecRoot(), false,
+ TestConstants.PRODUCT_NAME)),
ImmutableList.<ActionContextProvider>of());
executor.getExecRoot().createDirectory();
@@ -199,7 +201,7 @@
assertThat(out()).isEmpty();
}
- // Test an action with environment variables set indicating an action running on a darwin host
+ // Test an action with environment variables set indicating an action running on a darwin host
// system. Such actions should fail given the fact that these tests run on a non darwin
// architecture.
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
index cab180b..5c11575 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
@@ -24,6 +24,8 @@
private TestConstants() {
}
+ public static final String PRODUCT_NAME = "bazel";
+
/**
* A list of all embedded binaries that go into the regular Bazel binary.
*/
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemUtilsTest.java b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemUtilsTest.java
index 637cd18..23e0510 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemUtilsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemUtilsTest.java
@@ -41,6 +41,7 @@
import com.google.common.collect.Lists;
import com.google.devtools.build.lib.testutil.BlazeTestUtils;
import com.google.devtools.build.lib.testutil.ManualClock;
+import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem;
import org.junit.Before;
@@ -756,7 +757,7 @@
Path linkRoot = fileSystem.getPath("/linkRoot");
createDirectoryAndParents(linkRoot);
- plantLinkForest(packageRootMap, linkRoot);
+ plantLinkForest(packageRootMap, linkRoot, TestConstants.PRODUCT_NAME);
//dumpTree(linkRoot, System.err);
