equal
deleted
inserted
replaced
123 jtreg_tests: |
123 jtreg_tests: |
124 cd $(TOPDIR) && \ |
124 cd $(TOPDIR) && \ |
125 $(MAKE) --no-print-directory -r -R -I make/common/ -f make/RunTestsPrebuilt.gmk \ |
125 $(MAKE) --no-print-directory -r -R -I make/common/ -f make/RunTestsPrebuilt.gmk \ |
126 run-test-prebuilt OUTPUTDIR=$(TEST_OUTPUT_DIR) BOOT_JDK=$(JT_JAVA) \ |
126 run-test-prebuilt OUTPUTDIR=$(TEST_OUTPUT_DIR) BOOT_JDK=$(JT_JAVA) \ |
127 JT_HOME=$(JT_HOME) JDK_IMAGE_DIR=$(PRODUCT_HOME) \ |
127 JT_HOME=$(JT_HOME) JDK_IMAGE_DIR=$(PRODUCT_HOME) \ |
128 TEST_IMAGE_DIR=$(TEST_IMAGE_DIR) TEST="$(patsubst ../%,%,$(TESTDIRS)):$(TEST_SELECTION)" |
128 TEST_IMAGE_DIR=$(TEST_IMAGE_DIR) TEST="$(patsubst ../%,%,$(TESTDIRS)):$(TEST_SELECTION)" || true |
129 $(MKDIR) -p $(TEST_OUTPUT_DIR)/jtreg |
129 $(MKDIR) -p $(TEST_OUTPUT_DIR)/jtreg |
130 $(MV) $(TEST_OUTPUT_DIR)/test-results/`$(HEAD) -n 1 $(TEST_OUTPUT_DIR)/test-support/test-last-ids.txt` $(TEST_OUTPUT_DIR)/jtreg/JTreport |
130 $(MV) $(TEST_OUTPUT_DIR)/test-results/`$(HEAD) -n 1 $(TEST_OUTPUT_DIR)/test-support/test-last-ids.txt` $(TEST_OUTPUT_DIR)/jtreg/JTreport |
131 $(MV) $(TEST_OUTPUT_DIR)/test-support/`$(HEAD) -n 1 $(TEST_OUTPUT_DIR)/test-support/test-last-ids.txt` $(TEST_OUTPUT_DIR)/jtreg/JTwork |
131 $(MV) $(TEST_OUTPUT_DIR)/test-support/`$(HEAD) -n 1 $(TEST_OUTPUT_DIR)/test-support/test-last-ids.txt` $(TEST_OUTPUT_DIR)/jtreg/JTwork |
132 $(MV) $(TEST_OUTPUT_DIR)/jtreg/JTreport/exitcode.txt $(TEST_OUTPUT_DIR)/jtreg/exitcode.txt |
132 $(MV) $(TEST_OUTPUT_DIR)/jtreg/JTreport/exitcode.txt $(TEST_OUTPUT_DIR)/jtreg/exitcode.txt |
133 $(RM) -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error |
|
134 else |
133 else |
135 jtreg_tests: |
134 jtreg_tests: |
136 $(MAKE) --no-print-directory TESTDIRS=$(TESTDIRS_TESTS) \ |
135 $(MAKE) --no-print-directory TESTDIRS=$(TESTDIRS_TESTS) \ |
137 $(COMPONENT)_jtreg_tests |
136 $(COMPONENT)_jtreg_tests |
138 endif |
137 endif |