Bug 158205 "NullPointerException when weaving with bootstrap agent" (tidy up)

diff --git a/tests/bugs150/pr121385/ant.xml b/tests/bugs150/pr121385/ant.xml
deleted file mode 100644 (file)
index 994778c..0000000
--- a/tests/bugs150/pr121385/ant.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- ajc-ant script, not to be used from Ant commant line - see AntSpec -->
-<project name="pr120473">
-
-    <!-- using this we can debug the forked VM -->
-    <property
-        name="jdwp"
-        value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
-
-    <target name="compile:javac">
-        <!-- compile only javac compilable stuff, exclude the one that needs other dependencies -->
-        <javac destdir="${aj.sandbox}" classpathref="aj.path"
-            srcdir="${basedir}"
-            includes="ataspectj/*"
-            excludes="ataspectj/UnweavableTest.java"
-            debug="true">
-        </javac>
-    </target>
-
-    <target name="ltw">
-        <java fork="yes" classname="ataspectj.AllLTWTests" failonerror="yes">
-            <classpath refid="aj.path"/>
-            <!-- use META-INF/aop.xml style -->
-            <classpath path="ataspectj/pathentry"/>
-            <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
-<!--            <jvmarg line="${jdwp}"/>-->
-        </java>
-    </target>
-
-    <target name="ConcreteAsepectTest">
-       <copy file="aop.xml" todir="${aj.sandbox}/META-INF">
-       </copy>
-        <java fork="yes" classname="Hello" failonerror="yes">
-            <classpath refid="aj.path"/>
-            <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
-<!--           
-            <jvmarg value="-Daj5.def=aop.xml"/>
-            <jvmarg value="-Daj.weaving.verbose=true"/>
--->            
-<!--            <jvmarg line="${jdwp}"/>            -->
-        </java>
-    </target>
-
-</project>

diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 2bb9a6ae2edb6c47b8ba305256653f32cc6db4af..3e62052c712780946251b284fb4ca2f58148fdfd 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -6207,9 +6207,6 @@
            <line text="around end!"/>
        </stdout>
      </run>
-<!--     
-     <ant file="ant.xml" target="ConcreteAsepectTest" verbose="true"/>
--->
    </ajc-test>
 
 </suite>
\ No newline at end of file