8294403: [REDO] make test should report only on executed tests
Reviewed-by: erikj, dholmes, jpai, djelinski
This commit is contained in:
parent
88f0ea7887
commit
5598acc345
@ -494,6 +494,9 @@ allows to pass the tests with intermittent failures. Defaults to 0.</p>
|
|||||||
<p>Repeat the tests up to a set number of times, stopping at first
|
<p>Repeat the tests up to a set number of times, stopping at first
|
||||||
failure. This helps to reproduce intermittent test failures. Defaults to
|
failure. This helps to reproduce intermittent test failures. Defaults to
|
||||||
0.</p>
|
0.</p>
|
||||||
|
<h4 id="report">REPORT</h4>
|
||||||
|
<p>Use this report style when reporting test results (sent to JTReg as
|
||||||
|
<code>-report</code>). Defaults to <code>files</code>.</p>
|
||||||
<h3 id="gtest-keywords">Gtest keywords</h3>
|
<h3 id="gtest-keywords">Gtest keywords</h3>
|
||||||
<h4 id="repeat">REPEAT</h4>
|
<h4 id="repeat">REPEAT</h4>
|
||||||
<p>The number of times to repeat the tests
|
<p>The number of times to repeat the tests
|
||||||
|
@ -484,6 +484,11 @@ Repeat the tests up to a set number of times, stopping at first failure.
|
|||||||
This helps to reproduce intermittent test failures.
|
This helps to reproduce intermittent test failures.
|
||||||
Defaults to 0.
|
Defaults to 0.
|
||||||
|
|
||||||
|
#### REPORT
|
||||||
|
|
||||||
|
Use this report style when reporting test results (sent to JTReg as `-report`).
|
||||||
|
Defaults to `files`.
|
||||||
|
|
||||||
### Gtest keywords
|
### Gtest keywords
|
||||||
|
|
||||||
#### REPEAT
|
#### REPEAT
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
|
# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -196,11 +196,12 @@ $(eval $(call SetTestOpt,JAVA_OPTIONS,JTREG))
|
|||||||
$(eval $(call SetTestOpt,JOBS,JTREG))
|
$(eval $(call SetTestOpt,JOBS,JTREG))
|
||||||
$(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG))
|
$(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG))
|
||||||
$(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG))
|
$(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG))
|
||||||
|
$(eval $(call SetTestOpt,REPORT,JTREG))
|
||||||
|
|
||||||
$(eval $(call ParseKeywordVariable, JTREG, \
|
$(eval $(call ParseKeywordVariable, JTREG, \
|
||||||
SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
|
SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
|
||||||
TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS \
|
TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS \
|
||||||
RETRY_COUNT REPEAT_COUNT MAX_OUTPUT $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
|
RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
|
||||||
STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
|
STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
|
||||||
EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \
|
EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \
|
||||||
$(CUSTOM_JTREG_STRING_KEYWORDS), \
|
$(CUSTOM_JTREG_STRING_KEYWORDS), \
|
||||||
@ -745,6 +746,7 @@ define SetupRunJtregTestBody
|
|||||||
JTREG_RUN_PROBLEM_LISTS ?= false
|
JTREG_RUN_PROBLEM_LISTS ?= false
|
||||||
JTREG_RETRY_COUNT ?= 0
|
JTREG_RETRY_COUNT ?= 0
|
||||||
JTREG_REPEAT_COUNT ?= 0
|
JTREG_REPEAT_COUNT ?= 0
|
||||||
|
JTREG_REPORT ?= files
|
||||||
|
|
||||||
ifneq ($$(JTREG_RETRY_COUNT), 0)
|
ifneq ($$(JTREG_RETRY_COUNT), 0)
|
||||||
ifneq ($$(JTREG_REPEAT_COUNT), 0)
|
ifneq ($$(JTREG_REPEAT_COUNT), 0)
|
||||||
@ -857,6 +859,7 @@ define SetupRunJtregTestBody
|
|||||||
-dir:$$(JTREG_TOPDIR) \
|
-dir:$$(JTREG_TOPDIR) \
|
||||||
-reportDir:$$($1_TEST_RESULTS_DIR) \
|
-reportDir:$$($1_TEST_RESULTS_DIR) \
|
||||||
-workDir:$$($1_TEST_SUPPORT_DIR) \
|
-workDir:$$($1_TEST_SUPPORT_DIR) \
|
||||||
|
-report:$${JTREG_REPORT} \
|
||||||
$$$${JTREG_STATUS} \
|
$$$${JTREG_STATUS} \
|
||||||
$$(JTREG_OPTIONS) \
|
$$(JTREG_OPTIONS) \
|
||||||
$$(JTREG_FAILURE_HANDLER_OPTIONS) \
|
$$(JTREG_FAILURE_HANDLER_OPTIONS) \
|
||||||
|
Loading…
Reference in New Issue
Block a user