diff options
author | Luis Fernando Pino Duque <lpino@google.com> | 2016-05-31 16:21:46 +0000 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2016-05-31 18:07:47 +0000 |
commit | 623cdf810d1ca367c981a5353c5c4bfda18cc58c (patch) | |
tree | dc954ce3fe8fa2338957e99ebee49e3cfe5cbe5d /src/test/java | |
parent | dc54452bafbb50029ba11678ade3ad85ad028817 (diff) |
Replace Constants.PRODUCT_NAME with a startup option --product_name=bazel and
(finally) delete Constants.java.
For bazel the file Constants.java is the only source of
src/main/java/com/google/devtools/build/lib:common and since it was exporting
guava then many dependencies needed to be fixed.
--
MOS_MIGRATED_REVID=123648270
Diffstat (limited to 'src/test/java')
4 files changed, 3 insertions, 6 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index 06209318e6..959338925c 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -322,7 +322,6 @@ java_test( "//src/main/java/com/google/devtools/build/lib:bazel-main", "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", - "//src/main/java/com/google/devtools/build/lib:common", "//src/main/java/com/google/devtools/build/lib:java-rules", "//src/main/java/com/google/devtools/build/lib:packages", "//src/main/java/com/google/devtools/build/lib:python-rules", @@ -565,7 +564,6 @@ java_test( "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:collect", - "//src/main/java/com/google/devtools/build/lib:common", "//src/main/java/com/google/devtools/build/lib:events", "//src/main/java/com/google/devtools/build/lib:ideinfo", "//src/main/java/com/google/devtools/build/lib:packages", @@ -810,7 +808,6 @@ java_test( "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:cmdline", - "//src/main/java/com/google/devtools/build/lib:common", "//src/main/java/com/google/devtools/build/lib:flags", "//src/main/java/com/google/devtools/build/lib:packages-internal", "//src/main/java/com/google/devtools/build/lib:util", diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD index 758194dabd..6e16c4f46e 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD +++ b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD @@ -8,7 +8,6 @@ java_test( "//src/main/java/com/google/devtools/build/lib:bazel-repository", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:cmdline", - "//src/main/java/com/google/devtools/build/lib:common", "//src/main/java/com/google/devtools/build/lib:packages-internal", "//src/main/java/com/google/devtools/build/lib:runtime", "//src/main/java/com/google/devtools/build/lib:util", 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 459a9ccf96..8bd8bff189 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 @@ -129,12 +129,14 @@ public class BlazeCommandDispatcherRcoptionsTest { @Before public final void initializeRuntime() throws Exception { + String productName = TestConstants.PRODUCT_NAME; BlazeDirectories directories = new BlazeDirectories( scratch.dir("install_base"), scratch.dir("output_base"), scratch.dir("pkg"), - TestConstants.PRODUCT_NAME); + productName); this.runtime = new BlazeRuntime.Builder() + .setProductName(productName) .setDirectories(directories) .setStartupOptionsProvider( OptionsParser.newOptionsParser(BlazeServerStartupOptions.class)) diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD index e191b59a9c..bd2f417b75 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD +++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD @@ -48,7 +48,6 @@ java_test( "//src/main/java/com/google/devtools/build/lib:clock", "//src/main/java/com/google/devtools/build/lib:cmdline", "//src/main/java/com/google/devtools/build/lib:collect", - "//src/main/java/com/google/devtools/build/lib:common", "//src/main/java/com/google/devtools/build/lib:concurrent", "//src/main/java/com/google/devtools/build/lib:events", "//src/main/java/com/google/devtools/build/lib:io", |