8022615: [nightly] Two nashorn print tests fail in nightly builds on Windows

Mon, 12 Aug 2013 17:08:01 +0530

author
sundar
date
Mon, 12 Aug 2013 17:08:01 +0530
changeset 497
821b605c7046
parent 496
03ba1cd734c0
child 498
f2e1673db03b

8022615: [nightly] Two nashorn print tests fail in nightly builds on Windows
Reviewed-by: lagergren, jlaskey

test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java file | annotate | diff | comparison | revisions
     1.1 --- a/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java	Mon Aug 12 13:31:43 2013 +0200
     1.2 +++ b/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java	Mon Aug 12 17:08:01 2013 +0530
     1.3 @@ -1235,7 +1235,8 @@
     1.4              fail(t.getMessage());
     1.5          }
     1.6  
     1.7 -        assertEquals(sw.toString(), "hello\n");
     1.8 +        // dos2unix - fix line endings if running on windows
     1.9 +        assertEquals(sw.toString().replaceAll("\r", ""), "hello\n");
    1.10      }
    1.11  
    1.12      @Test
    1.13 @@ -1252,6 +1253,7 @@
    1.14              fail(t.getMessage());
    1.15          }
    1.16  
    1.17 -        assertEquals(sw.toString(), "34 true hello\n");
    1.18 +        // dos2unix - fix line endings if running on windows
    1.19 +        assertEquals(sw.toString().replaceAll("\r", ""), "34 true hello\n");
    1.20      }
    1.21  }

mercurial