Skip to content

Add feature to specify customJvmOpts=XXXX in APPLICATION_OPTIONS#6004

Merged
sophia-guo merged 5 commits intoadoptium:masterfrom
andrew-m-leonard:jck_jvmoptions
Mar 6, 2025
Merged

Add feature to specify customJvmOpts=XXXX in APPLICATION_OPTIONS#6004
sophia-guo merged 5 commits intoadoptium:masterfrom
andrew-m-leonard:jck_jvmoptions

Conversation

@andrew-m-leonard
Copy link
Copy Markdown
Contributor

@andrew-m-leonard andrew-m-leonard commented Mar 5, 2025

Add feature to specify customJvmOpts=XXXX in APPLICATION_OPTIONS for jck.mk to pass to jck tests and agent JVM processes:

  • APPLICATION_OPTIONS=X&&Y&&Z get processed by jck.mk to pass JVM options "X Y Z" to both the test execution and agent JVM processes
  • Also fix runtime.api playlist.xml jckruntime_custom target to use EXEC_RUNTIME_TEST_WITH_AGENT, as a number of custom test re-runs require the AGENT

temirin-compliance runs successfully tested with APPLICATION_OPTIONS empty, to test jck.mk logic does not affect other tests
temirin-compliance runs successfully tested with customJvmOpts=-Djava.net.preferIPv4Stack=true

Signed-off-by: Andrew Leonard <anleonar@redhat.com>
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
</variations>
<command>$(GEN_JTB_GENERIC) testsuite=RUNTIME tests="$(JCKRUNTIME_CUSTOM_TARGET)" isCustomTarget="isCustomTarget"; \
$(EXEC_RUNTIME_TEST); \
$(EXEC_RUNTIME_TEST_WITH_AGENT); \
Copy link
Copy Markdown
Contributor

@sophia-guo sophia-guo Mar 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this change work for all jck-runtime-** targets? It seems only three targets are using this $(EXEC_RUNTIME_TEST_WITH_AGENT) and all others are using $(EXEC_RUNTIME_TEST)?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sophia-guo yes, whether it actually needs the agent does not matter it will just start then stop the agent process..
I tested one that was just EXEC_RUNTIME_TEST here: https://ci.eclipse.org/temurin-compliance/job/Grinder/4839/console
worked fine

@sophia-guo sophia-guo merged commit 846261d into adoptium:master Mar 6, 2025
3 checks passed
@sophia-guo
Copy link
Copy Markdown
Contributor

FYI @llxia

judovana pushed a commit to judovana/aqa-tests that referenced this pull request Mar 11, 2025
…ptium#6004)

* Add support for customJvmOpts for test and agent in APPLICATION_OPTIONS

Signed-off-by: Andrew Leonard <anleonar@redhat.com>

* Add support for customJvmOpts for test and agent in APPLICATION_OPTIONS

Signed-off-by: Andrew Leonard <anleonar@redhat.com>

* Add support for customJvmOpts for test and agent in APPLICATION_OPTIONS

Signed-off-by: Andrew Leonard <anleonar@redhat.com>

* Add support for customJvmOpts for test and agent in APPLICATION_OPTIONS

Signed-off-by: Andrew Leonard <anleonar@redhat.com>

* Add support for customJvmOpts for test and agent in APPLICATION_OPTIONS

Signed-off-by: Andrew Leonard <anleonar@redhat.com>

---------

Signed-off-by: Andrew Leonard <anleonar@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants