Skip to content
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.

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

Support jck multi testcases or sub folders #5091

Merged
merged 1 commit into from
Feb 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions jck/compiler.api/playlist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(GEN_JTB_GENERIC) testsuite=COMPILER tests=$(JCKCOMPILER_CUSTOM_TARGET) isCustomTarget="isCustomTarget"; \
<command>$(GEN_JTB_GENERIC) testsuite=COMPILER tests="$(JCKCOMPILER_CUSTOM_TARGET)" isCustomTarget="isCustomTarget"; \
$(EXEC_COMPILER_TEST); \
$(TEST_STATUS); \
$(GEN_SUMMARY_GENERIC) testsuite=COMPILER tests=$(JCKCOMPILER_CUSTOM_TARGET) isCustomTarget="isCustomTarget"
$(GEN_SUMMARY_GENERIC) testsuite=COMPILER tests="$(JCKCOMPILER_CUSTOM_TARGET)" isCustomTarget="isCustomTarget"
</command>
<levels>
<level>extended</level>
Expand Down
4 changes: 2 additions & 2 deletions jck/devtools.java2schema/playlist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(GEN_JTB_GENERIC) testsuite=DEVTOOLS tests=$(JCKDEVTOOLS_CUSTOM_TARGET) isCustomTarget="isCustomTarget"; \
<command>$(GEN_JTB_GENERIC) testsuite=DEVTOOLS tests="$(JCKDEVTOOLS_CUSTOM_TARGET)" isCustomTarget="isCustomTarget"; \
$(EXEC_DEVTOOLS_TEST); \
$(TEST_STATUS); \
$(GEN_SUMMARY_GENERIC) testsuite=DEVTOOLS tests=$(JCKDEVTOOLS_CUSTOM_TARGET) isCustomTarget="isCustomTarget"
$(GEN_SUMMARY_GENERIC) testsuite=DEVTOOLS tests="$(JCKDEVTOOLS_CUSTOM_TARGET)" isCustomTarget="isCustomTarget"
</command>
<levels>
<level>extended</level>
Expand Down
2 changes: 1 addition & 1 deletion jck/jtrunner/JavatestUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public static void main(String args[]) throws Exception {

// We only load testArgs with key,value pairs that are needed by the JavatestUtil
if (essentialParameters.contains(key)) {
// This is a special case for JCK where we may supply multiple sub-folders to run
// This is a special case to supply multiple sub-folders separating by semicolon( another option is directively supply with double quoted multiple sub-folders separating by space.
if(value.contains(";")) {
value = value.trim().replace("\n", "").replace("\r", "");
String [] tests = value.split(";");
Expand Down
4 changes: 2 additions & 2 deletions jck/runtime.api/playlist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(GEN_JTB_GENERIC) testsuite=RUNTIME tests=$(JCKRUNTIME_CUSTOM_TARGET) isCustomTarget="isCustomTarget"; \
<command>$(GEN_JTB_GENERIC) testsuite=RUNTIME tests="$(JCKRUNTIME_CUSTOM_TARGET)" isCustomTarget="isCustomTarget"; \
$(EXEC_RUNTIME_TEST); \
$(TEST_STATUS); \
$(GEN_SUMMARY_GENERIC) testsuite=RUNTIME tests=$(JCKRUNTIME_CUSTOM_TARGET) isCustomTarget="isCustomTarget"
$(GEN_SUMMARY_GENERIC) testsuite=RUNTIME tests="$(JCKRUNTIME_CUSTOM_TARGET)" isCustomTarget="isCustomTarget"
</command>
<levels>
<level>extended</level>
Expand Down