Skip to content

Commit 0cda7c9

Browse files
committed
8247690: RunTest does not support running of JTREG manual tests
Reviewed-by: stuefe, andrew Backport-of: 12b4515a03e6a28e17b0d6596027835ccb1b8837
1 parent fa77515 commit 0cda7c9

3 files changed

Lines changed: 15 additions & 2 deletions

File tree

doc/testing.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,8 @@ <h4 id="repeat_count">REPEAT_COUNT</h4>
509509
<h4 id="report">REPORT</h4>
510510
<p>Use this report style when reporting test results (sent to JTReg as
511511
<code>-report</code>). Defaults to <code>files</code>.</p>
512+
<h4 id="manual">MANUAL</h4>
513+
<p>Set to <code>true</code> to execute manual tests only.</p>
512514
<h3 id="gtest-keywords">Gtest keywords</h3>
513515
<h4 id="repeat">REPEAT</h4>
514516
<p>The number of times to repeat the tests

doc/testing.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,10 @@ Defaults to 0.
498498
Use this report style when reporting test results (sent to JTReg as `-report`).
499499
Defaults to `files`.
500500

501+
#### MANUAL
502+
503+
Set to `true` to execute manual tests only.
504+
501505
### Gtest keywords
502506

503507
#### REPEAT

make/RunTests.gmk

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ $(eval $(call SetTestOpt,REPORT,JTREG))
205205
$(eval $(call ParseKeywordVariable, JTREG, \
206206
SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
207207
TEST_MODE ASSERT VERBOSE RETAIN TEST_THREAD_FACTORY MAX_MEM RUN_PROBLEM_LISTS \
208-
RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
208+
RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT MANUAL \
209+
$(CUSTOM_JTREG_SINGLE_KEYWORDS), \
209210
STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
210211
EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \
211212
$(CUSTOM_JTREG_STRING_KEYWORDS), \
@@ -793,7 +794,13 @@ define SetupRunJtregTestBody
793794
-vmoption:-Dtest.boot.jdk="$$(BOOT_JDK)" \
794795
-vmoption:-Djava.io.tmpdir="$$($1_TEST_TMP_DIR)"
795796

796-
$1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet
797+
$1_JTREG_BASIC_OPTIONS += -ignore:quiet
798+
799+
ifeq ($$(JTREG_MANUAL), true)
800+
$1_JTREG_BASIC_OPTIONS += -manual
801+
else
802+
$1_JTREG_BASIC_OPTIONS += -automatic
803+
endif
797804

798805
# Make it possible to specify the JIB_DATA_DIR for tests using the
799806
# JIB Artifact resolver

0 commit comments

Comments
 (0)