Mercurial > hg > icedtea8-forest > jdk

changeset 14063:e880f2d161bf jdk8u222-b01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8205916: [test] Fix jdk/tools/launcher/RunpathTest to handle both, RPATH and RUNPATH Summary: Extend match pattern to handle RUNPATH as well as RPATH. Reviewed-by: martin, erikj
author simonis
date Mon, 29 Apr 2019 21:39:41 +0000
parents 6e82c02bee9f
children 5e1641ac146b 9db1950723f1
files test/tools/launcher/RunpathTest.java
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/test/tools/launcher/RunpathTest.java	Tue Jun 12 09:26:49 2018 -0700
+++ b/test/tools/launcher/RunpathTest.java	Mon Apr 29 21:39:41 2019 +0000
@@ -57,14 +57,14 @@
         final TestResult tr = doExec(elfreaderCmd, "-d", javacmd);
         if (!tr.matches(expectedRpath)) {
             System.out.println(tr);
-            throw new RuntimeException("FAILED: RPATH strings " +
+            throw new RuntimeException("FAILED: RPATH/RUNPATH strings " +
                     expectedRpath + " not found in " + javaCmd);
         }
-        System.out.println(javacmd + " contains expected RPATHS");
+        System.out.println(javacmd + " contains expected RPATHS/RUNPATH");
     }
 
     void testRpath() {
-        String expectedRpath = ".*RPATH.*\\$ORIGIN/../lib/" + getJreArch() + ".*";
+        String expectedRpath = ".*R(UN)?PATH.*\\$ORIGIN/../lib/" + getJreArch() + ".*";
         elfCheck(javaCmd, expectedRpath);
     }