diff --git a/doc/testing.html b/doc/testing.html index 9d90d13e357..1ef3038d194 100644 --- a/doc/testing.html +++ b/doc/testing.html @@ -200,8 +200,6 @@ TEST FAILURE

Retry failed tests up to a set number of times, until they pass. This allows to pass the tests with intermittent failures. Defaults to 0.

REPEAT_COUNT

Repeat the tests up to a set number of times, stopping at first failure. This helps to reproduce intermittent test failures. Defaults to 0.

-

REPORT

-

Use this report style when reporting test results (sent to JTReg as -report). Defaults to executed.

Gtest keywords

REPEAT

The number of times to repeat the tests (--gtest_repeat).

diff --git a/doc/testing.md b/doc/testing.md index 634c240aeda..5cac75ca2c8 100644 --- a/doc/testing.md +++ b/doc/testing.md @@ -456,11 +456,6 @@ Repeat the tests up to a set number of times, stopping at first failure. This helps to reproduce intermittent test failures. Defaults to 0. -#### REPORT - -Use this report style when reporting test results (sent to JTReg as `-report`). -Defaults to `executed`. - ### Gtest keywords #### REPEAT diff --git a/make/RunTests.gmk b/make/RunTests.gmk index edf294eaba9..c9ee216a722 100644 --- a/make/RunTests.gmk +++ b/make/RunTests.gmk @@ -196,12 +196,11 @@ $(eval $(call SetTestOpt,JAVA_OPTIONS,JTREG)) $(eval $(call SetTestOpt,JOBS,JTREG)) $(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG)) $(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG)) -$(eval $(call SetTestOpt,REPORT,JTREG)) $(eval $(call ParseKeywordVariable, JTREG, \ SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \ TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS \ - RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT $(CUSTOM_JTREG_SINGLE_KEYWORDS), \ + RETRY_COUNT REPEAT_COUNT MAX_OUTPUT $(CUSTOM_JTREG_SINGLE_KEYWORDS), \ STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \ EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \ $(CUSTOM_JTREG_STRING_KEYWORDS), \ @@ -746,7 +745,6 @@ define SetupRunJtregTestBody JTREG_RUN_PROBLEM_LISTS ?= false JTREG_RETRY_COUNT ?= 0 JTREG_REPEAT_COUNT ?= 0 - JTREG_REPORT ?= executed ifneq ($$(JTREG_RETRY_COUNT), 0) ifneq ($$(JTREG_REPEAT_COUNT), 0) @@ -856,7 +854,6 @@ define SetupRunJtregTestBody -dir:$$(JTREG_TOPDIR) \ -reportDir:$$($1_TEST_RESULTS_DIR) \ -workDir:$$($1_TEST_SUPPORT_DIR) \ - -report:$$$${JTREG_REPORT_ITERATION} \ $$$${JTREG_STATUS} \ $$(JTREG_OPTIONS) \ $$(JTREG_FAILURE_HANDLER_OPTIONS) \ @@ -868,7 +865,6 @@ define SetupRunJtregTestBody ifneq ($$(JTREG_RETRY_COUNT), 0) $1_COMMAND_LINE := \ - export JTREG_REPORT_ITERATION=$$(JTREG_REPORT); \ for i in {0..$$(JTREG_RETRY_COUNT)}; do \ if [ "$$$$i" != 0 ]; then \ $$(PRINTF) "\nRetrying Jtreg run. Attempt: $$$$i\n"; \ @@ -878,11 +874,11 @@ define SetupRunJtregTestBody break; \ fi; \ export JTREG_STATUS="-status:error,fail"; \ - export JTREG_REPORT_ITERATION="all-executed"; \ done - else ifneq ($$(JTREG_REPEAT_COUNT), 0) + endif + + ifneq ($$(JTREG_REPEAT_COUNT), 0) $1_COMMAND_LINE := \ - export JTREG_REPORT_ITERATION=$$(JTREG_REPORT); \ for i in {1..$$(JTREG_REPEAT_COUNT)}; do \ $$(PRINTF) "\nRepeating Jtreg run: $$$$i out of $$(JTREG_REPEAT_COUNT)\n"; \ $$($1_COMMAND_LINE); \ @@ -891,10 +887,6 @@ define SetupRunJtregTestBody break; \ fi; \ done - else - $1_COMMAND_LINE := \ - export JTREG_REPORT_ITERATION=$$(JTREG_REPORT); \ - $$($1_COMMAND_LINE); endif run-test-$1: pre-run-test clean-workdir-$1