# HG changeset patch # User sundar # Date 1376307481 -19800 # Node ID 1576facafb621076f8c0d27fb94d33544debe11d # Parent d97df8f5945d80776161c9435da0ba3e1d6e3151 8022615: [nightly] Two nashorn print tests fail in nightly builds on Windows Reviewed-by: lagergren, jlaskey diff -r d97df8f5945d -r 1576facafb62 nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java --- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java Mon Aug 12 13:31:43 2013 +0200 +++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java Mon Aug 12 17:08:01 2013 +0530 @@ -1235,7 +1235,8 @@ fail(t.getMessage()); } - assertEquals(sw.toString(), "hello\n"); + // dos2unix - fix line endings if running on windows + assertEquals(sw.toString().replaceAll("\r", ""), "hello\n"); } @Test @@ -1252,6 +1253,7 @@ fail(t.getMessage()); } - assertEquals(sw.toString(), "34 true hello\n"); + // dos2unix - fix line endings if running on windows + assertEquals(sw.toString().replaceAll("\r", ""), "34 true hello\n"); } }