From 6e1a5a9a2867ca8914f218a90e98fac96a3ad31f Mon Sep 17 00:00:00 2001 From: Matthew Donovan Date: Tue, 18 Nov 2025 15:26:20 -0500 Subject: [PATCH 1/5] 8247690: RunTest does not support running of JTREG manual tests --- make/RunTests.gmk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/make/RunTests.gmk b/make/RunTests.gmk index 947389f64f99c..21eb178343ee4 100644 --- a/make/RunTests.gmk +++ b/make/RunTests.gmk @@ -206,7 +206,7 @@ $(eval $(call ParseKeywordVariable, JTREG, \ SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \ TEST_MODE ASSERT VERBOSE RETAIN TEST_THREAD_FACTORY JVMTI_STRESS_AGENT \ MAX_MEM RUN_PROBLEM_LISTS RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT \ - AOT_JDK $(CUSTOM_JTREG_SINGLE_KEYWORDS), \ + AOT_JDK MANUAL $(CUSTOM_JTREG_SINGLE_KEYWORDS), \ STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \ EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \ $(CUSTOM_JTREG_STRING_KEYWORDS), \ @@ -911,7 +911,13 @@ define SetupRunJtregTestBody -vmoption:-Dtest.boot.jdk="$$(BOOT_JDK)" \ -vmoption:-Djava.io.tmpdir="$$($1_TEST_TMP_DIR)" - $1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet + $1_JTREG_BASIC_OPTIONS += -ignore:quiet + + ifeq ($$(JTREG_MANUAL), true) + $1_JTREG_BASIC_OPTIONS += -manual + else + $1_JTREG_BASIC_OPTIONS += -automatic + endif # Make it possible to specify the JIB_DATA_DIR for tests using the # JIB Artifact resolver From 1cfa515ddec7b75b2bd1fbb9c343efa259edfe2b Mon Sep 17 00:00:00 2001 From: Matthew Donovan Date: Wed, 19 Nov 2025 07:36:15 -0500 Subject: [PATCH 2/5] removed manual/automatic flag entirely --- make/RunTests.gmk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/make/RunTests.gmk b/make/RunTests.gmk index 21eb178343ee4..4f8819ddb1e04 100644 --- a/make/RunTests.gmk +++ b/make/RunTests.gmk @@ -206,7 +206,7 @@ $(eval $(call ParseKeywordVariable, JTREG, \ SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \ TEST_MODE ASSERT VERBOSE RETAIN TEST_THREAD_FACTORY JVMTI_STRESS_AGENT \ MAX_MEM RUN_PROBLEM_LISTS RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT \ - AOT_JDK MANUAL $(CUSTOM_JTREG_SINGLE_KEYWORDS), \ + AOT_JDK $(CUSTOM_JTREG_SINGLE_KEYWORDS), \ STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \ EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \ $(CUSTOM_JTREG_STRING_KEYWORDS), \ @@ -913,12 +913,6 @@ define SetupRunJtregTestBody $1_JTREG_BASIC_OPTIONS += -ignore:quiet - ifeq ($$(JTREG_MANUAL), true) - $1_JTREG_BASIC_OPTIONS += -manual - else - $1_JTREG_BASIC_OPTIONS += -automatic - endif - # Make it possible to specify the JIB_DATA_DIR for tests using the # JIB Artifact resolver $1_JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR From 7cbb1ddbc67d82110891702c20c550501bf64bd2 Mon Sep 17 00:00:00 2001 From: Matthew Donovan Date: Wed, 19 Nov 2025 10:20:36 -0500 Subject: [PATCH 3/5] reverted to original change and updated testing.{md,html} --- doc/testing.html | 2 ++ doc/testing.md | 5 +++++ make/RunTests.gmk | 8 +++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/doc/testing.html b/doc/testing.html index b9838735e4f6e..693ab698a649b 100644 --- a/doc/testing.html +++ b/doc/testing.html @@ -535,6 +535,8 @@

REPEAT_COUNT

REPORT

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

+

MANUAL

+

Set to true to execute manual tests.

Gtest keywords

REPEAT

The number of times to repeat the tests diff --git a/doc/testing.md b/doc/testing.md index 0144610a5bf92..e2f22a3f4e1c5 100644 --- a/doc/testing.md +++ b/doc/testing.md @@ -455,6 +455,7 @@ JTReg keywords sent to JTReg using `-k`. Please be careful in making sure that spaces and special characters (like `!`) are properly quoted. To avoid some issues, the special value `%20` can be used instead of space. + #### EXTRA_PROBLEM_LISTS Use additional problem lists file or files, in addition to the default @@ -512,6 +513,10 @@ helps to reproduce intermittent test failures. Defaults to 0. Use this report style when reporting test results (sent to JTReg as `-report`). Defaults to `files`. +#### MANUAL + +Set to `true` to execute manual tests. + ### Gtest keywords #### REPEAT diff --git a/make/RunTests.gmk b/make/RunTests.gmk index 4f8819ddb1e04..21eb178343ee4 100644 --- a/make/RunTests.gmk +++ b/make/RunTests.gmk @@ -206,7 +206,7 @@ $(eval $(call ParseKeywordVariable, JTREG, \ SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \ TEST_MODE ASSERT VERBOSE RETAIN TEST_THREAD_FACTORY JVMTI_STRESS_AGENT \ MAX_MEM RUN_PROBLEM_LISTS RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT \ - AOT_JDK $(CUSTOM_JTREG_SINGLE_KEYWORDS), \ + AOT_JDK MANUAL $(CUSTOM_JTREG_SINGLE_KEYWORDS), \ STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \ EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \ $(CUSTOM_JTREG_STRING_KEYWORDS), \ @@ -913,6 +913,12 @@ define SetupRunJtregTestBody $1_JTREG_BASIC_OPTIONS += -ignore:quiet + ifeq ($$(JTREG_MANUAL), true) + $1_JTREG_BASIC_OPTIONS += -manual + else + $1_JTREG_BASIC_OPTIONS += -automatic + endif + # Make it possible to specify the JIB_DATA_DIR for tests using the # JIB Artifact resolver $1_JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR From f650c58c20482553e3a03373ad76fca4329cd81f Mon Sep 17 00:00:00 2001 From: Matthew Donovan Date: Wed, 19 Nov 2025 18:38:37 -0500 Subject: [PATCH 4/5] tweaked testing doc for clarity --- doc/testing.html | 2 +- doc/testing.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/testing.html b/doc/testing.html index 693ab698a649b..31f4fbd1778c6 100644 --- a/doc/testing.html +++ b/doc/testing.html @@ -536,7 +536,7 @@

REPORT

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

MANUAL

-

Set to true to execute manual tests.

+

Set to true to execute manual tests only.

Gtest keywords

REPEAT

The number of times to repeat the tests diff --git a/doc/testing.md b/doc/testing.md index e2f22a3f4e1c5..ae87271f74ddc 100644 --- a/doc/testing.md +++ b/doc/testing.md @@ -515,7 +515,7 @@ Defaults to `files`. #### MANUAL -Set to `true` to execute manual tests. +Set to `true` to execute manual tests only. ### Gtest keywords From 69b50cb9d4d1ceeba2c857418c631afffe3dc14b Mon Sep 17 00:00:00 2001 From: Matthew Donovan Date: Wed, 19 Nov 2025 18:55:23 -0500 Subject: [PATCH 5/5] removed rogue new line --- doc/testing.md | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/testing.md b/doc/testing.md index ae87271f74ddc..b95f59de9fdac 100644 --- a/doc/testing.md +++ b/doc/testing.md @@ -455,7 +455,6 @@ JTReg keywords sent to JTReg using `-k`. Please be careful in making sure that spaces and special characters (like `!`) are properly quoted. To avoid some issues, the special value `%20` can be used instead of space. - #### EXTRA_PROBLEM_LISTS Use additional problem lists file or files, in addition to the default