changeset 48441:c674ff28c69d

8194287: tools/launcher/RunpathTest.java fails with java.lang.NullPointerException 8194286: tools/launcher/FXLauncherTest.java fails with java.lang.UnsatisfiedLinkError Reviewed-by: rriggs
author ksrini
date Fri, 12 Jan 2018 10:05:00 -0800
parents 30243cf1503e
children b95b08f3e1a8 0d3b030b3eb7
files test/jdk/tools/launcher/FXLauncherTest.java test/jdk/tools/launcher/RunpathTest.java
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/test/jdk/tools/launcher/FXLauncherTest.java	Fri Jan 12 11:41:32 2018 -0800
+++ b/test/jdk/tools/launcher/FXLauncherTest.java	Fri Jan 12 10:05:00 2018 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -29,7 +29,7 @@
  * jfx app class, a main-class for the manifest, a bogus one and none.
  * All should execute except the incorrect fx app class entries.
  * @run main/othervm FXLauncherTest
- * @key intermittent
+ * @key intermittent headful
  */
 import java.io.File;
 import java.io.IOException;
--- a/test/jdk/tools/launcher/RunpathTest.java	Fri Jan 12 11:41:32 2018 -0800
+++ b/test/jdk/tools/launcher/RunpathTest.java	Fri Jan 12 10:05:00 2018 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -71,6 +71,10 @@
     public static void main(String... args) throws Exception {
         if (isSolaris || isLinux) {
             RunpathTest rp = new RunpathTest();
+            if (rp.elfreaderCmd == null) {
+                System.err.println("Warning: test passes vacuously");
+                return;
+            }
             rp.testRpath();
         }
     }