JDK-8259395 Patching automatic module with additional packages re-creates module without "requires java.base"

test/jdk/tools/launcher/modules/patch/automatic/PatchTest.java

@@ -75,9 +75,7 @@ public class PatchTest {
     private static final String MODULE_PATH = String.join(File.pathSeparator, SOMELIB_JAR.toString(), APP_CLASSES.toString());
 
     /**
-     * Test using --patch-module with main class in a new package in the patch
-     *
-     * The consists of 2 modules:
+     * The test consists of 2 modules:
      *
      * somelib - dummy automatic module.
      * myapp - explicit module, uses somelib

test/jdk/tools/launcher/modules/patch/automatic/myapp/module-info.java

@@ -1,3 +1,3 @@
 module myapp {
     requires somelib;
-}
+}

test/jdk/tools/launcher/modules/patch/automatic/patch1/somelib/PatchInfo.java

@@ -29,4 +29,4 @@ public static String patchName() {
         return "patch1";
     }
 
-}
+}

test/jdk/tools/launcher/modules/patch/automatic/patch2/somelib/PatchInfo.java

@@ -29,4 +29,4 @@ public static String patchName() {
         return "patch2";
     }
 
-}
+}

test/jdk/tools/launcher/modules/patch/automatic/somelib/somelib/PatchInfo.java

@@ -29,4 +29,4 @@ public static String patchName() {
         return "original";
     }
 
-}
+}