comparison make/MainSupport.gmk @ 51719:9071d2023859

fixes for regression test MethodHandleRefTest.java
author vromero
date Tue, 17 Jul 2018 13:28:17 -0700
parents 59bdd7243c52
children c5905f5d6d45
comparison
equal deleted inserted replaced
18:d87ee7534fdd 19:5f2aa25d97c8
34 # JT_JAVA is picked up by the jtreg launcher and used to run Jtreg itself. 34 # JT_JAVA is picked up by the jtreg launcher and used to run Jtreg itself.
35 define RunTests 35 define RunTests
36 ($(CD) $(TOPDIR)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \ 36 ($(CD) $(TOPDIR)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \
37 JT_HOME=$(JT_HOME) PRODUCT_HOME=$(strip $2) \ 37 JT_HOME=$(JT_HOME) PRODUCT_HOME=$(strip $2) \
38 TEST_IMAGE_DIR=$(TEST_IMAGE_DIR) \ 38 TEST_IMAGE_DIR=$(TEST_IMAGE_DIR) \
39 ALT_OUTPUTDIR=$(OUTPUT_ROOT) TEST_JOBS=$(TEST_JOBS) \ 39 ALT_OUTPUTDIR=$(OUTPUTDIR) TEST_JOBS=$(TEST_JOBS) \
40 JT_JAVA=$(BOOT_JDK) JIB_JAR=$(JIB_JAR) \ 40 JT_JAVA=$(BOOT_JDK) JIB_JAR=$(JIB_JAR) \
41 JOBS=$(JOBS) $1) || true 41 JOBS=$(JOBS) $1) || true
42 endef 42 endef
43 43
44 define CleanDocs 44 define CleanDocs
52 52
53 # Cleans the dir given as $1 53 # Cleans the dir given as $1
54 define CleanDir 54 define CleanDir
55 @$(PRINTF) "Cleaning $(strip $1) build artifacts ..." 55 @$(PRINTF) "Cleaning $(strip $1) build artifacts ..."
56 @$(PRINTF) "\n" $(LOG_DEBUG) 56 @$(PRINTF) "\n" $(LOG_DEBUG)
57 ($(CD) $(OUTPUT_ROOT) && $(RM) -r $1) 57 ($(CD) $(OUTPUTDIR) && $(RM) -r $1)
58 @$(PRINTF) " done\n" 58 @$(PRINTF) " done\n"
59 endef 59 endef
60 60
61 define CleanSupportDir 61 define CleanSupportDir
62 @$(PRINTF) "Cleaning $(strip $1) build artifacts ..." 62 @$(PRINTF) "Cleaning $(strip $1) build artifacts ..."