Skip to content

Commit f125c76

Browse files
author
Matthew Donovan
committed
8247690: RunTest does not support running of JTREG manual tests
Reviewed-by: erikj
1 parent 7b11bd1 commit f125c76

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

doc/testing.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,8 @@ <h4 id="repeat_count">REPEAT_COUNT</h4>
535535
<h4 id="report">REPORT</h4>
536536
<p>Use this report style when reporting test results (sent to JTReg as
537537
<code>-report</code>). Defaults to <code>files</code>.</p>
538+
<h4 id="manual">MANUAL</h4>
539+
<p>Set to <code>true</code> to execute manual tests only.</p>
538540
<h3 id="gtest-keywords">Gtest keywords</h3>
539541
<h4 id="repeat">REPEAT</h4>
540542
<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
@@ -512,6 +512,10 @@ helps to reproduce intermittent test failures. Defaults to 0.
512512
Use this report style when reporting test results (sent to JTReg as `-report`).
513513
Defaults to `files`.
514514

515+
#### MANUAL
516+
517+
Set to `true` to execute manual tests only.
518+
515519
### Gtest keywords
516520

517521
#### REPEAT

make/RunTests.gmk

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ $(eval $(call ParseKeywordVariable, JTREG, \
206206
SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
207207
TEST_MODE ASSERT VERBOSE RETAIN TEST_THREAD_FACTORY JVMTI_STRESS_AGENT \
208208
MAX_MEM RUN_PROBLEM_LISTS RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT \
209-
AOT_JDK $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
209+
AOT_JDK MANUAL $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
210210
STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
211211
EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \
212212
$(CUSTOM_JTREG_STRING_KEYWORDS), \
@@ -911,7 +911,13 @@ define SetupRunJtregTestBody
911911
-vmoption:-Dtest.boot.jdk="$$(BOOT_JDK)" \
912912
-vmoption:-Djava.io.tmpdir="$$($1_TEST_TMP_DIR)"
913913

914-
$1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet
914+
$1_JTREG_BASIC_OPTIONS += -ignore:quiet
915+
916+
ifeq ($$(JTREG_MANUAL), true)
917+
$1_JTREG_BASIC_OPTIONS += -manual
918+
else
919+
$1_JTREG_BASIC_OPTIONS += -automatic
920+
endif
915921

916922
# Make it possible to specify the JIB_DATA_DIR for tests using the
917923
# JIB Artifact resolver

0 commit comments

Comments
 (0)