infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-04 23:48:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

8228650: runtime/SharedArchiveFile/CheckDefaultArchiveFile.java test fails on AIX

Browse Source 
Reviewed-by: mseledtsov
This commit is contained in:
Matthias Baesken 2019-07-26 15:05:24 +02:00
parent 3135a96dc0
commit dde37610c0
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/hotspot/jtreg/runtime/SharedArchiveFile/CheckDefaultArchiveFile.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -48,16 +48,23 @@ public class CheckDefaultArchiveFile {
String vmName = System.getProperty("java.vm.name");
String vmString = vmName + "(" + osArch + ")";
String jsaString = wb.getDefaultArchivePath();
Path jsa = Paths.get(jsaString);
if (Platform.isDefaultCDSArchiveSupported()) {
if (Files.exists(jsa)) {
System.out.println("Passed. " + vmString +
": has default classes.jsa file");
} else {
throw new RuntimeException(vmString + "has no " + jsaString);
System.out.println("classes.jsa location:" + jsaString);
if (jsaString == null) {
if (Platform.isDefaultCDSArchiveSupported()) {
throw new RuntimeException("default CDS archive supported, but classes.jsa path null");
}
} else {
throw new SkippedException("Default CDS archive is not supported");
Path jsa = Paths.get(jsaString);
if (Platform.isDefaultCDSArchiveSupported()) {
if (Files.exists(jsa)) {
System.out.println("Passed. " + vmString +
": has default classes.jsa file");
} else {
throw new RuntimeException(vmString + "has no " + jsaString);
}
} else {
throw new SkippedException("Default CDS archive is not supported");
}
}
}
}