# HG changeset patch
# User darcy
# Date 1363972126 25200
# Node ID f4500abff1fd83821d802c2226f6d6b88e1462bc
# Parent  5da12e8a59ba0a2ed3a84d3911a91270db0b9576
7080464: langtools regression test failures when assertions are enabled
Reviewed-by: jjg

diff -r 5da12e8a59ba -r f4500abff1fd test/tools/javac/api/TestJavacTaskScanner.java
--- a/test/tools/javac/api/TestJavacTaskScanner.java	Fri Mar 22 12:44:48 2013 +0000
+++ b/test/tools/javac/api/TestJavacTaskScanner.java	Fri Mar 22 10:08:46 2013 -0700
@@ -179,7 +179,6 @@
 
         @Override
         public Scanner newScanner(CharSequence input, boolean keepDocComments) {
-            assert !keepDocComments;
             if (input instanceof CharBuffer) {
                 return new MyScanner(this, (CharBuffer)input, test);
             } else {
@@ -190,7 +189,6 @@
 
         @Override
         public Scanner newScanner(char[] input, int inputLength, boolean keepDocComments) {
-            assert !keepDocComments;
             return new MyScanner(this, input, inputLength, test);
         }
 
diff -r 5da12e8a59ba -r f4500abff1fd test/tools/javac/diags/MessageFile.java
--- a/test/tools/javac/diags/MessageFile.java	Fri Mar 22 12:44:48 2013 +0000
+++ b/test/tools/javac/diags/MessageFile.java	Fri Mar 22 10:08:46 2013 -0700
@@ -65,7 +65,7 @@
         }
 
         void insertAfter(Line l) {
-            assert prev == null && next == null;
+            assert l.prev == null && l.next == null;
             l.prev = this;
             l.next = next;
             if (next == null)
@@ -82,7 +82,7 @@
         }
 
         void insertBefore(Line l) {
-            assert prev == null && next == null;
+            assert l.prev == null && l.next == null;
             l.prev = prev;
             l.next = this;
             if (prev == null)
diff -r 5da12e8a59ba -r f4500abff1fd test/tools/javac/diags/MessageInfo.java
--- a/test/tools/javac/diags/MessageInfo.java	Fri Mar 22 12:44:48 2013 +0000
+++ b/test/tools/javac/diags/MessageInfo.java	Fri Mar 22 10:08:46 2013 -0700
@@ -409,5 +409,3 @@
     }
 
 }
-
-