equal
deleted
inserted
replaced
37 endif |
37 endif |
38 |
38 |
39 #### Variables |
39 #### Variables |
40 |
40 |
41 MICROBENCHMARK_SRC := $(TOPDIR)/test/micro/classes |
41 MICROBENCHMARK_SRC := $(TOPDIR)/test/micro/classes |
42 MICROBENCHMARK_RES := $(TOPDIR)/test/micro/resources |
42 # Uncomment this if/when resources are added |
|
43 #MICROBENCHMARK_RES := $(TOPDIR)/test/micro/resources |
43 MICROBENCHMARK_JAR := $(IMAGES_OUTPUTDIR)/test/micro/microbenchmarks.jar |
44 MICROBENCHMARK_JAR := $(IMAGES_OUTPUTDIR)/test/micro/microbenchmarks.jar |
44 |
45 |
45 MICROBENCHMARK_OUTPUT := $(SUPPORT_OUTPUTDIR)/test/micro |
46 MICROBENCHMARK_OUTPUT := $(SUPPORT_OUTPUTDIR)/test/micro |
46 MICROBENCHMARK_CLASSES := $(MICROBENCHMARK_OUTPUT)/classes |
47 MICROBENCHMARK_CLASSES := $(MICROBENCHMARK_OUTPUT)/classes |
47 MICROBENCHMARK_JAR_BIN := $(MICROBENCHMARK_OUTPUT)/jar |
48 MICROBENCHMARK_JAR_BIN := $(MICROBENCHMARK_OUTPUT)/jar |
66 #### Compile Targets |
67 #### Compile Targets |
67 |
68 |
68 # Building microbenchmark requires the jdk.unsupported and java.management modules, |
69 # Building microbenchmark requires the jdk.unsupported and java.management modules, |
69 # and to have sjavac disabled. |
70 # and to have sjavac disabled. |
70 $(eval $(call SetupJavaCompiler, MICROBENCHMARK_JAVA_COMPILER, \ |
71 $(eval $(call SetupJavaCompiler, MICROBENCHMARK_JAVA_COMPILER, \ |
71 JVM := $(JAVA_SMALL) --add-modules jdk.unsupported --limit-modules java.management, \ |
72 JVM := $(JAVA) --add-modules jdk.unsupported --limit-modules java.management, \ |
72 JAVAC := $(NEW_JAVAC), \ |
73 JAVAC := $(NEW_JAVAC), \ |
73 DISABLE_SJAVAC := true, \ |
74 DISABLE_SJAVAC := true, \ |
74 FLAGS := --upgrade-module-path $(JDK_OUTPUTDIR)/modules --system none $(DISABLE_WARNINGS), \ |
75 FLAGS := --upgrade-module-path $(JDK_OUTPUTDIR)/modules --system none $(DISABLE_WARNINGS), \ |
75 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
76 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
76 SERVER_JVM := $(SJAVAC_SERVER_JAVA), \ |
77 SERVER_JVM := $(SJAVAC_SERVER_JAVA), \ |