183 $$(call ExecuteWithLog, $$@, \ |
183 $$(call ExecuteWithLog, $$@, \ |
184 $((COV_ENVIRONMENT) \ |
184 $((COV_ENVIRONMENT) \ |
185 $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/jaotc \ |
185 $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/jaotc \ |
186 $$($1_JAOTC_OPTS) --output $$@ --module $$($1_MODULE) \ |
186 $$($1_JAOTC_OPTS) --output $$@ --module $$($1_MODULE) \ |
187 ) |
187 ) |
188 $$(call ExecuteWithLog, $$@.check, \ |
188 $$(call ExecuteWithLog, $$@.check, ( \ |
189 $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/java \ |
189 $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/java \ |
190 $$($1_VM_OPTIONS) -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions \ |
190 $$($1_VM_OPTIONS) -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions \ |
191 -XX:+PrintAOT -XX:+UseAOTStrictLoading \ |
191 -XX:+PrintAOT -XX:+UseAOTStrictLoading \ |
192 -XX:AOTLibrary=$$@ -version \ |
192 -XX:AOTLibrary=$$@ -version \ |
193 > $$@.verify-aot \ |
193 > $$@.verify-aot \ |
194 ) |
194 )) |
195 |
195 |
196 $1_AOT_OPTIONS += -XX:+UnlockExperimentalVMOptions |
196 $1_AOT_OPTIONS += -XX:+UnlockExperimentalVMOptions |
197 $1_AOT_OPTIONS += -XX:AOTLibrary=$$($1_AOT_LIB) |
197 $1_AOT_OPTIONS += -XX:AOTLibrary=$$($1_AOT_LIB) |
198 $1_AOT_TARGETS += $$($1_AOT_LIB) |
198 $1_AOT_TARGETS += $$($1_AOT_LIB) |
199 endef |
199 endef |
591 |
591 |
592 run-test-$1: pre-run-test $$($1_AOT_TARGETS) |
592 run-test-$1: pre-run-test $$($1_AOT_TARGETS) |
593 $$(call LogWarn) |
593 $$(call LogWarn) |
594 $$(call LogWarn, Running test '$$($1_TEST)') |
594 $$(call LogWarn, Running test '$$($1_TEST)') |
595 $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
595 $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
596 $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, \ |
596 $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, ( \ |
597 $$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/$$($1_VARIANT)/gtestLauncher \ |
597 $$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/$$($1_VARIANT)/gtestLauncher \ |
598 -jdk $(JDK_UNDER_TEST) $$($1_GTEST_FILTER) \ |
598 -jdk $(JDK_UNDER_TEST) $$($1_GTEST_FILTER) \ |
599 --gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \ |
599 --gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \ |
600 $$($1_GTEST_REPEAT) $$(GTEST_OPTIONS) $$(GTEST_VM_OPTIONS) \ |
600 $$($1_GTEST_REPEAT) $$(GTEST_OPTIONS) $$(GTEST_VM_OPTIONS) \ |
601 $$(GTEST_JAVA_OPTIONS) $$($1_AOT_OPTIONS) \ |
601 $$(GTEST_JAVA_OPTIONS) $$($1_AOT_OPTIONS) \ |
602 > >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) \ |
602 > >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) \ |
603 && $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
603 && $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
604 || $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
604 || $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
605 ) |
605 )) |
606 |
606 |
607 $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt |
607 $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt |
608 |
608 |
609 parse-test-$1: run-test-$1 |
609 parse-test-$1: run-test-$1 |
610 $$(call LogWarn, Finished running test '$$($1_TEST)') |
610 $$(call LogWarn, Finished running test '$$($1_TEST)') |
703 |
703 |
704 run-test-$1: pre-run-test |
704 run-test-$1: pre-run-test |
705 $$(call LogWarn) |
705 $$(call LogWarn) |
706 $$(call LogWarn, Running test '$$($1_TEST)') |
706 $$(call LogWarn, Running test '$$($1_TEST)') |
707 $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
707 $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
708 $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/micro, \ |
708 $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/micro, ( \ |
709 $$(FIXPATH) $$($1_MICRO_TEST_JDK)/bin/java $$($1_MICRO_JAVA_OPTIONS) \ |
709 $$(FIXPATH) $$($1_MICRO_TEST_JDK)/bin/java $$($1_MICRO_JAVA_OPTIONS) \ |
710 -jar $$($1_MICRO_BENCHMARKS_JAR) \ |
710 -jar $$($1_MICRO_BENCHMARKS_JAR) \ |
711 $$($1_MICRO_ITER) $$($1_MICRO_FORK) $$($1_MICRO_TIME) \ |
711 $$($1_MICRO_ITER) $$($1_MICRO_FORK) $$($1_MICRO_TIME) \ |
712 $$($1_MICRO_WARMUP_ITER) $$($1_MICRO_WARMUP_TIME) \ |
712 $$($1_MICRO_WARMUP_ITER) $$($1_MICRO_WARMUP_TIME) \ |
713 $$($1_MICRO_VM_OPTIONS) $$($1_MICRO_BASIC_OPTIONS) $$(MICRO_OPTIONS) \ |
713 $$($1_MICRO_VM_OPTIONS) $$($1_MICRO_BASIC_OPTIONS) $$(MICRO_OPTIONS) \ |
714 $$($1_TEST_NAME) \ |
714 $$($1_TEST_NAME) \ |
715 > >($(TEE) $$($1_TEST_RESULTS_DIR)/micro.txt) \ |
715 > >($(TEE) $$($1_TEST_RESULTS_DIR)/micro.txt) \ |
716 && $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
716 && $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
717 || $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
717 || $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
718 ) |
718 )) |
719 |
719 |
720 $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/micro.txt |
720 $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/micro.txt |
721 |
721 |
722 parse-test-$1: run-test-$1 |
722 parse-test-$1: run-test-$1 |
723 $$(call LogWarn, Finished running test '$$($1_TEST)') |
723 $$(call LogWarn, Finished running test '$$($1_TEST)') |
926 |
926 |
927 run-test-$1: pre-run-test clean-workdir-$1 $$($1_AOT_TARGETS) |
927 run-test-$1: pre-run-test clean-workdir-$1 $$($1_AOT_TARGETS) |
928 $$(call LogWarn) |
928 $$(call LogWarn) |
929 $$(call LogWarn, Running test '$$($1_TEST)') |
929 $$(call LogWarn, Running test '$$($1_TEST)') |
930 $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
930 $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
931 $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, \ |
931 $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, ( \ |
932 $$(COV_ENVIRONMENT) \ |
932 $$(COV_ENVIRONMENT) \ |
933 $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \ |
933 $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \ |
934 -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \ |
934 -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \ |
935 $$($1_JTREG_BASIC_OPTIONS) \ |
935 $$($1_JTREG_BASIC_OPTIONS) \ |
936 -testjdk:$$(JDK_UNDER_TEST) \ |
936 -testjdk:$$(JDK_UNDER_TEST) \ |
941 $$(JTREG_FAILURE_HANDLER_OPTIONS) \ |
941 $$(JTREG_FAILURE_HANDLER_OPTIONS) \ |
942 $$(JTREG_COV_OPTIONS) \ |
942 $$(JTREG_COV_OPTIONS) \ |
943 $$($1_TEST_NAME) \ |
943 $$($1_TEST_NAME) \ |
944 && $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
944 && $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
945 || $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
945 || $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
946 ) |
946 )) |
947 |
947 |
948 $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/text/stats.txt |
948 $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/text/stats.txt |
949 |
949 |
950 parse-test-$1: run-test-$1 |
950 parse-test-$1: run-test-$1 |
951 $$(call LogWarn, Finished running test '$$($1_TEST)') |
951 $$(call LogWarn, Finished running test '$$($1_TEST)') |
1017 |
1017 |
1018 run-test-$1: pre-run-test |
1018 run-test-$1: pre-run-test |
1019 $$(call LogWarn) |
1019 $$(call LogWarn) |
1020 $$(call LogWarn, Running test '$$($1_TEST)') |
1020 $$(call LogWarn, Running test '$$($1_TEST)') |
1021 $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
1021 $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
1022 $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/test-execution, \ |
1022 $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/test-execution, ( \ |
1023 $$($1_TEST_COMMAND_LINE) \ |
1023 $$($1_TEST_COMMAND_LINE) \ |
1024 > >($(TEE) $$($1_TEST_RESULTS_DIR)/test-output.txt) \ |
1024 > >($(TEE) $$($1_TEST_RESULTS_DIR)/test-output.txt) \ |
1025 && $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
1025 && $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
1026 || $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
1026 || $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
1027 ) |
1027 )) |
1028 |
1028 |
1029 $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt |
1029 $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt |
1030 |
1030 |
1031 # We can not parse the various "special" tests. |
1031 # We can not parse the various "special" tests. |
1032 parse-test-$1: run-test-$1 |
1032 parse-test-$1: run-test-$1 |