Mercurial Mercurial > jdk-sandbox / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make/test/JtregNativeHotspot.gmk
changeset 49253 26f624b33218
parent 49241 de4b3a04feae
child 49412 2c3b9dbba7bc 
--- a/make/test/JtregNativeHotspot.gmk	Thu Mar 15 19:30:58 2018 +0100
+++ b/make/test/JtregNativeHotspot.gmk	Thu Mar 15 19:33:04 2018 +0100
@@ -41,90 +41,45 @@
 # Targets for building the native tests themselves.
 ################################################################################
 
-# Add more directories here when needed.
-BUILD_HOTSPOT_JTREG_NATIVE_SRC += \
-    $(TOPDIR)/test/hotspot/jtreg/gc/g1/TestJNIWeakG1 \
-    $(TOPDIR)/test/hotspot/jtreg/gc/stress/TestJNIBlockFullGC \
-    $(TOPDIR)/test/hotspot/jtreg/gc/stress/gclocker \
-    $(TOPDIR)/test/hotspot/jtreg/gc/cslocker \
-    $(TOPDIR)/test/hotspot/jtreg/native_sanity \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/8025979 \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/8033445 \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/checked \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/FindClass \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/PrivateInterfaceMethods \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/ToStringInInterfaceTest \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/CalleeSavedRegisters \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/CallWithJNIWeak \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/ReturnJNIWeak \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/modules/getModuleJNI \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/SameObject \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/BoolReturn \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/noClassDefFoundMsg \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/handshake \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/RedefineTests \
-    $(TOPDIR)/test/hotspot/jtreg/compiler/floatingpoint/ \
-    $(TOPDIR)/test/hotspot/jtreg/compiler/calls \
-    $(TOPDIR)/test/hotspot/jtreg/compiler/runtime/criticalnatives/lookup \
-    $(TOPDIR)/test/hotspot/jtreg/compiler/runtime/criticalnatives/argumentcorruption \
-    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/CanGenerateAllClassHook \
-    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo \
-    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorStackDepthInfo \
-    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/GetNamedModule \
-    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/IsModifiableModule \
-    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/AddModuleReads \
-    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/AddModuleExportsAndOpens \
-    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/AddModuleUsesAndProvides \
-    $(TOPDIR)/test/hotspot/jtreg/testlibrary/jvmti \
-    $(TOPDIR)/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test \
-    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/GetModulesInfo \
-    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ClassFileLoadHook \
-    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ClassLoadPrepare \
-    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ThreadStart \
-    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/StartPhase/AllowedFunctions \
-    $(TOPDIR)/test/hotspot/jtreg/serviceability/dcmd/jvmti/AttachFailed \
-    #
+# This might have been added to by a custom extension.
+BUILD_HOTSPOT_JTREG_NATIVE_SRC += $(TOPDIR)/test/hotspot/jtreg
+
+BUILD_HOTSPOT_JTREG_OUTPUT_DIR := $(OUTPUTDIR)/support/test/hotspot/jtreg/native
 
-# Add conditional directories here when needed.
-ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
-BUILD_HOTSPOT_JTREG_NATIVE_SRC += \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/libadimalloc.solaris.sparc \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/ThreadSignalMask
-endif
+BUILD_HOTSPOT_JTREG_IMAGE_DIR := $(TEST_IMAGE_DIR)/hotspot/jtreg
 
-ifeq ($(OPENJDK_TARGET_OS), linux)
-BUILD_HOTSPOT_JTREG_NATIVE_SRC += \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/execstack \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/jsig \
-    $(TOPDIR)/test/hotspot/jtreg/runtime/StackGuardPages
+# Platform specific setup
+ifneq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
+  BUILD_HOTSPOT_JTREG_EXCLUDE += liboverflow.c exeThreadSignalMask.c
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), linux)
     BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rw := -z noexecstack
     BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rwx := -z execstack
     BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeinvoke := -ljvm -lpthread
-    BUILD_TEST_invoke_exeinvoke.c_OPTIMIZATION := NONE
+    BUILD_TEST_exeinvoke_exeinvoke.c_OPTIMIZATION := NONE
     BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeFPRegs := -ldl
+else
+  BUILD_HOTSPOT_JTREG_EXCLUDE += libtest-rw.c libtest-rwx.c libTestJNI.c \
+      exeinvoke.c
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
     BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
 endif
 
-BUILD_HOTSPOT_JTREG_OUTPUT_DIR := $(OUTPUTDIR)/support/test/hotspot/jtreg/native
-
-BUILD_HOTSPOT_JTREG_IMAGE_DIR := $(TEST_IMAGE_DIR)/hotspot/jtreg
-
 $(eval $(call SetupTestFilesCompilation, BUILD_HOTSPOT_JTREG_LIBRARIES, \
     TYPE := LIBRARY, \
     SOURCE_DIRS := $(BUILD_HOTSPOT_JTREG_NATIVE_SRC), \
     OUTPUT_DIR := $(BUILD_HOTSPOT_JTREG_OUTPUT_DIR), \
+    EXCLUDE := $(BUILD_HOTSPOT_JTREG_EXCLUDE), \
 ))
 
 $(eval $(call SetupTestFilesCompilation, BUILD_HOTSPOT_JTREG_EXECUTABLES, \
     TYPE := PROGRAM, \
     SOURCE_DIRS := $(BUILD_HOTSPOT_JTREG_NATIVE_SRC), \
     OUTPUT_DIR := $(BUILD_HOTSPOT_JTREG_OUTPUT_DIR), \
+    EXCLUDE := $(BUILD_HOTSPOT_JTREG_EXCLUDE), \
 ))
 
 build-test-hotspot-jtreg-native: $(BUILD_HOTSPOT_JTREG_LIBRARIES) $(BUILD_HOTSPOT_JTREG_EXECUTABLES)
jdk-sandbox