archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-19 02:24:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8156470: [JITtester] EOL on Windows

Browse source 
Reviewed-by: kvn
This commit is contained in:
Dmitrij Pochepko 2016-05-25 16:22:31 +03:00
parent fdf9e5a63e
commit ac5718b306
2 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/JitTesterDriver.java
View file

@ -33,6 +33,7 @@ import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.Arrays; import java.util.Arrays;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -52,14 +53,16 @@ public class JitTesterDriver {
throw new Error("Unexpected exception on test jvm start :" + e, e); throw new Error("Unexpected exception on test jvm start :" + e, e);
} }
Pattern splitOut = Pattern.compile("\\n"); // tests use \n only in stdout
Pattern splitErr = Pattern.compile("\\r?\\n"); // can handle both \r\n and \n
Path testDir = Paths.get(Utils.TEST_SRC); Path testDir = Paths.get(Utils.TEST_SRC);
String goldOut = formatOutput(streamGoldFile(testDir, args[0], "out"), s -> true); String goldOut = formatOutput(streamGoldFile(testDir, args[0], "out"), s -> true);
Asserts.assertEQ(oa.getStdout(), goldOut, "Actual stdout isn't equal to golden one"); String anlzOut = formatOutput(Arrays.stream(splitOut.split(oa.getStdout())), s -> true);
Asserts.assertEQ(anlzOut, goldOut, "Actual stdout isn't equal to golden one");
// TODO: add a comment why we skip such lines // TODO: add a comment why we skip such lines
Predicate<String> notStartWhitespaces = s -> !(s.startsWith("\t") || s.startsWith(" ")); Predicate<String> notStartWhitespaces = s -> !(s.startsWith("\t") || s.startsWith(" "));
String goldErr = formatOutput(streamGoldFile(testDir, args[0], "err"), notStartWhitespaces); String goldErr = formatOutput(streamGoldFile(testDir, args[0], "err"), notStartWhitespaces);
String anlzErr = formatOutput(Arrays.stream(oa.getStderr().split(Utils.NEW_LINE)), String anlzErr = formatOutput(Arrays.stream(splitErr.split(oa.getStderr())),
notStartWhitespaces); notStartWhitespaces);
Asserts.assertEQ(anlzErr, goldErr, "Actual stderr isn't equal to golden one"); Asserts.assertEQ(anlzErr, goldErr, "Actual stderr isn't equal to golden one");

19
hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/FixedTrees.java
View file

@ -37,7 +37,6 @@ import jdk.test.lib.jittester.Nothing;
import jdk.test.lib.jittester.Operator; import jdk.test.lib.jittester.Operator;
import jdk.test.lib.jittester.OperatorKind; import jdk.test.lib.jittester.OperatorKind;
import jdk.test.lib.jittester.PrintVariables; import jdk.test.lib.jittester.PrintVariables;
import jdk.test.lib.jittester.ProductionFailedException;
import jdk.test.lib.jittester.Statement; import jdk.test.lib.jittester.Statement;
import jdk.test.lib.jittester.StaticMemberVariable; import jdk.test.lib.jittester.StaticMemberVariable;
import jdk.test.lib.jittester.Symbol; import jdk.test.lib.jittester.Symbol;
@ -171,22 +170,22 @@ public class FixedTrees {
TryCatchBlock tryCatch1 = new TryCatchBlock(tryNode, nothing, catchBlocks1, 3); TryCatchBlock tryCatch1 = new TryCatchBlock(tryNode, nothing, catchBlocks1, 3);
TypeKlass printStreamKlass = new TypeKlass("java.io.PrintStream"); TypeKlass printStreamKlass = new TypeKlass("java.io.PrintStream");
TypeKlass systemKlass = new TypeKlass("java.lang.System"); TypeKlass systemKlass = new TypeKlass("java.lang.System");
FunctionInfo systemOutPrintlnInfo = new FunctionInfo("println", printStreamKlass, FunctionInfo systemOutPrintInfo = new FunctionInfo("print", printStreamKlass,
TypeList.VOID, 0, FunctionInfo.PUBLIC, TypeList.VOID, 0, FunctionInfo.PUBLIC,
new VariableInfo("this", owner, printStreamKlass, VariableInfo.LOCAL | VariableInfo.INITIALIZED), new VariableInfo("this", owner, printStreamKlass, VariableInfo.LOCAL | VariableInfo.INITIALIZED),
new VariableInfo("t", owner, TypeList.OBJECT, new VariableInfo("t", owner, TypeList.OBJECT,
VariableInfo.LOCAL | VariableInfo.INITIALIZED)); VariableInfo.LOCAL | VariableInfo.INITIALIZED));
List<IRNode> printlnArgs = new ArrayList<>(); List<IRNode> printArgs = new ArrayList<>();
VariableInfo systemOutInfo = new VariableInfo("out", systemKlass, printStreamKlass, VariableInfo systemOutInfo = new VariableInfo("out", systemKlass, printStreamKlass,
VariableInfo.STATIC | VariableInfo.PUBLIC); VariableInfo.STATIC | VariableInfo.PUBLIC);
StaticMemberVariable systemOutVar = new StaticMemberVariable(owner, systemOutInfo); StaticMemberVariable systemOutVar = new StaticMemberVariable(owner, systemOutInfo);
printlnArgs.add(systemOutVar); printArgs.add(systemOutVar);
printlnArgs.add(tVar); printArgs.add(tVar);
Function println = new Function(printStreamKlass, systemOutPrintlnInfo, printlnArgs); Function print = new Function(printStreamKlass, systemOutPrintInfo, printArgs);
ArrayList<IRNode> printlnBlockContent = new ArrayList<>(); ArrayList<IRNode> printBlockContent = new ArrayList<>();
printlnBlockContent.add(new Statement(println, true)); printBlockContent.add(new Statement(print, true));
Block printlnBlock = new Block(owner, TypeList.VOID, printlnBlockContent, 3); Block printBlock = new Block(owner, TypeList.VOID, printBlockContent, 3);
TryCatchBlock tryCatch2 = new TryCatchBlock(printlnBlock, nothing, catchBlocks2, 3); TryCatchBlock tryCatch2 = new TryCatchBlock(printBlock, nothing, catchBlocks2, 3);
List<IRNode> mainTryCatchBlockContent = new ArrayList<>(); List<IRNode> mainTryCatchBlockContent = new ArrayList<>();
mainTryCatchBlockContent.add(new Statement(testInit, true)); mainTryCatchBlockContent.add(new Statement(testInit, true));