8194287: tools/launcher/RunpathTest.java fails with java.lang.NullPointerException

8194286: tools/launcher/FXLauncherTest.java fails with java.lang.UnsatisfiedLinkError

Reviewed-by: rriggs
This commit is contained in:
Kumar Srinivasan 2018-01-12 10:05:00 -08:00
parent 372bc7a281
commit 653c0a825e
2 changed files with 7 additions and 3 deletions

@ -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;

@ -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 class RunpathTest extends TestHelper {
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();
}
}