1.1 --- a/test/tools/javap/stackmap/StackmapTest.java Thu Mar 14 01:45:44 2013 -0400 1.2 +++ b/test/tools/javap/stackmap/StackmapTest.java Thu Mar 14 08:30:16 2013 +0000 1.3 @@ -84,10 +84,11 @@ 1.4 new ToolBox.JavaToolArgs() 1.5 .setAllArgs("-v", "Test.class"); 1.6 String out = ToolBox.javap(javapParams); 1.7 - List<String> grepResult = ToolBox.grep("frame_type", out); 1.8 - grepResult.addAll(ToolBox.grep("offset_delta", out)); 1.9 - grepResult.addAll(ToolBox.grep("stack = ", out)); 1.10 - grepResult.addAll(ToolBox.grep("locals = ", out)); 1.11 + List<String> grepResult = ToolBox.grep("frame_type", out, 1.12 + ToolBox.lineSeparator); 1.13 + grepResult.addAll(ToolBox.grep("offset_delta", out, ToolBox.lineSeparator)); 1.14 + grepResult.addAll(ToolBox.grep("stack = ", out, ToolBox.lineSeparator)); 1.15 + grepResult.addAll(ToolBox.grep("locals = ", out, ToolBox.lineSeparator)); 1.16 List<String> goldenList = Arrays.asList(goldenOut.split("\n")); 1.17 1.18 // diff -w "${OUTFILE}" "${TESTSRC}${FS}T6271292.out"