Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
JAVA_SMALL -> JAVA, comment out MICROBENCHMARK_RES JEP-230-microbenchmarks-branch
authorredestad
Fri, 19 Oct 2018 12:20:44 +0200
branchJEP-230-microbenchmarks-branch
changeset 56991 924fbbfdf07a
parent 56990 3d4b9350fac2
child 56992 8a8b778c8163
JAVA_SMALL -> JAVA, comment out MICROBENCHMARK_RES
make/test/BuildMicrobenchmark.gmk file | annotate | diff | comparison | revisions 
--- a/make/test/BuildMicrobenchmark.gmk	Wed Oct 17 23:28:08 2018 +0200
+++ b/make/test/BuildMicrobenchmark.gmk	Fri Oct 19 12:20:44 2018 +0200
@@ -39,7 +39,8 @@
 #### Variables
 
 MICROBENCHMARK_SRC := $(TOPDIR)/test/micro/classes
-MICROBENCHMARK_RES := $(TOPDIR)/test/micro/resources
+# Uncomment this if/when resources are added
+#MICROBENCHMARK_RES := $(TOPDIR)/test/micro/resources
 MICROBENCHMARK_JAR := $(IMAGES_OUTPUTDIR)/test/micro/microbenchmarks.jar
 
 MICROBENCHMARK_OUTPUT := $(SUPPORT_OUTPUTDIR)/test/micro
@@ -68,7 +69,7 @@
 # Building microbenchmark requires the jdk.unsupported and java.management modules,
 # and to have sjavac disabled.
 $(eval $(call SetupJavaCompiler, MICROBENCHMARK_JAVA_COMPILER, \
-    JVM := $(JAVA_SMALL) --add-modules jdk.unsupported --limit-modules java.management, \
+    JVM := $(JAVA) --add-modules jdk.unsupported --limit-modules java.management, \
     JAVAC := $(NEW_JAVAC), \
     DISABLE_SJAVAC := true, \
     FLAGS := --upgrade-module-path $(JDK_OUTPUTDIR)/modules --system none $(DISABLE_WARNINGS), \
jdk-sandbox