aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com
diff options
context:
space:
mode:
authorGravatar shahan <shahan@google.com>2018-05-09 08:23:31 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-05-09 08:24:56 -0700
commitb1dd4e3ad80cd978ed6c86c67fac43f6e0b153b1 (patch)
treef6b59440e13199ca3f470a768516c65ab247c4fa /src/test/java/com
parentc1085c6d8244fb32f29c355f12ce3c27ba9f2776 (diff)
Adds an action-scoped filesystem.
PiperOrigin-RevId: 195973862
Diffstat (limited to 'src/test/java/com')
-rw-r--r--src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java1
-rw-r--r--src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java9
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java1
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java3
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java3
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java3
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java3
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java2
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java3
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java6
-rw-r--r--src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java5
-rw-r--r--src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java3
12 files changed, 29 insertions, 13 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java
index 6124b914b8..9f233b3dd4 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java
@@ -65,6 +65,7 @@ public class ExecutableSymlinkActionTest {
outErr,
ImmutableMap.<String, String>of(),
ImmutableMap.of(),
+ null,
null);
}
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
index 29e9c230c7..45a0cb1d2e 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
@@ -146,7 +146,8 @@ public final class ActionsTestUtil {
ImmutableMap.of(),
actionGraph == null
? createDummyArtifactExpander()
- : ActionInputHelper.actionGraphArtifactExpander(actionGraph));
+ : ActionInputHelper.actionGraphArtifactExpander(actionGraph),
+ /*actionFileSystem=*/ null);
}
public static ActionExecutionContext createContextForInputDiscovery(
@@ -165,7 +166,8 @@ public final class ActionsTestUtil {
fileOutErr,
ImmutableMap.of(),
new BlockingSkyFunctionEnvironment(
- buildDriver, executor == null ? null : executor.getEventHandler()));
+ buildDriver, executor == null ? null : executor.getEventHandler()),
+ /*actionFileSystem=*/ null);
}
public static ActionExecutionContext createContext(ExtendedEventHandler eventHandler) {
@@ -179,7 +181,8 @@ public final class ActionsTestUtil {
null,
ImmutableMap.of(),
ImmutableMap.of(),
- createDummyArtifactExpander());
+ createDummyArtifactExpander(),
+ /*actionFileSystem=*/ null);
}
private static ArtifactExpander createDummyArtifactExpander() {
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java
index 147c6922a6..12cbfb4ffe 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java
@@ -67,6 +67,7 @@ public abstract class FileWriteActionTestCase extends BuildViewTestCase {
new FileOutErr(),
ImmutableMap.<String, String>of(),
ImmutableMap.of(),
+ null,
null);
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java
index a212893fac..11ced4c8b6 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java
@@ -179,7 +179,8 @@ public class ParamFileWriteActionTest extends BuildViewTestCase {
new FileOutErr(),
ImmutableMap.<String, String>of(),
ImmutableMap.of(),
- artifactExpander);
+ artifactExpander,
+ /*actionFileSystem=*/ null);
}
private enum KeyAttributes {
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
index 75446137cd..c3e25614fd 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
@@ -89,7 +89,8 @@ public class SymlinkActionTest extends BuildViewTestCase {
null,
ImmutableMap.<String, String>of(),
ImmutableMap.of(),
- null));
+ null,
+ /*actionFileSystem=*/ null));
assertThat(actionResult.spawnResults()).isEmpty();
assertThat(output.isSymbolicLink()).isTrue();
assertThat(output.resolveSymbolicLinks()).isEqualTo(input);
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 9f2cd5ea04..81dc77b98b 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
@@ -192,7 +192,8 @@ public class TemplateExpansionActionTest extends FoundationTestCase {
new FileOutErr(),
ImmutableMap.<String, String>of(),
ImmutableMap.of(),
- null);
+ null,
+ /*actionFileSystem=*/ null);
}
private void executeTemplateExpansion(String expected) throws Exception {
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 eaca063305..b917b327aa 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
@@ -2091,7 +2091,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
actionLogBufferPathGenerator.generate(),
clientEnv,
ImmutableMap.of(),
- artifactExpander);
+ artifactExpander,
+ /*actionFileSystem=*/ null);
}
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java
index 9408edab41..2f4a8e57bf 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java
@@ -115,7 +115,7 @@ public class CreateIncSymlinkActionTest extends FoundationTestCase {
private ActionExecutionContext makeDummyContext() {
DummyExecutor executor = new DummyExecutor(fileSystem, rootDirectory);
return new ActionExecutionContext(
- executor, null, null, null, null, null, ImmutableMap.of(), ImmutableMap.of(), null);
+ executor, null, null, null, null, null, ImmutableMap.of(), ImmutableMap.of(), null, null);
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java
index 59fd9bfbae..3e0d629285 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java
@@ -88,7 +88,8 @@ public class LtoBackendActionTest extends BuildViewTestCase {
new FileOutErr(),
ImmutableMap.<String, String>of(),
ImmutableMap.of(),
- null);
+ null,
+ /*actionFileSystem=*/ null);
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
index 9b77e71f43..0120bfc260 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
@@ -784,7 +784,8 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest {
null,
ImmutableMap.<String, String>of(),
ImmutableMap.of(),
- DUMMY_ARTIFACT_EXPANDER);
+ DUMMY_ARTIFACT_EXPANDER,
+ null);
ByteArrayOutputStream moduleMapStream = new ByteArrayOutputStream();
ByteArrayOutputStream umbrellaHeaderStream = new ByteArrayOutputStream();
moduleMapAction.newDeterministicWriter(dummyActionExecutionContext)
@@ -834,7 +835,8 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest {
null,
ImmutableMap.<String, String>of(),
ImmutableMap.of(),
- DUMMY_ARTIFACT_EXPANDER);
+ DUMMY_ARTIFACT_EXPANDER,
+ null);
ByteArrayOutputStream moduleMapStream = new ByteArrayOutputStream();
ByteArrayOutputStream umbrellaHeaderStream = new ByteArrayOutputStream();
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 b327612ad6..e80ec3183b 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
@@ -185,7 +185,10 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase {
ActionExecutionStatusReporter statusReporter =
ActionExecutionStatusReporter.create(new StoredEventHandler());
final SkyframeActionExecutor skyframeActionExecutor =
- new SkyframeActionExecutor(actionKeyContext, new AtomicReference<>(statusReporter));
+ new SkyframeActionExecutor(
+ actionKeyContext,
+ new AtomicReference<>(statusReporter),
+ /*usesActionFileSystem=*/ () -> false);
Path actionOutputBase = scratch.dir("/usr/local/google/_blaze_jrluser/FAKEMD5/action_out/");
skyframeActionExecutor.setActionLogBufferPathGenerator(
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 04d416be01..5ef553fb38 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
@@ -192,7 +192,8 @@ public class StandaloneSpawnStrategyTest {
outErr,
ImmutableMap.<String, String>of(),
ImmutableMap.of(),
- SIMPLE_ARTIFACT_EXPANDER);
+ SIMPLE_ARTIFACT_EXPANDER,
+ /*actionFileSystem=*/ null);
}
@Test