stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8159925: sun/tools/jps/TestJpsJar.java still fails after fix for JDK-8153278

Browse Source 
Check user.dir property

Reviewed-by: dcubed, sspitsyn
This commit is contained in:
Dmitry Samersoff 2016-07-08 17:36:34 +03:00
parent 193316529d
commit 95e2d58dc1
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jdk/test/sun/tools/jps/JpsBase.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -59,7 +59,17 @@ public final class JpsBase {
return JpsBase.class.getName();
}
private static boolean userDirSanityCheck(String fullProcessName) {
String userDir = System.getProperty("user.dir");
if (!fullProcessName.startsWith(userDir)) {
System.err.printf("Test skipped. user.dir '%s' is not a prefix of '%s'\n", userDir, fullProcessName);
return false;
}
return true;
}
public static void main(String[] args) throws Exception {
System.out.printf("INFO: user.dir: '%s''\n", System.getProperty("user.dir"));
long pid = ProcessTools.getProcessId();
List<List<JpsHelper.JpsArg>> combinations = JpsHelper.JpsArg.generateCombinations();
@ -85,8 +95,12 @@ public final class JpsBase {
// 30673 /tmp/jtreg/jtreg-workdir/scratch/JpsBase.jar ...
isFull = true;
String fullProcessName = getFullProcessName();
pattern = "^" + pid + "\\s+" + replaceSpecialChars(fullProcessName) + ".*";
output.shouldMatch(pattern);
// Skip the test if user.dir is not a prefix of the current path
// It's possible if the test is run from symlinked dir or windows alias drive
if (userDirSanityCheck(fullProcessName)) {
pattern = "^" + pid + "\\s+" + replaceSpecialChars(fullProcessName) + ".*";
output.shouldMatch(pattern);
}
break;
case m:
// If '-m' is specified output should contain the arguments passed to the main method:

3
jdk/test/sun/tools/jps/TestJpsJar.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -52,6 +52,7 @@ public class TestJpsJar {
cmd.addAll(JpsHelper.getVmArgs());
cmd.add("-Dtest.jdk=" + testJdk);
cmd.add("-Dtest.src=" + testSrc);
cmd.add("-Duser.dir=" + System.getProperty("user.dir"));
cmd.add("-jar");
cmd.add(jar.getAbsolutePath());
cmd.add("monkey");