45 BUILD_JDK_JTREG_NATIVE_SRC += \ |
45 BUILD_JDK_JTREG_NATIVE_SRC += \ |
46 $(TOPDIR)/test/jdk/native_sanity \ |
46 $(TOPDIR)/test/jdk/native_sanity \ |
47 $(TOPDIR)/test/jdk/java/lang/String/nativeEncoding \ |
47 $(TOPDIR)/test/jdk/java/lang/String/nativeEncoding \ |
48 # |
48 # |
49 |
49 |
|
50 ifneq ($(OPENJDK_TARGET_OS), windows) |
|
51 BUILD_JDK_JTREG_NATIVE_SRC += $(TOPDIR)/test/jdk/java/nio/channels/FileChannel/directio |
|
52 endif |
|
53 |
50 BUILD_JDK_JTREG_OUTPUT_DIR := $(OUTPUTDIR)/support/test/jdk/jtreg/native |
54 BUILD_JDK_JTREG_OUTPUT_DIR := $(OUTPUTDIR)/support/test/jdk/jtreg/native |
51 |
55 |
52 BUILD_JDK_JTREG_IMAGE_DIR := $(TEST_IMAGE_DIR)/jdk/jtreg |
56 BUILD_JDK_JTREG_IMAGE_DIR := $(TEST_IMAGE_DIR)/jdk/jtreg |
53 |
57 |
54 ifeq ($(OPENJDK_TARGET_OS), windows) |
58 ifeq ($(OPENJDK_TARGET_OS), windows) |
55 WIN_LIB_JAVA := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib |
59 WIN_LIB_JAVA := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib |
56 BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := $(WIN_LIB_JAVA) |
60 BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := $(WIN_LIB_JAVA) |
57 else ifeq ($(OPENJDK_TARGET_OS), solaris) |
61 else ifeq ($(OPENJDK_TARGET_OS), solaris) |
58 BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := -ljava -lc |
62 BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := -ljava -lc |
|
63 BUILD_JDK_JTREG_LIBRARIES_LIBS_libDirectIO := -ljava -lc |
59 else |
64 else |
60 BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := -ljava |
65 BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := -ljava |
|
66 BUILD_JDK_JTREG_LIBRARIES_LIBS_libDirectIO := -ljava |
61 endif |
67 endif |
62 |
68 |
63 $(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_LIBRARIES, \ |
69 $(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_LIBRARIES, \ |
64 TYPE := LIBRARY, \ |
70 TYPE := LIBRARY, \ |
65 SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \ |
71 SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \ |