equal
deleted
inserted
replaced
59 |
59 |
60 TARGETS += $(BUILD_FAILURE_HANDLER) |
60 TARGETS += $(BUILD_FAILURE_HANDLER) |
61 |
61 |
62 ################################################################################ |
62 ################################################################################ |
63 |
63 |
64 ifeq ($(OPENJDK_TARGET_OS), windows) |
64 ifeq ($(call isTargetOs, windows), true) |
65 |
65 |
66 $(eval $(call SetupNativeCompilation, BUILD_LIBTIMEOUT_HANDLER, \ |
66 $(eval $(call SetupNativeCompilation, BUILD_LIBTIMEOUT_HANDLER, \ |
67 NAME := timeoutHandler, \ |
67 NAME := timeoutHandler, \ |
68 SRC := $(FH_BASEDIR)/src/windows/native/libtimeoutHandler, \ |
68 SRC := $(FH_BASEDIR)/src/windows/native/libtimeoutHandler, \ |
69 OBJECT_DIR := $(FH_SUPPORT)/libtimeoutHandler, \ |
69 OBJECT_DIR := $(FH_SUPPORT)/libtimeoutHandler, \ |
97 # Use JTREG_TEST_OPTS for test VM options |
97 # Use JTREG_TEST_OPTS for test VM options |
98 # Use JTREG_TESTS for jtreg tests parameter |
98 # Use JTREG_TESTS for jtreg tests parameter |
99 # |
99 # |
100 RUN_DIR := $(FH_SUPPORT)/test |
100 RUN_DIR := $(FH_SUPPORT)/test |
101 # Add the dir of the dll to the path on windows |
101 # Add the dir of the dll to the path on windows |
102 ifeq ($(OPENJDK_TARGET_OS), windows) |
102 ifeq ($(call isTargetOs, windows), true) |
103 export PATH := $(PATH);$(FH_SUPPORT) |
103 export PATH := $(PATH);$(FH_SUPPORT) |
104 endif |
104 endif |
105 |
105 |
106 test: |
106 test: |
107 $(RM) -r $(RUN_DIR) |
107 $(RM) -r $(RUN_DIR) |