Skip to content

Commit 548e95a

Browse files
committedJun 14, 2024
8330702: Update failure handler to don't generate Error message if cores actions are empty
Reviewed-by: sspitsyn
1 parent dae0bda commit 548e95a

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed
 

‎test/failure_handler/src/share/classes/jdk/test/failurehandler/action/ActionSet.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -104,8 +104,11 @@ private List<PatternAction> getPatternActions(PrintWriter log,
104104

105105
private String[] getTools(PrintWriter writer, Properties p, String key) {
106106
String value = p.getProperty(key);
107-
if (value == null || value.isEmpty()) {
108-
writer.printf("ERROR: '%s' property is empty%n", key);
107+
if (value == null) {
108+
writer.printf("ERROR: '%s' property is not set%n", key);
109+
return new String[]{};
110+
}
111+
if (value.isEmpty()) {
109112
return new String[]{};
110113
}
111114
return value.split(" ");

‎test/failure_handler/src/share/conf/windows.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,8 @@ native.stack.params.repeat=6
5959
native.core.app=cdb
6060
native.core.args=-c ".dump /mA core.%p;qd" -p %p
6161
native.core.params.timeout=600000
62+
63+
cores=
6264
################################################################################
6365
# environment info to gather
6466
################################################################################

0 commit comments

Comments
 (0)