diff options
| author |  ulfjack <ulfjack@google.com> | 2017-08-10 15:36:14 +0200 |
|---|---|---|
| committer |  Marcel Hlopko <hlopko@google.com> | 2017-08-11 12:53:15 +0200 |
| commit | ab21d18ddb5b53e887b4fd51ddc5d021621673d4 (patch) | |
| tree | 2fe2d5819769a6672b5839381b1e447124b18b72 /src/main/java/com/google/devtools/build/lib/worker | |
| parent | 53641e5d303e23b89bd4653e5f0a510161bd71a2 (diff) | |
Move core test classes to lib.analysis.test
These are depended upon by analysis code, so need to live in the same library
as lib.analysis. Moving them here makes it possible to split the build-base
library into separate libraries for analysis, execution, and rules.
PiperOrigin-RevId: 164847161
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/worker')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/worker/WorkerTestStrategy.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java index 6456e9f2b2..b95f8c6ac5 100644 --- a/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java +++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java @@ -16,10 +16,10 @@ package com.google.devtools.build.lib.worker; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMultimap; import com.google.devtools.build.lib.actions.ActionContext; +import com.google.devtools.build.lib.analysis.test.TestActionContext; import com.google.devtools.build.lib.buildtool.BuildRequest; import com.google.devtools.build.lib.exec.ActionContextProvider; import com.google.devtools.build.lib.exec.ExecutionOptions; -import com.google.devtools.build.lib.rules.test.TestActionContext; import com.google.devtools.build.lib.runtime.CommandEnvironment; /** diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerTestStrategy.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerTestStrategy.java index 1b3c451a16..4edeed0fc4 100644 --- a/src/main/java/com/google/devtools/build/lib/worker/WorkerTestStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerTestStrategy.java @@ -26,11 +26,11 @@ import com.google.devtools.build.lib.actions.ExecutionStrategy; import com.google.devtools.build.lib.actions.Spawn; import com.google.devtools.build.lib.actions.TestExecException; import com.google.devtools.build.lib.actions.UserExecException; +import com.google.devtools.build.lib.analysis.test.TestActionContext; +import com.google.devtools.build.lib.analysis.test.TestRunnerAction; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.exec.ExecutionOptions; import com.google.devtools.build.lib.exec.StandaloneTestStrategy; -import com.google.devtools.build.lib.rules.test.TestActionContext; -import com.google.devtools.build.lib.rules.test.TestRunnerAction; import com.google.devtools.build.lib.runtime.CommandEnvironment; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; |