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.

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

Generate test results for jck_custom #5081

Merged
merged 1 commit into from
Feb 20, 2024
Merged

Generate test results for jck_custom #5081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion jck/jtrunner/JavatestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public class JavatestUtil {
private static String secPropsFile;
private static String testFlag;
private static String task;
private static String isCustomTarget = "notCustomTarget";
private static String agentHost;
private static String testJavaForMultiJVMCompTest;
private static String riJavaForMultiJVMCompTest;
Expand Down Expand Up @@ -123,6 +124,7 @@ public class JavatestUtil {
private static final String WORK_DIR = "workdir";
private static final String SPEC = "spec";
private static final String CUSTOM_JTX = "customJtx";
private static final String IS_CUSTOM_TARGET = "isCustomTarget";

public static void main(String args[]) throws Exception {
ArrayList<String> essentialParameters = new ArrayList<String>();
Expand All @@ -144,6 +146,7 @@ public static void main(String args[]) throws Exception {
essentialParameters.add(WORK_DIR);
essentialParameters.add(SPEC);
essentialParameters.add(CUSTOM_JTX);
essentialParameters.add(IS_CUSTOM_TARGET);

for (String arg : args) {
if (arg.contains("=")) {
Expand Down Expand Up @@ -855,7 +858,8 @@ private static boolean generateJTB() throws Exception {

// Only use default initial jtx exclude and disregard the rest of jck exclude lists
// when running a test via jck_custom.
if (task == null || !task.equals("custom")) {

if (testArgs.get(IS_CUSTOM_TARGET) == null) {
fileContent += "set jck.excludeList.customFiles \"" + initialJtxFullPath + " " + defaultJtxFullPath + " " + kflFullPath + " " + customJtx + "\";\n";
} else {
fileContent += "set jck.excludeList.customFiles \"" + initialJtxFullPath + " " + defaultJtxFullPath + " " + kflFullPath + "\";\n";
Expand Down
8 changes: 6 additions & 2 deletions jck/runtime.api/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-->
<!-- jck_custom might need to add extr augument like testsuite, task, otherwise difficult to GEN_JTB_GENERIC GEN_SUMMARY_GENERIC -->
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
<include>../jck.mk</include>
<test>
<testCaseName>jck_custom</testCaseName>
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(JCK_CMD_TEMPLATE) tests=$(JCK_CUSTOM_TARGET) task=custom; \
$(TEST_STATUS)</command>
<command>$(GEN_JTB_GENERIC) tests=$(JCK_CUSTOM_TARGET) isCustomTarget="isCustomTarget"; \
$(EXEC_RUNTIME_TEST); \
$(TEST_STATUS); \
$(GEN_SUMMARY_GENERIC) tests=$(JCK_CUSTOM_TARGET) isCustomTarget="isCustomTarget"
</command>
<levels>
<level>extended</level>
</levels>
Expand Down