Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8166837: [TESTBUG] Fix tests on Linux/s390x
authorgoetz
Mon, 31 Oct 2016 14:13:03 +0100
changeset 42675 179cd7a090cd
parent 42106 90fc3dc00723
child 42676 36fa143f8de8
8166837: [TESTBUG] Fix tests on Linux/s390x Reviewed-by: simonis
jdk/test/java/awt/JAWT/JAWT.sh file | annotate | diff | comparison | revisions
jdk/test/sun/tools/jhsdb/BasicLauncherTest.java file | annotate | diff | comparison | revisions
jdk/test/sun/tools/jhsdb/HeapDumpTest.java file | annotate | diff | comparison | revisions
jdk/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java file | annotate | diff | comparison | revisions 
--- a/jdk/test/java/awt/JAWT/JAWT.sh	Thu Nov 03 12:04:40 2016 +0530
+++ b/jdk/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/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java	Thu Nov 03 12:04:40 2016 +0530
+++ b/jdk/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/jdk/test/sun/tools/jhsdb/HeapDumpTest.java	Thu Nov 03 12:04:40 2016 +0530
+++ b/jdk/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/jdk/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java	Thu Nov 03 12:04:40 2016 +0530
+++ b/jdk/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
jdk-sandbox