stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8316946: jtreg failure handler pages are mislabelling the jcmd/thread/dump_to_file results.

Browse Source 
Reviewed-by: dholmes
This commit is contained in:
Jaikiran Pai 2023-09-28 05:42:26 +00:00
parent 384d2ea6d1
commit 42924ed4e5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/failure_handler/src/share/classes/jdk/test/failurehandler/action/PatternAction.java
View File

@ -36,6 +36,7 @@ public class PatternAction implements Action {
private final SimpleAction action; private final SimpleAction action;
private final String[] originalArgs; private final String[] originalArgs;
private final String originalSuccessArtifacts;
public PatternAction(String id, Properties properties) public PatternAction(String id, Properties properties)
throws InvalidValueException { throws InvalidValueException {
@ -47,6 +48,11 @@ public class PatternAction implements Action {
action = new SimpleAction(name != null ? ("pattern." + name) : "pattern", id, properties); action = new SimpleAction(name != null ? ("pattern." + name) : "pattern", id, properties);
ValueHandler.apply(this, properties, id); ValueHandler.apply(this, properties, id);
originalArgs = action.args.clone(); originalArgs = action.args.clone();
ActionParameters params = action.getParameters();
// just like the "args" the "successArtifacts" param can also contain pattern that
// this PatternAction will (sometimes repeatedly) replace, so we keep track of
// the original (un-replaced text)
originalSuccessArtifacts = params == null ? null : params.successArtifacts;
} }
public ProcessBuilder prepareProcess(HtmlSection section, public ProcessBuilder prepareProcess(HtmlSection section,
@ -63,9 +69,9 @@ public class PatternAction implements Action {
args[i] = args[i].replace("%java", helper.findApp("java").getAbsolutePath()); args[i] = args[i].replace("%java", helper.findApp("java").getAbsolutePath());
} }
// replace occurrences of the pattern in the "successArtifacts" param // replace occurrences of the pattern in the "successArtifacts" param
String successArtifacts = action.getParameters().successArtifacts; if (originalSuccessArtifacts != null) {
if (successArtifacts != null) { action.getParameters().successArtifacts = originalSuccessArtifacts.replaceAll(pattern,
action.getParameters().successArtifacts = successArtifacts.replaceAll(pattern, value); value);
} }
return action.prepareProcess(section.getWriter(), helper); return action.prepareProcess(section.getWriter(), helper);
} }