--- a/langtools/test/jdk/jshell/ReplToolTesting.java Fri Apr 08 13:26:38 2016 -0700
+++ b/langtools/test/jdk/jshell/ReplToolTesting.java Sat Apr 09 11:03:48 2016 -0700
@@ -438,7 +438,7 @@
}
setCommandInput(cmd + "\n");
} else {
- assertOutput(getCommandOutput(), out, "command output: " + cmd);
+ assertOutput(getCommandOutput().trim(), out==null? out : out.trim(), "command output: " + cmd);
assertOutput(getCommandErrorOutput(), err, "command error: " + cmd);
assertOutput(getUserOutput(), print, "user output: " + cmd);
assertOutput(getUserErrorOutput(), usererr, "user error: " + cmd);