8154956: Module system implementation refresh (4/2016)

Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Reviewed-by: alanb, mchung, chegar, redestad

nashorn/make/BuildNashorn.gmk

@@ -76,9 +76,10 @@ NASGEN_RUN_FILE := $(NASHORN_CLASSES_DIR)/_the.nasgen.run
 ifeq ($(BOOT_JDK_MODULAR), true)
   NASGEN_OPTIONS := \
       -cp $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \
-      -Xpatch:$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \
+      -Xpatch:java.base=$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \
       -XaddExports:java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \
-      -XaddExports:java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED
+      -XaddExports:java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED \
+      #
 else
   NASGEN_OPTIONS := \
       -Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes

nashorn/test/TEST.ROOT

@@ -8,4 +8,4 @@ keys=intermittent randomness
 groups=TEST.groups
 
 # Minimum jtreg version
-requiredVersion=4.2 b01
+requiredVersion=4.2 b02