Mercurial > hg > openjdk > jdk9 > jdk

changeset 16260:26758f10984a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8166837: [TESTBUG] Fix tests on Linux/s390x Reviewed-by: simonis
author goetz
date Mon, 31 Oct 2016 14:13:03 +0100
parents 21d90fa8d825
children 5a3a34170501
files test/java/awt/JAWT/JAWT.sh test/sun/tools/jhsdb/BasicLauncherTest.java test/sun/tools/jhsdb/HeapDumpTest.java test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java
diffstat 4 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/test/java/awt/JAWT/JAWT.sh	Thu Nov 03 12:04:40 2016 +0530
+++ b/test/java/awt/JAWT/JAWT.sh	Mon Oct 31 14:13:03 2016 +0100
@@ -122,7 +122,7 @@
 
 # Skip unsupported platforms
 case `uname -m` in
-    arm* | ppc* )
+    arm* | ppc* | s390* )
       echo "Test passed. Not supported on current architecture."
       exit 0
       ;;
--- a/test/sun/tools/jhsdb/BasicLauncherTest.java	Thu Nov 03 12:04:40 2016 +0530
+++ b/test/sun/tools/jhsdb/BasicLauncherTest.java	Mon Oct 31 14:13:03 2016 +0100
@@ -44,7 +44,7 @@
 import jdk.testlibrary.OutputAnalyzer;
 import jdk.testlibrary.ProcessTools;
 import jdk.test.lib.apps.LingeredApp;
-import jdk.testlibrary.Platform;
+import jdk.test.lib.Platform;
 
 public class BasicLauncherTest {
 
@@ -230,8 +230,7 @@
                                                        Arrays.asList(toolArgs));
     }
 
-    public static void main(String[] args)
-        throws IOException {
+    public static void main(String[] args) throws Exception {
 
         if (!Platform.shouldSAAttach()) {
             // Silently skip the test if we don't have enough permissions to attach
--- a/test/sun/tools/jhsdb/HeapDumpTest.java	Thu Nov 03 12:04:40 2016 +0530
+++ b/test/sun/tools/jhsdb/HeapDumpTest.java	Mon Oct 31 14:13:03 2016 +0100
@@ -41,7 +41,7 @@
 import jdk.testlibrary.OutputAnalyzer;
 import jdk.testlibrary.ProcessTools;
 import jdk.test.lib.apps.LingeredApp;
-import jdk.testlibrary.Platform;
+import jdk.test.lib.Platform;
 
 public class HeapDumpTest {
 
@@ -109,8 +109,7 @@
         dump.delete();
     }
 
-    public static void main(String[] args)
-        throws IOException {
+    public static void main(String[] args) throws Exception {
 
         if (!Platform.shouldSAAttach()) {
             // Silently skip the test if we don't have enough permissions to attach
--- a/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java	Thu Nov 03 12:04:40 2016 +0530
+++ b/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java	Mon Oct 31 14:13:03 2016 +0100
@@ -30,7 +30,7 @@
 
 import jdk.test.lib.apps.LingeredApp;
 import jdk.testlibrary.Utils;
-import jdk.testlibrary.Platform;
+import jdk.test.lib.Platform;
 
 /*
  * @test