darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2024-12-04 10:43:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

8205916: [test] Fix jdk/tools/launcher/RunpathTest to handle both, RPATH and RUNPATH

Browse Source 
Reviewed-by: martin, erikj
This commit is contained in:
Volker Simonis 2018-06-28 09:06:54 +02:00
parent 258346a5a0
commit 19608b393d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/jdk/tools/launcher/RunpathTest.java
View File

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