8250750: JDK-8247515 fix for OSX pc_to_symbol() lookup fails with some symbols

8249150: SA core file tests sometimes time out on OSX with "java.io.IOException: App waiting timeout"

Reviewed-by: sspitsyn, amenkov
This commit is contained in:
Chris Plummer 2020-08-03 17:38:22 -07:00
parent d12fdfa3b7
commit 54bed60bfe
3 changed files with 4 additions and 3 deletions
test
hotspot/jtreg/serviceability/sa
lib/jdk/test/lib/apps

@ -45,7 +45,7 @@ import jtreg.SkippedException;
* @summary Test clhsdb pmap command on a core file
* @requires vm.hasSA
* @library /test/lib
* @run main/othervm ClhsdbPmap true
* @run main/othervm/timeout=240 ClhsdbPmap true
*/
public class ClhsdbPmap {

@ -45,7 +45,7 @@ import jtreg.SkippedException;
* @summary Test clhsdb pstack command on a core file
* @requires vm.hasSA
* @library /test/lib
* @run main/othervm ClhsdbPstack true
* @run main/othervm/timeout=240 ClhsdbPstack true
*/
public class ClhsdbPstack {

@ -92,6 +92,7 @@ public class LingeredApp {
protected Process appProcess;
protected OutputBuffer output;
protected static final int appWaitTime = 100;
protected static final int appCoreWaitTime = 240;
protected final String lockFileName;
protected boolean forceCrash = false; // set true to force a crash and core file
@ -291,7 +292,7 @@ public class LingeredApp {
* Waits for the application to start with the default timeout.
*/
public void waitAppReady() throws IOException {
waitAppReady(appWaitTime);
waitAppReady(forceCrash ? appCoreWaitTime : appWaitTime);
}
/**