--- a/make/Help.gmk Fri Sep 07 14:54:15 2018 -0700
+++ b/make/Help.gmk Fri Sep 07 15:46:39 2018 -0700
@@ -119,7 +119,7 @@
run-test-prebuilt:
@( cd $(topdir) && \
$(MAKE) --no-print-directory -r -R -I make/common/ -f make/RunTestsPrebuilt.gmk \
- run-test-prebuilt TEST="$(TEST)" )
+ run-test-prebuilt CUSTOM_MAKE_DIR=$(CUSTOM_MAKE_DIR) TEST="$(TEST)" )
ALL_GLOBAL_TARGETS := help print-configurations run-test-prebuilt
--- a/make/RunTestsPrebuilt.gmk Fri Sep 07 14:54:15 2018 -0700
+++ b/make/RunTestsPrebuilt.gmk Fri Sep 07 15:46:39 2018 -0700
@@ -276,9 +276,10 @@
@$(RM) -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error
@cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -f make/RunTests.gmk run-test \
TEST="$(TEST)"
- @if test -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error ; then \
- exit 1 ; \
- fi
+ $(MKDIR) -p $(OUTPUTDIR)/jtreg
+ $(MV) $(OUTPUTDIR)/test-results/`$(HEAD) -n 1 $(OUTPUTDIR)/test-support/test-last-ids.txt` $(OUTPUTDIR)/jtreg/JTreport
+ $(MV) $(OUTPUTDIR)/test-support/`$(HEAD) -n 1 $(OUTPUTDIR)/test-support/test-last-ids.txt` $(OUTPUTDIR)/jtreg/JTwork
+ $(MV) $(OUTPUTDIR)/jtreg/JTreport/exitcode.txt $(OUTPUTDIR)/jtreg/exitcode.txt
all: run-test-prebuilt
--- a/make/conf/jib-profiles.js Fri Sep 07 14:54:15 2018 -0700
+++ b/make/conf/jib-profiles.js Fri Sep 07 15:46:39 2018 -0700
@@ -770,12 +770,11 @@
dependencies: [ "jtreg", "gnumake", "boot_jdk", "jib", testedProfile + ".jdk",
testedProfile + ".test", "src.full"
],
- work_dir: input.get("src.full", "install_path") + "/test",
+ work_dir: input.get("src.full", "install_path"),
environment: {
- "JT_JAVA": common.boot_jdk_home,
- "PRODUCT_HOME": input.get(testedProfile + ".jdk", "home_path"),
- "TEST_IMAGE_DIR": input.get(testedProfile + ".test", "home_path"),
- "TEST_OUTPUT_DIR": input.src_top_dir
+ "BOOT_JDK": common.boot_jdk_home,
+ "JDK_IMAGE_DIR": input.get(testedProfile + ".jdk", "home_path"),
+ "TEST_IMAGE_DIR": input.get(testedProfile + ".test", "home_path")
},
labels: "test"
}