[PATCH] Update RPATH to make loading libjawt possible
Kumar Srinivasan
kumar.x.srinivasan at oracle.COM
Mon Aug 13 14:22:13 UTC 2012
Hi Anthony, Omair.
Here is the patch for the test, this will live in test/tools/launcher,
also I don't have access
to a MacOS system, appreciate if you can add this otherwise I will file
a bug and add
the macosx case later on.
Thanks
Kumar
> Hi Omair and Kumar,
>
> As to me, the fix and the test look good. A few suggestions:
>
> 1. Mac is also a supported platform now, so you need to add the
> "Darwin" option to the "SunOS | Windows_* )" case in the .sh file.
>
> 2. If gcc is not present, this should be considered that the test is
> passed. Systems used for running tests may lack compilers, and this is
> perfectly OK.
>
> Having said that, let's wait and see what test Kumar has to offer.
>
> --
> best regards,
> Anthony
>
> On 08/11/12 00:56, Omair Majid wrote:
>> Hi Anthony,
>>
>> On 08/10/2012 08:29 AM, Anthony Petrov wrote:
>>> Actually, if Omair has a good automatic jtreg test, we would be
>>> happy to
>>> get it checked in with this fix. Could we see a webrev for the test
>>> please?
>>
>> I have uploaded a new webrev that includes a test case too:
>> http://cr.openjdk.java.net/~omajid/webrevs/jawt-link-regression/01/
>>
>> The bug number in the jtreg test is entirely made up. Any thoughts for a
>> better description or alternate locations for the test code?
>>
>> I can only run the test case on Linux, so that's what it's for. It needs
>> gcc to build the native bits. The webrev is against jdk8/awt forest, if
>> it matters.
>>
>> Thanks,
>> Omair
-------------- next part --------------
diff --git a/test/tools/launcher/RunpathTest.java b/test/tools/launcher/RunpathTest.java
new file mode 100644
--- /dev/null
+++ b/test/tools/launcher/RunpathTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2012, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7190813
+ * @summary Check for extended RPATHs on *nixes
+ * @compile -XDignore.symbol.file RunpathTest.java
+ * @run main RunpathTest
+ */
+
+import java.io.File;
+
+public class RunpathTest extends TestHelper {
+
+ final String elfreaderCmd;
+ RunpathTest() {
+ elfreaderCmd = findElfReader();
+ }
+
+ final String findElfReader() {
+ String[] paths = {"/bin", "/sbin", "/usr/bin", "/usr/sbin", "/usr/ccs/bin"};
+ final String cmd = isSolaris ? "elfdump" : "readelf";
+ for (String x : paths) {
+ File p = new File(x);
+ File e = new File(p, cmd);
+ if (e.canExecute()) {
+ return e.getAbsolutePath();
+ }
+ }
+ System.err.println("Warning: no suitable elf reader!");
+ return null;
+ }
+
+ void elfCheck(String javacmd, String expectedRpath) {
+ final TestResult tr = doExec(elfreaderCmd, "-d", javacmd);
+ if (!tr.matches(expectedRpath)) {
+ System.out.println(tr);
+ throw new RuntimeException("FAILED: RPATH strings " +
+ expectedRpath + " not found in " + javaCmd);
+ }
+ System.out.println(javacmd + " contains expected RPATHS");
+ }
+
+ void testRpath() {
+ if (isDualMode && is64Bit) {
+ String expectedRpath = ".*RPATH.*\\$ORIGIN/../../lib/" + getJreArch()
+ + ":\\$ORIGIN/../../jre/lib/" + getJreArch() + ".*";
+ elfCheck(java64Cmd, expectedRpath);
+ } else {
+ String expectedRpath = ".*RPATH.*\\$ORIGIN/../lib/" + getJreArch()
+ + ":\\$ORIGIN/../jre/lib/" + getJreArch() + ".*";
+ elfCheck(javaCmd, expectedRpath);
+ }
+ }
+
+ public static void main(String... args) throws Exception {
+ if (isSolaris || isLinux) {
+ RunpathTest rp = new RunpathTest();
+ rp.testRpath();
+ }
+ }
+}
More information about the build-dev
mailing list