8161348: Several tools/jlink tests failed in "-Xcomp" mode due to time out
Reviewed-by: alanb
--- a/test/jdk/tools/jlink/DefaultProviderTest.java Tue Jan 23 06:52:05 2018 -0500
+++ b/test/jdk/tools/jlink/DefaultProviderTest.java Wed Jan 24 16:59:08 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -40,6 +40,7 @@
* @test
* @summary Test plugins enabled by default
* @author Jean-Francois Denise
+ * @requires vm.compMode != "Xcomp"
* @library ../lib
* @modules java.base/jdk.internal.jimage
* jdk.jdeps/com.sun.tools.classfile
--- a/test/jdk/tools/jlink/JLinkPluginsTest.java Tue Jan 23 06:52:05 2018 -0500
+++ b/test/jdk/tools/jlink/JLinkPluginsTest.java Wed Jan 24 16:59:08 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -33,6 +33,7 @@
* @test
* @summary Test image creation
* @author Jean-Francois Denise
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
* @library ../lib
* @modules java.base/jdk.internal.jimage
* jdk.jdeps/com.sun.tools.classfile
--- a/test/jdk/tools/jlink/JLinkTest.java Tue Jan 23 06:52:05 2018 -0500
+++ b/test/jdk/tools/jlink/JLinkTest.java Wed Jan 24 16:59:08 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -44,6 +44,7 @@
* @summary Test image creation
* @bug 8189777
* @author Jean-Francois Denise
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
* @library ../lib
* @modules java.base/jdk.internal.jimage
* jdk.jdeps/com.sun.tools.classfile
--- a/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java Tue Jan 23 06:52:05 2018 -0500
+++ b/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java Wed Jan 24 16:59:08 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -43,6 +43,7 @@
* @bug 8152143 8152704 8155649 8165804 8185841 8176841 8190918
* @summary IncludeLocalesPlugin tests
* @author Naoto Sato
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
* @library ../../lib
* @modules java.base/jdk.internal.jimage
* jdk.jdeps/com.sun.tools.classfile