moved incremental tests from failing (since they now pass)

cleaned out contents of failing that are now in ajcTests

diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index 0dd6157889dfece874ca9cdc8a4ebf2c669bdead..24486d68b2d42dac3ef7f5e93652f07f630304c8 100644 (file)
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -6161,5 +6161,30 @@
         </compile>
         <run class="p1.Main"/>
     </ajc-test>
+    
+
+   <ajc-test dir="incremental/defaultPackage"
+    keywords="incremental-test"
+       title="change sources in default package">
+        <compile 
+               staging="true"
+               options="-incremental" 
+               sourceroots="src"/>
+        <run class="Main"/>
+        <inc-compile tag="20"/>
+        <run class="Main"/>
+    </ajc-test>
+
+   <ajc-test dir="incremental/interPackage"
+    keywords="incremental-test"
+       title="change source">
+        <compile 
+               staging="true"
+               options="-incremental" 
+               sourceroots="src"/>
+        <run class="app.Main"/>
+        <inc-compile tag="20"/>
+        <run class="app.Main"/>
+    </ajc-test>
 
 </suite>

diff --git a/tests/ajcTestsFailing.xml b/tests/ajcTestsFailing.xml
index 4609f86b94bfdbbc7ae238ff7893128e13b34335..50d4ab09007d7b625d36166b55e0027a3dc06c5f 100644 (file)
--- a/tests/ajcTestsFailing.xml
+++ b/tests/ajcTestsFailing.xml
@@ -4,167 +4,4 @@
 <!-- contains valid tests that the compiler has never passed -->
 <suite>
 
-       <!-- either of these tests fail for me when run first -->
-
-   <ajc-test dir="incremental/defaultPackage"
-    keywords="incremental-test"
-       title="change sources in default package">
-        <compile 
-               staging="true"
-               options="-incremental" 
-               sourceroots="src"/>
-        <run class="Main"/>
-        <inc-compile tag="20"/>
-        <run class="Main"/>
-    </ajc-test>
-
-   <ajc-test dir="incremental/interPackage"
-    keywords="incremental-test"
-       title="change source">
-        <compile 
-               staging="true"
-               options="-incremental" 
-               sourceroots="src"/>
-        <run class="app.Main"/>
-        <inc-compile tag="20"/>
-        <run class="app.Main"/>
-    </ajc-test>
-
-       <!-- expected messages the same for these tests. note:
-            - that pointcut-and not supported in message text TODO 
-            - no test on adviceexecution()
-            - only verifying by line number now
-              (not flagging error in filename.  Binary filenames are 
-               listed as, e.g., app.Main.class.  
-               Should get from filename attribute)
-         -->
-
-    <ajc-test dir="new/binaryWarnings/src" pr="37020"
-        title="declare warnings on main">
-        <compile files="aspects/MainWarnings.java,app/Main.java">
-               <message kind="warning" file="app/Main.java"
-                 line="6" text="set(String Main.staticString)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="8" text="set(String Main.s)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="12" text="get(String Main.staticString)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="14" text="set(String Main.staticString)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="16" text="call(Main.new())"/>
-               <message kind="warning" file="app/Main.java"
-                 line="19" text="call(void Main.go(String))"/>
-               <message kind="warning" file="app/Main.java"
-                 line="23" text="execution(Main.new())"/>
-               <message kind="warning" file="app/Main.java"
-                 line="26" text="execution(void Main.go(String))"/>
-               <message kind="warning" file="app/Main.java"
-                 line="29" text="get(String Main.s)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="31" text="set(String Main.s)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="33" text="handler(RuntimeException)"/>            
-               <message kind="warning" file="app/Main.java"
-                 line="35" text="withincode(void Main.go(String))"/>
-               <message kind="warning" file="app/Main.java"
-                 line="42" text="withincode(void Main.stop())"/>
-               <message kind="warning" file="app/Main.java"
-                 line="50" text="preinitialization(app.C.new())"/>
-        </compile>
-        
-        <run class="app.Main"/>
-    </ajc-test>
-
-    <ajc-test dir="new/binaryWarnings/src"  pr="37020"
-       title="declare warnings on binary javac 1.4 classes">
-        <compile files="aspects/MainWarnings.java,../injars/app-javac-1.4.jar">
-               <message kind="warning" file="app/Main.java"
-                 line="6" text="set(String Main.staticString)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="8" text="set(String Main.s)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="12" text="get(String Main.staticString)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="14" text="set(String Main.staticString)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="16" text="call(Main.new())"/>
-               <message kind="warning" file="app/Main.java"
-                 line="19" text="call(void Main.go(String))"/>
-               <message kind="warning" file="app/Main.java"
-                 line="23" text="execution(Main.new())"/>
-               <message kind="warning" file="app/Main.java"
-                 line="26" text="execution(void Main.go(String))"/>
-               <message kind="warning" file="app/Main.java"
-                 line="29" text="get(String Main.s)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="31" text="set(String Main.s)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="33" text="handler(RuntimeException)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="35" text="withincode(void Main.go(String))"/>
-               <message kind="warning" file="app/Main.java"
-                 line="42" text="withincode(void Main.stop())"/>
-               <message kind="warning" file="app/Main.java"
-                 line="50" text="preinitialization(app.C.new())"/>
-        </compile>
-        <run class="app.Main"/>
-    </ajc-test>
-   <ajc-test dir="new/binaryWarnings/src" pr="37023"
-       title="declare warnings on binary ajc 1.1 classes">
-        <compile files="aspects/MainWarnings.java,../injars/app-ajc-1.1.jar">
-               <message kind="warning" file="app/Main.java"
-                 line="6" text="set(String Main.staticString)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="8" text="set(String Main.s)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="12" text="get(String Main.staticString)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="14" text="set(String Main.staticString)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="16" text="call(Main.new())"/>
-               <message kind="warning" file="app/Main.java"
-                 line="19" text="call(void Main.go(String))"/>
-               <message kind="warning" file="app/Main.java"
-                 line="23" text="execution(Main.new())"/>
-               <message kind="warning" file="app/Main.java"
-                 line="26" text="execution(void Main.go(String))"/>
-               <message kind="warning" file="app/Main.java"
-                 line="29" text="get(String Main.s)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="31" text="set(String Main.s)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="33" text="handler(RuntimeException)"/>
-               <message kind="warning" file="app/Main.java"
-                 line="35" text="withincode(void Main.go(String))"/>
-               <message kind="warning" file="app/Main.java"
-                 line="42" text="withincode(void Main.stop())"/>
-               <message kind="warning" file="app/Main.java"
-                 line="50" text="preinitialization(app.C.new())"/>
-                 
-        </compile>
-        <run class="app.Main"/>
-    </ajc-test>
-
-   <ajc-test dir="new/binaryWarnings/src" pr="37020"
-       keywords="knownLimitation"
-       title="declare error on handler/method execution with no code on binary ajc 1.1 classes">
-        <compile files="aspects/MainExecStartLinesErrors.java,../injars/appStartLines-ajc-1.1.jar">
-               <message kind="error" file="app/MainExecStartLines.java"
-                 line="6" text="execution(void MainExecStartLines.main(String[]))"/>
-               <message kind="error" file="app/MainExecStartLines.java"
-                 line="17" text="handler(RuntimeException)"/>            
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="new/binaryWarnings/src" pr="37020"
-       keywords="knownLimitation"
-       title="declare error on handler/method execution with no code on binary javac 1.4 classes">
-        <compile files="aspects/MainExecStartLinesErrors.java,../injars/appStartLines-javac-1.4.jar">
-               <message kind="error" file="app/MainExecStartLines.java"
-                 line="6" text="execution(void MainExecStartLines.main(String[]))"/>
-               <message kind="error" file="app/MainExecStartLines.java"
-                 line="17" text="handler(RuntimeException)"/>            
-        </compile>
-    </ajc-test>
-
 </suite>