8344036: Tests tools/jlink/runtimeImage fail on AIX after JDK-8311302
Reviewed-by: sgehwolf
This commit is contained in:
parent
235973615f
commit
cc8bd63741
@ -40,7 +40,7 @@ import tests.Helper;
|
||||
* jdk.jlink/jdk.tools.jimage
|
||||
* @build tests.* jdk.test.lib.process.OutputAnalyzer
|
||||
* jdk.test.lib.process.ProcessTools
|
||||
* @run main/othervm -Xmx1g AddOptionsTest
|
||||
* @run main/othervm -Xmx1400m AddOptionsTest
|
||||
*/
|
||||
public class AddOptionsTest extends AbstractLinkableRuntimeTest {
|
||||
|
||||
|
@ -41,7 +41,7 @@ import tests.Helper;
|
||||
* jdk.jlink/jdk.tools.jimage
|
||||
* @build tests.* jdk.test.lib.process.OutputAnalyzer
|
||||
* jdk.test.lib.process.ProcessTools
|
||||
* @run main/othervm -Xmx1g BasicJlinkMissingJavaBase
|
||||
* @run main/othervm -Xmx1400m BasicJlinkMissingJavaBase
|
||||
*/
|
||||
public class BasicJlinkMissingJavaBase extends AbstractLinkableRuntimeTest {
|
||||
|
||||
|
@ -39,7 +39,7 @@ import tests.Helper;
|
||||
* jdk.jlink/jdk.tools.jimage
|
||||
* @build tests.* jdk.test.lib.process.OutputAnalyzer
|
||||
* jdk.test.lib.process.ProcessTools
|
||||
* @run main/othervm -Xmx1g BasicJlinkTest false
|
||||
* @run main/othervm -Xmx1400m BasicJlinkTest false
|
||||
*/
|
||||
public class BasicJlinkTest extends AbstractLinkableRuntimeTest {
|
||||
|
||||
|
@ -39,7 +39,7 @@ import tests.Helper;
|
||||
* jdk.jlink/jdk.tools.jimage
|
||||
* @build tests.* jdk.test.lib.process.OutputAnalyzer
|
||||
* jdk.test.lib.process.ProcessTools
|
||||
* @run main/othervm -Xmx1g CustomModuleJlinkTest
|
||||
* @run main/othervm -Xmx1400m CustomModuleJlinkTest
|
||||
*/
|
||||
public class CustomModuleJlinkTest extends AbstractLinkableRuntimeTest {
|
||||
|
||||
|
@ -39,7 +39,7 @@ import tests.Helper;
|
||||
* jdk.jlink/jdk.tools.jimage
|
||||
* @build tests.* jdk.test.lib.process.OutputAnalyzer
|
||||
* jdk.test.lib.process.ProcessTools
|
||||
* @run main/othervm -Xmx1g GenerateJLIClassesTest
|
||||
* @run main/othervm -Xmx1400m GenerateJLIClassesTest
|
||||
*/
|
||||
public class GenerateJLIClassesTest extends AbstractLinkableRuntimeTest {
|
||||
|
||||
|
@ -40,7 +40,7 @@ import tests.Helper;
|
||||
* jdk.jlink/jdk.tools.jimage
|
||||
* @build tests.* jdk.test.lib.process.OutputAnalyzer
|
||||
* jdk.test.lib.process.ProcessTools
|
||||
* @run main/othervm -Xmx1g JavaSEReproducibleTest
|
||||
* @run main/othervm -Xmx1400m JavaSEReproducibleTest
|
||||
*/
|
||||
public class JavaSEReproducibleTest extends AbstractLinkableRuntimeTest {
|
||||
|
||||
|
@ -41,7 +41,7 @@ import tests.Helper;
|
||||
* jdk.jlink/jdk.tools.jimage
|
||||
* @build tests.* jdk.test.lib.process.OutputAnalyzer
|
||||
* jdk.test.lib.process.ProcessTools
|
||||
* @run main/othervm -Xmx1g KeepPackagedModulesFailTest
|
||||
* @run main/othervm -Xmx1400m KeepPackagedModulesFailTest
|
||||
*/
|
||||
public class KeepPackagedModulesFailTest extends AbstractLinkableRuntimeTest {
|
||||
|
||||
|
@ -40,7 +40,7 @@ import tests.Helper;
|
||||
* jdk.jlink/jdk.tools.jimage
|
||||
* @build tests.* jdk.test.lib.process.OutputAnalyzer
|
||||
* jdk.test.lib.process.ProcessTools
|
||||
* @run main/othervm -Xmx1g ModifiedFilesExitTest
|
||||
* @run main/othervm -Xmx1400m ModifiedFilesExitTest
|
||||
*/
|
||||
public class ModifiedFilesExitTest extends ModifiedFilesTest {
|
||||
|
||||
|
@ -39,7 +39,7 @@ import tests.Helper;
|
||||
* jdk.jlink/jdk.tools.jimage
|
||||
* @build tests.* jdk.test.lib.process.OutputAnalyzer
|
||||
* jdk.test.lib.process.ProcessTools
|
||||
* @run main/othervm -Xmx1g ModifiedFilesWarningTest
|
||||
* @run main/othervm -Xmx1400m ModifiedFilesWarningTest
|
||||
*/
|
||||
public class ModifiedFilesWarningTest extends ModifiedFilesTest {
|
||||
|
||||
|
@ -40,7 +40,7 @@ import tests.Helper;
|
||||
* jdk.jlink/jdk.tools.jimage
|
||||
* @build tests.* jdk.test.lib.process.OutputAnalyzer
|
||||
* jdk.test.lib.process.ProcessTools
|
||||
* @run main/othervm -Xmx1g MultiHopTest
|
||||
* @run main/othervm -Xmx1400m MultiHopTest
|
||||
*/
|
||||
public class MultiHopTest extends AbstractLinkableRuntimeTest {
|
||||
|
||||
|
@ -49,7 +49,7 @@ import tests.JImageGenerator;
|
||||
* jdk.jlink/jdk.tools.jimage
|
||||
* @build tests.* jdk.test.lib.process.OutputAnalyzer
|
||||
* jdk.test.lib.process.ProcessTools
|
||||
* @run main/othervm -Xmx1g PackagedModulesVsRuntimeImageLinkTest
|
||||
* @run main/othervm/timeout=1200 -Xmx1400m PackagedModulesVsRuntimeImageLinkTest
|
||||
*/
|
||||
public class PackagedModulesVsRuntimeImageLinkTest extends AbstractLinkableRuntimeTest {
|
||||
|
||||
@ -76,6 +76,7 @@ public class PackagedModulesVsRuntimeImageLinkTest extends AbstractLinkableRunti
|
||||
.output(helper.createNewImageDir("java-se-jmodfull"))
|
||||
.addMods("java.se").call().assertSuccess();
|
||||
|
||||
System.out.println("Now comparing jmod-less and jmod-full) images");
|
||||
compareRecursively(javaSEruntimeLink, javaSEJmodFull);
|
||||
}
|
||||
|
||||
|
@ -42,7 +42,7 @@ import tests.Helper;
|
||||
* jdk.jlink/jdk.tools.jimage
|
||||
* @build tests.* jdk.test.lib.process.OutputAnalyzer
|
||||
* jdk.test.lib.process.ProcessTools
|
||||
* @run main/othervm -Xmx1g PatchedJDKModuleJlinkTest
|
||||
* @run main/othervm -Xmx1400m PatchedJDKModuleJlinkTest
|
||||
*/
|
||||
public class PatchedJDKModuleJlinkTest extends AbstractLinkableRuntimeTest {
|
||||
|
||||
|
@ -41,7 +41,7 @@ import tests.JImageValidator;
|
||||
* jdk.jlink/jdk.tools.jimage
|
||||
* @build tests.* jdk.test.lib.process.OutputAnalyzer
|
||||
* jdk.test.lib.process.ProcessTools
|
||||
* @run main/othervm -Xmx1g SystemModulesTest
|
||||
* @run main/othervm -Xmx1400m SystemModulesTest
|
||||
*/
|
||||
public class SystemModulesTest extends AbstractLinkableRuntimeTest {
|
||||
|
||||
|
@ -42,7 +42,7 @@ import tests.JImageValidator;
|
||||
* jdk.jlink/jdk.tools.jimage
|
||||
* @build tests.* jdk.test.lib.process.OutputAnalyzer
|
||||
* jdk.test.lib.process.ProcessTools
|
||||
* @run main/othervm -Xmx1g SystemModulesTest2
|
||||
* @run main/othervm -Xmx1400m SystemModulesTest2
|
||||
*/
|
||||
public class SystemModulesTest2 extends AbstractLinkableRuntimeTest {
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user