Skip to content

Commit

Permalink
Add FIPS_VARIATION_PROBLEM_LIST_FILE support
Browse files Browse the repository at this point in the history
related: backlog/issues/1529 and adoptium/aqa-tests#5662

Signed-off-by: Lan Xia <[email protected]>
  • Loading branch information
llxia committed Oct 2, 2024
1 parent 4c764cb commit a3ca979
Showing 1 changed file with 18 additions and 1 deletion.
19 changes: 18 additions & 1 deletion src/org/testKitGen/MkGen.java
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,24 @@ private void writeSingleTest(List<String> testsInPlaylist, TestInfo testInfo, Fi
f.write(testTargetName + ": TEST_GROUP=" + testInfo.getLevelStr() + "\n");
f.write(testTargetName + ": TEST_ITERATIONS=" + testInfo.getIterations() + "\n");
f.write(testTargetName + ": AOT_ITERATIONS=" + testInfo.getAotIterations() + "\n");


// Set special openjdk problem list for JVM options that contains FIPS profile
// This feature is ignored if TEST_FLAG contains FIPS
if (arg.getBuildList().contains("openjdk")) {
String jvmOpts = var.getJvmOptions();
String customprofileStr = "-Dsemeru.customprofile=";
if (!arg.getTestFlag().contains("FIPS") && !jvmOpts.isEmpty() && jvmOpts.contains(customprofileStr)) {
String[] splited = jvmOpts.split("\\s+");
for (int i = 0; i < splited.length; i++) {
if (splited[i].contains(customprofileStr)) {
String fipsProfile = splited[i].replace(customprofileStr, "").trim();
f.write(testTargetName + ": FIPS_VARIATION_PROBLEM_LIST_FILE=-exclude:$(Q)$(JTREG_JDK_TEST_DIR)/ProblemList-" + fipsProfile + ".txt$(Q)\n");
break;
}
}
}
}

f.write(testTargetName + ":\n");
f.write(indent + "@echo \"\" | tee -a $(Q)$(TESTOUTPUT)$(D)TestTargetResult$(Q);\n");
f.write(indent
Expand Down

0 comments on commit a3ca979

Please sign in to comment.