Roll forward commit 94c86135d05a1844263c59f3ce6b1c1917e0f4c8

And don't provide a default value for :java_launcher

--
MOS_MIGRATED_REVID=129900898

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 8f80ee614d..0197e985ba 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
@@ -381,7 +381,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
    *
    * @throws IllegalArgumentException
    */
-  protected final void useConfiguration(String... args) throws Exception {
+  protected void useConfiguration(String... args) throws Exception {
     String[] actualArgs;
     if (useDynamicConfigs) {
       actualArgs = Arrays.copyOf(args, args.length + 1);
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'])");