Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 81708ef2 编写于 作者: E erikj
浏览文件
操作

8022719: tools/launcher/RunpathTest.java fails after 8012146 

Reviewed-by: chegar
上级 68ec1ae5
显示空白变更内容
内联 并排
Showing with 3 addition and 5 deletion
test/tools/launcher/RunpathTest.java
浏览文件 @ 81708ef2
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 7190813 * @bug 7190813, 8022719
* @summary Check for extended RPATHs on *nixes * @summary Check for extended RPATHs on *nixes
* @compile -XDignore.symbol.file RunpathTest.java * @compile -XDignore.symbol.file RunpathTest.java
* @run main RunpathTest * @run main RunpathTest
...@@ -65,12 +65,10 @@ public class RunpathTest extends TestHelper { ...@@ -65,12 +65,10 @@ public class RunpathTest extends TestHelper {
void testRpath() { void testRpath() {
if (isDualMode && is64Bit) { if (isDualMode && is64Bit) {
String expectedRpath = ".*RPATH.*\\$ORIGIN/../../lib/" + getJreArch() String expectedRpath = ".*RPATH.*\\$ORIGIN/../../lib/" + getJreArch() + ".*";
+ ":\\$ORIGIN/../../jre/lib/" + getJreArch() + ".*";
elfCheck(java64Cmd, expectedRpath); elfCheck(java64Cmd, expectedRpath);
} else { } else {
String expectedRpath = ".*RPATH.*\\$ORIGIN/../lib/" + getJreArch() String expectedRpath = ".*RPATH.*\\$ORIGIN/../lib/" + getJreArch() + ".*";
+ ":\\$ORIGIN/../jre/lib/" + getJreArch() + ".*";
elfCheck(javaCmd, expectedRpath); elfCheck(javaCmd, expectedRpath);
} }
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或