< prev index next >

make/test/JtregGraalUnit.gmk

Print this page

        

@@ -64,58 +64,15 @@
           -Xlint:none \
           -processorpath $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier.jar \
           --add-exports jdk.unsupported/sun.misc=ALL-UNNAMED \
           --add-exports java.base/jdk.internal.misc=ALL-UNNAMED \
 
-      ### Copy 3rd party libs
-      $(eval $(call SetupCopyFiles, COPY_GRAALUNIT_LIBS, \
-          FILES := $(wildcard $(GRAALUNIT_LIB)/*.jar), \
-          DEST := $(LIB_OUTPUTDIR), \
-      ))
+    TARGETS_EXTRA_LIB += $(COPY_GRAALUNIT_LIBS)
 
       TARGETS_EXTRA_LIB += $(COPY_GRAALUNIT_LIBS)
 
-      ### Compile graalunit tests
-      $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_TESTS, \
-          SETUP := GENERATE_USINGJDKBYTECODE, \
-          SRC := \
-              $(SRC_DIR)/jdk.internal.vm.compiler.collections.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.api.directives.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.api.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.asm.aarch64.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.asm.amd64.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.asm.sparc.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.asm.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.core.aarch64.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.core.amd64.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.core.jdk9.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.core.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.debug.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.graph.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.hotspot.amd64.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.hotspot.jdk9.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.hotspot.lir.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.hotspot.sparc.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.hotspot.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.jtt/src \
-              $(SRC_DIR)/org.graalvm.compiler.lir.jtt/src \
-              $(SRC_DIR)/org.graalvm.compiler.lir.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.loop.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.nodes.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.options.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.phases.common.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.replacements.jdk12.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.replacements.jdk9.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.replacements.test/src \
-              $(SRC_DIR)/org.graalvm.compiler.test/src \
-              $(SRC_DIR)/org.graalvm.util.test/src \
-              , \
-          EXCLUDE_FILES := org/graalvm/compiler/core/test/VerifyDebugUsageTest.java, \
-          BIN := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests, \
-          CLASSPATH := $(TEST_COMPILE_CP), \
-          ADD_JAVAC_FLAGS := $(TEST_JAVAC_FLAGS), \
-      ))
+    TARGETS_BUILD += $(BUILD_VM_COMPILER_TESTS)
 
       TARGETS_BUILD += $(BUILD_VM_COMPILER_TESTS)
 
       ### Compile graalunit tests which require -XDstringConcat=inline
       $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_TESTS_SET2, \
< prev index next >