diff options
author | 2018-01-29 08:55:33 -0800 | |
---|---|---|
committer | 2018-01-29 08:57:45 -0800 | |
commit | 433d3fa21047df59137fbd9358ad4d1a80e8da28 (patch) | |
tree | 2f0679210e779b03c3aac54b6e1d63c004b651ba /src/main/java/com/google/devtools | |
parent | 45cb2e86d18a6fbb45d3711fa7bd9f8046a15a08 (diff) |
Move BazelRuleClassProvider.TESTING_SUPPORT to its own class in rules/test.
PiperOrigin-RevId: 183672444
Diffstat (limited to 'src/main/java/com/google/devtools')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/BUILD | 25 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java | 17 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java | 1 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/exec/TestAttempt.java (renamed from src/main/java/com/google/devtools/build/lib/rules/test/TestAttempt.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/test/TestingSupportRules.java | 38 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/AggregatingTestListener.java | 2 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/standalone/BUILD | 1 |
7 files changed, 67 insertions, 19 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD index 379b4689e4..e49840ae71 100644 --- a/src/main/java/com/google/devtools/build/lib/BUILD +++ b/src/main/java/com/google/devtools/build/lib/BUILD @@ -464,7 +464,6 @@ java_library( "rules/extra/*.java", "rules/filegroup/*.java", "rules/fileset/*.java", - "rules/test/*.java", "rules/repository/*.java", "skyframe/*.java", ], @@ -566,6 +565,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib:packages-internal", "//src/main/java/com/google/devtools/build/lib:proto-rules", "//src/main/java/com/google/devtools/build/lib:python-rules", + "//src/main/java/com/google/devtools/build/lib:testing-support-rules", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/analysis/platform", @@ -970,6 +970,29 @@ java_library( ) java_library( + name = "testing-support-rules", + srcs = glob( + ["rules/test/*.java"], + ), + deps = [ + ":packages-internal", + ":skylarkinterface", + ":util", + "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib:core-rules", + "//src/main/java/com/google/devtools/build/lib:syntax", + "//src/main/java/com/google/devtools/build/lib:transitive-info-provider", + "//src/main/java/com/google/devtools/build/lib/actions", + "//src/main/java/com/google/devtools/build/lib/buildeventstream", + "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_proto", + "//src/main/java/com/google/devtools/build/lib/concurrent", + "//src/main/java/com/google/devtools/build/lib/vfs", + "//src/main/protobuf:test_status_java_proto", + "//third_party:guava", + ], +) + +java_library( name = "android-rules", srcs = glob( ["rules/android/*.java"], diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java index 256da1ed6d..1fd72c0450 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java @@ -167,8 +167,8 @@ import com.google.devtools.build.lib.rules.python.PythonConfigurationLoader; import com.google.devtools.build.lib.rules.python.PythonOptions; import com.google.devtools.build.lib.rules.repository.CoreWorkspaceRules; import com.google.devtools.build.lib.rules.repository.NewLocalRepositoryRule; -import com.google.devtools.build.lib.rules.test.SkylarkTestingModule; import com.google.devtools.build.lib.rules.test.TestSuiteRule; +import com.google.devtools.build.lib.rules.test.TestingSupportRules; import com.google.devtools.build.lib.util.ResourceFileLoader; import java.io.IOException; @@ -308,19 +308,6 @@ public class BazelRuleClassProvider { } }; - public static final RuleSet TESTING_SUPPORT = - new RuleSet() { - @Override - public void init(Builder builder) { - builder.addSkylarkAccessibleTopLevels("testing", new SkylarkTestingModule()); - } - - @Override - public ImmutableList<RuleSet> requires() { - return ImmutableList.of(CoreRules.INSTANCE); - } - }; - public static final RuleSet SH_RULES = new RuleSet() { @Override @@ -648,7 +635,7 @@ public class BazelRuleClassProvider { PYTHON_RULES, OBJC_RULES, J2OBJC_RULES, - TESTING_SUPPORT, + TestingSupportRules.INSTANCE, VARIOUS_WORKSPACE_RULES, // This rule set is a little special: it needs to depend on every configuration fragment // that has Make variables, so we put it last. diff --git a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java index be6ed30a48..94ab8a52f1 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java @@ -38,7 +38,6 @@ import com.google.devtools.build.lib.buildeventstream.TestFileNameConstants; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventKind; import com.google.devtools.build.lib.events.Reporter; -import com.google.devtools.build.lib.rules.test.TestAttempt; import com.google.devtools.build.lib.util.Pair; import com.google.devtools.build.lib.util.io.FileOutErr; import com.google.devtools.build.lib.vfs.FileSystemUtils; diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestAttempt.java b/src/main/java/com/google/devtools/build/lib/exec/TestAttempt.java index a2bb74ddab..9c8c62d048 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/test/TestAttempt.java +++ b/src/main/java/com/google/devtools/build/lib/exec/TestAttempt.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.rules.test; +package com.google.devtools.build.lib.exec; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestingSupportRules.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestingSupportRules.java new file mode 100644 index 0000000000..7a92fe38d9 --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestingSupportRules.java @@ -0,0 +1,38 @@ +// Copyright 2018 The Bazel Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +package com.google.devtools.build.lib.rules.test; + +import com.google.common.collect.ImmutableList; +import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.Builder; +import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.RuleSet; +import com.google.devtools.build.lib.rules.core.CoreRules; + +/** Rules exposing testing infrastructure to Skylark */ +public final class TestingSupportRules implements RuleSet { + public static final TestingSupportRules INSTANCE = new TestingSupportRules(); + + private TestingSupportRules() { + // Use the static INSTANCE field instead. + } + + @Override + public void init(Builder builder) { + builder.addSkylarkAccessibleTopLevels("testing", new SkylarkTestingModule()); + } + + @Override + public ImmutableList<RuleSet> requires() { + return ImmutableList.of(CoreRules.INSTANCE); + } +} diff --git a/src/main/java/com/google/devtools/build/lib/runtime/AggregatingTestListener.java b/src/main/java/com/google/devtools/build/lib/runtime/AggregatingTestListener.java index b5ec577728..1a95454370 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/AggregatingTestListener.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/AggregatingTestListener.java @@ -38,7 +38,7 @@ import com.google.devtools.build.lib.buildtool.buildevent.BuildCompleteEvent; import com.google.devtools.build.lib.buildtool.buildevent.BuildInterruptedEvent; import com.google.devtools.build.lib.buildtool.buildevent.TestFilteringCompleteEvent; import com.google.devtools.build.lib.concurrent.ThreadSafety; -import com.google.devtools.build.lib.rules.test.TestAttempt; +import com.google.devtools.build.lib.exec.TestAttempt; import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey; import com.google.devtools.build.lib.view.test.TestStatus.BlazeTestStatus; import java.util.Collection; diff --git a/src/main/java/com/google/devtools/build/lib/standalone/BUILD b/src/main/java/com/google/devtools/build/lib/standalone/BUILD index 585051d2f7..43ce3c4423 100644 --- a/src/main/java/com/google/devtools/build/lib/standalone/BUILD +++ b/src/main/java/com/google/devtools/build/lib/standalone/BUILD @@ -20,6 +20,7 @@ java_library( "//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/lib:runtime", + "//src/main/java/com/google/devtools/build/lib:testing-support-rules", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/exec/apple", |