diff options
author | Liam Miller-Cushon <cushon@google.com> | 2016-07-26 00:45:21 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-07-26 09:31:01 +0000 |
commit | 0fe34924b5e5282b5e2895761f11ad77bccebdba (patch) | |
tree | a4eb1fece75bf305c2ad89c3c5846ac9523e1d0d /src/test/java | |
parent | 648229f16e6f6ebe46348af88d8d474a9a1eb96a (diff) |
Enable the Java launcher by default
--
MOS_MIGRATED_REVID=128421303
Diffstat (limited to 'src/test/java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | 2 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/filegroup/FilegroupConfiguredTargetTest.java | 10 |
2 files changed, 6 insertions, 6 deletions
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 bb630a3c55..0dc24e1cef 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 @@ -380,7 +380,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { * * @throws IllegalArgumentException */ - protected final void useConfiguration(String... args) throws Exception { + protected void useConfiguration(String... args) throws Exception { masterConfig = createConfigurations(args); targetConfig = getTargetConfiguration(); configurationArgs = Arrays.asList(args); diff --git a/src/test/java/com/google/devtools/build/lib/rules/filegroup/FilegroupConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/filegroup/FilegroupConfiguredTargetTest.java index a466c9534c..5b60e0f33c 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/filegroup/FilegroupConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/filegroup/FilegroupConfiguredTargetTest.java @@ -25,14 +25,12 @@ import com.google.devtools.build.lib.analysis.OutputGroupProvider; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.rules.java.JavaSemantics; import com.google.devtools.build.lib.util.FileType; - +import java.io.IOException; +import java.util.Arrays; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.IOException; -import java.util.Arrays; - /** * Tests for {@link Filegroup}. */ @@ -52,9 +50,11 @@ public class FilegroupConfiguredTargetTest extends BuildViewTestCase { @Test public void testDependencyGraph() throws Exception { - scratch.file("java/com/google/test/BUILD", + scratch.file( + "java/com/google/test/BUILD", "java_binary(name = 'test_app',", " resources = [':data'],", + " create_executable = 0,", " srcs = ['InputFile.java', 'InputFile2.java'])", "filegroup(name = 'data',", " srcs = ['b.txt', 'a.txt'])"); |