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

8247592: refactor test/jdk/tools/launcher/Test7029048.java

Browse Source 
Reviewed-by: mchung
This commit is contained in:
Aleksei Voitylov 2020-07-23 09:43:55 -07:00 committed by Mandy Chung
parent 1f63603288
commit 8b87402a44
1 changed files with 38 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
test/jdk/tools/launcher/Test7029048.java
View File

@ -41,9 +41,6 @@ import java.util.Map;
public class Test7029048 extends TestHelper {
static int passes = 0;
static int errors = 0;
private static final String LIBJVM = ExecutionEnvironment.LIBJVM;
private static final String LD_LIBRARY_PATH =
ExecutionEnvironment.LD_LIBRARY_PATH;
@ -62,8 +59,6 @@ public class Test7029048 extends TestHelper {
private static final File dstClientDir = new File(dstLibDir, "client");
private static final File dstClientLibjvm = new File(dstClientDir, LIBJVM);
private static final Map<String, String> env = new HashMap<>();
static String getValue(String name, List<String> in) {
for (String x : in) {
String[] s = x.split("=");
@ -74,8 +69,10 @@ public class Test7029048 extends TestHelper {
return null;
}
static void run(Map<String, String> env,
int nLLPComponents, String caseID) {
static boolean run(int nLLPComponents, File variantDir, String caseID) {
Map<String, String> env = new HashMap<>();
env.put(LD_LIBRARY_PATH, variantDir.getAbsolutePath());
env.put(ExecutionEnvironment.JLDEBUG_KEY, "true");
List<String> cmdsList = new ArrayList<>();
cmdsList.add(javaCmd);
@ -85,10 +82,18 @@ public class Test7029048 extends TestHelper {
String[] cmds = new String[cmdsList.size()];
TestResult tr = doExec(env, cmdsList.toArray(cmds));
System.out.println(tr);
analyze(tr, nLLPComponents, caseID);
int len = getLLPComponents(tr);
if (len == nLLPComponents) {
System.out.printf("Test7029048 OK %s%n", caseID);
return true;
} else {
System.out.printf("Test7029048 FAIL %s: expected %d but got %d%n",
caseID, nLLPComponents, len);
return false;
}
}
static void analyze(TestResult tr, int nLLPComponents, String caseID) {
static int getLLPComponents(TestResult tr) {
String envValue = getValue(LD_LIBRARY_PATH, tr.testOutput);
/*
* the envValue can never be null, since the test code should always
@ -97,18 +102,12 @@ public class Test7029048 extends TestHelper {
if (envValue == null) {
throw new RuntimeException("NPE, likely a program crash ??");
}
int len = (envValue.equals("null")
? 0 : envValue.split(File.pathSeparator).length);
if (len == nLLPComponents) {
System.out.println(caseID + ": OK");
passes++;
} else {
System.out.println("FAIL: test7029048, " + caseID);
System.out.println(" expected " + nLLPComponents
+ " but got " + len);
System.out.println(envValue);
errors++;
if (envValue.equals("null")) {
return 0;
}
return envValue.split(File.pathSeparator).length;
}
/*
@ -130,8 +129,9 @@ public class Test7029048 extends TestHelper {
/*
* test for 7029048
*/
static void test7029048() throws IOException {
static boolean runTest() throws IOException {
String desc = null;
boolean pass = true;
for (TestCase v : TestCase.values()) {
switch (v) {
case LIBJVM:
@ -156,8 +156,7 @@ public class Test7029048 extends TestHelper {
desc = "LD_LIBRARY_PATH should not be set (no libjvm.so)";
if (TestHelper.isAIX) {
System.out.println("Skipping test case \"" + desc +
"\" because the Aix launcher adds the paths in any case.");
printSkipMessage(desc);
continue;
}
break;
@ -167,8 +166,7 @@ public class Test7029048 extends TestHelper {
}
desc = "LD_LIBRARY_PATH should not be set (no directory)";
if (TestHelper.isAIX) {
System.out.println("Skipping test case \"" + desc +
"\" because the Aix launcher adds the paths in any case.");
printSkipMessage(desc);
continue;
}
break;
@ -176,25 +174,27 @@ public class Test7029048 extends TestHelper {
throw new RuntimeException("unknown case");
}
// Add one to account for our setting
int nLLPComponents = v.value + 1;
/*
* Case 1: set the server path
*/
env.clear();
env.put(LD_LIBRARY_PATH, dstServerDir.getAbsolutePath());
run(env,
v.value + 1, // Add one to account for our setting
"Case 1: " + desc);
boolean pass1 = run(nLLPComponents, dstServerDir, "Case 1: " + desc);
/*
* Case 2: repeat with client path
*/
env.clear();
env.put(LD_LIBRARY_PATH, dstClientDir.getAbsolutePath());
run(env,
v.value + 1, // Add one to account for our setting
"Case 2: " + desc);
boolean pass2 = run(nLLPComponents, dstClientDir, "Case 2: " + desc);
pass &= pass1 && pass2;
}
return;
return pass;
}
private static void printSkipMessage(String description) {
System.out.printf("Skipping test case '%s' because the Aix launcher" +
" adds the paths in any case.%n", description);
}
public static void main(String... args) throws Exception {
@ -209,16 +209,8 @@ public class Test7029048 extends TestHelper {
// create our test jar first
ExecutionEnvironment.createTestJar();
// run the tests
test7029048();
if (errors > 0) {
throw new Exception("Test7029048: FAIL: with "
+ errors + " errors and passes " + passes);
} else if (isLinux && passes < 6) {
throw new Exception("Test7029048: FAIL: " +
"all tests did not run, expected " + 6 + " got " + passes);
} else {
System.out.println("Test7029048: PASS " + passes);
if (!runTest()) {
throw new Exception("Test7029048 fails");
}
}
}