AspectJ6: tests changed to be more pleasant to work with when they go wrong

diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml
index 09b3c6d78929028b9f0211bbf3aa401909f903a0..69055af395b91df4ceed05200ebf3cf7d00131b1 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml
@@ -107,13 +107,31 @@
     </ajc-test>
 
     <ajc-test dir="java5/ataspectj" title="AroundInlineMunger">
+      <compile files="ataspectj/AroundInlineMungerTest.java,ataspectj/AroundInlineMungerTestAspects.java" options="-1.5 -Xdev:NoAtAspectJProcessing -Xlint:ignore"/>
+      <run class="ataspectj.AroundInlineMungerTest">
+        <stdout>
+          <line text="AroundInlineMungerTestAspects.Open.aroundCount=3"/>
+          <line text="AroundInlineMungerTestAspects.Open.beforeCount=6"/>
+        </stdout>
+      </run>
+      <!-- 
         <compile files="ataspectj/AroundInlineMungerTest.java,ataspectj/AroundInlineMungerTestAspects.java,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing -Xlint:ignore"/>
         <run class="ataspectj.AroundInlineMungerTest"/>
-    </ajc-test>
+         -->
+     </ajc-test>
 
     <ajc-test dir="java5/ataspectj" title="AroundInlineMunger2">
+      <compile files="ataspectj/AroundInlineMungerTest2.aj,ataspectj/AroundInlineMungerTestAspects2.aj" options="-1.5 -Xlint:ignore"/>
+      <run class="ataspectj.AroundInlineMungerTest2">
+        <stdout>
+          <line text="AroundInlineMungerTestAspects2.Open.aroundCount=3"/>
+          <line text="AroundInlineMungerTestAspects2.Open.beforeCount=6"/>
+        </stdout>
+      </run>
+      <!-- 
         <compile files="ataspectj/AroundInlineMungerTest2.aj,ataspectj/AroundInlineMungerTestAspects2.aj,ataspectj/TestHelper.java" options="-1.5 -Xlint:ignore"/>
         <run class="ataspectj.AroundInlineMungerTest2"/>
+        -->
     </ajc-test>
 
     <ajc-test dir="java5/ataspectj" title="Deow">