Skip to content

Made JTREG_JAR declared once #688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Made JTREG_JAR declared once #688

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46e5481
Made JTREG_JAR declared once
judovana Apr 1, 2025
c7f3d40
Using CUSTOM_JTREG_HOME and CUSTOM_JTREG_JAR
judovana Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions settings.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,21 @@ endif

TESTNG=$(LIB_DIR)$(D)testng.jar$(P)$(LIB_DIR)$(D)jcommander.jar
RESOURCES_DIR=$(JVM_TEST_ROOT)$(D)TestConfig$(D)resources
ifdef CUSTOM_JTREG_HOME
JTREG_HOME=$(CUSTOM_JTREG_HOME)
$(ECHO) "Custom jtreg home declared: $(JTREG_HOME)"
else
JTREG_HOME=$(TEST_RESROOT)$(D)jtreg
$(ECHO) "Using standart jtreg home: $(JTREG_HOME)"
endif
ifdef CUSTOM_JTREG_JAR
JTREG_JAR=$(CUSTOM_JTREG_JAR)
$(ECHO) "Custom jtreg jar declared: $(JTREG_JAR)"
else
JTREG_JAR=$(JTREG_HOME)$(D)lib$(D)jtreg.jar
$(ECHO) "Using standart jtreg jar: $(JTREG_JAR)"
endif

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The https://github.com/adoptium/aqa-tests/blob/12b61e0d12e477077d8a5ccfb250329d00b47cc1/openjdk/openjdk.mk may be better place, but am not sure


#######################################
# cmdlinetester jars
Expand Down