From 19608b393dd4d547f19d797350d5308555bc250c Mon Sep 17 00:00:00 2001 From: Volker Simonis Date: Thu, 28 Jun 2018 09:06:54 +0200 Subject: [PATCH] 8205916: [test] Fix jdk/tools/launcher/RunpathTest to handle both, RPATH and RUNPATH Reviewed-by: martin, erikj --- test/jdk/tools/launcher/RunpathTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/jdk/tools/launcher/RunpathTest.java b/test/jdk/tools/launcher/RunpathTest.java index a4af2d7562..8f761e13bf 100644 --- a/test/jdk/tools/launcher/RunpathTest.java +++ b/test/jdk/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.*"; + String expectedRpath = ".*R(UN)?PATH.*\\$ORIGIN/../lib.*"; elfCheck(javaCmd, expectedRpath); }