changeset 10262:50bdb9577b27

8022719: tools/launcher/RunpathTest.java fails after 8012146 Reviewed-by: chegar
author erikj
date Mon, 19 Aug 2013 12:30:48 +0200
parents 3f85c96eafcc
children 0f279113c95a
files test/tools/launcher/RunpathTest.java
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/test/tools/launcher/RunpathTest.java	Wed Aug 14 15:25:16 2013 +0800
+++ b/test/tools/launcher/RunpathTest.java	Mon Aug 19 12:30:48 2013 +0200
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7190813
+ * @bug 7190813, 8022719
  * @summary Check for extended  RPATHs on *nixes
  * @compile -XDignore.symbol.file RunpathTest.java
  * @run main RunpathTest
@@ -65,12 +65,10 @@
 
     void testRpath() {
         if (isDualMode && is64Bit) {
-            String expectedRpath = ".*RPATH.*\\$ORIGIN/../../lib/" + getJreArch()
-                    + ":\\$ORIGIN/../../jre/lib/" + getJreArch() + ".*";
+            String expectedRpath = ".*RPATH.*\\$ORIGIN/../../lib/" + getJreArch() + ".*";
             elfCheck(java64Cmd, expectedRpath);
         } else {
-            String expectedRpath = ".*RPATH.*\\$ORIGIN/../lib/" + getJreArch()
-                    + ":\\$ORIGIN/../jre/lib/" + getJreArch() + ".*";
+            String expectedRpath = ".*RPATH.*\\$ORIGIN/../lib/" + getJreArch() + ".*";
             elfCheck(javaCmd, expectedRpath);
         }
     }