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

test/tools/launcher/RunpathTest.java

@@ -57,14 +57,14 @@ public class RunpathTest extends TestHelper {
         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);
     }