diff options
| author | erikj <none@none> | 2013-08-19 12:30:48 +0200 |
|---|---|---|
| committer | erikj <none@none> | 2013-08-19 12:30:48 +0200 |
| commit | f6690b0c23843420f1ee5beb06adae717ae23803 (patch) | |
| tree | 2cc98184a1a68b4f5852ba344f555a879fd985e6 /test/tools | |
| parent | d9dfc0810e0cf03df3a3205cd3dbe9d30a19e5b2 (diff) | |
| download | jdk8u_jdk-f6690b0c23843420f1ee5beb06adae717ae23803.tar.gz | |
8022719: tools/launcher/RunpathTest.java fails after 8012146
Reviewed-by: chegar
Diffstat (limited to 'test/tools')
| -rw-r--r-- | test/tools/launcher/RunpathTest.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/test/tools/launcher/RunpathTest.java b/test/tools/launcher/RunpathTest.java index 631be16d97..675d7630db 100644 --- a/test/tools/launcher/RunpathTest.java +++ b/test/tools/launcher/RunpathTest.java @@ -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 @@ public class RunpathTest extends TestHelper { 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); } } |