Merge
authorchegar
Mon, 07 Oct 2013 11:32:48 +0100
changeset 22320 d66c8815bebc
parent 20852 d09138f48ac1 (diff)
parent 22319 8fbc2b703ae5 (current diff)
child 22321 37f8c8b6ef7a
Merge
--- a/jdk/test/tools/launcher/RunpathTest.java	Fri Oct 04 19:23:02 2013 +0400
+++ b/jdk/test/tools/launcher/RunpathTest.java	Mon Oct 07 11:32:48 2013 +0100
@@ -64,8 +64,8 @@
     }
 
     void testRpath() {
-        String expectedRpath = ".*RPATH.*\\$ORIGIN/../../lib/" + getJreArch() + ".*";
-        elfCheck(java64Cmd, expectedRpath);
+        String expectedRpath = ".*RPATH.*\\$ORIGIN/../lib/" + getJreArch() + ".*";
+        elfCheck(javaCmd, expectedRpath);
     }
 
     public static void main(String... args) throws Exception {