1.1 --- a/samples/messagedigest/build.xml Sat Jun 14 09:52:26 2008 +0200
1.2 +++ b/samples/messagedigest/build.xml Sat Jun 14 09:52:26 2008 +0200
1.3 @@ -9,28 +9,30 @@
1.4 <param name="version" value="new-api"/>
1.5 </antcall>
1.6 <antcall target="-build-one">
1.7 - <param name="version" value="new-spi"/>
1.8 + <param name="version" value="bridge"/>
1.9 <param name="cp" value="build/new-api/classes"/>
1.10 </antcall>
1.11 - <antcall target="-build-one">
1.12 - <param name="version" value="bridge"/>
1.13 - <param name="cp" value="build/new-api/classes:build/new-spi/classes"/>
1.14 - </antcall>
1.15
1.16 <antcall target="-build-one">
1.17 <param name="version" value="test"/>
1.18 - <param name="cp" value="build/new-api/classes:build/new-spi/classes:${junit.jar}"/>
1.19 + <param name="cp" value="build/new-api/classes:${junit.jar}"/>
1.20 </antcall>
1.21 </target>
1.22
1.23 - <target name="test" depends="build">
1.24 + <target name="test">
1.25 + <antcall target="-do-test">
1.26 + <param name="nodebug" value="true"/>
1.27 + </antcall>
1.28 + </target>
1.29 +
1.30 + <target name="-do-test" depends="build">
1.31 <echo level="info" message="Running the tests with bridge enabled. This should succeeds."/>
1.32 <antcall target="-run-one">
1.33 - <param name="test.cp" value="build/new-api/classes:build/new-spi/classes:build/bridge/classes"/>
1.34 + <param name="test.cp" value="build/new-api/classes:build/bridge/classes"/>
1.35 </antcall>
1.36 <echo level="info" message="Running the tests without bridge module. This should fail."/>
1.37 <antcall target="-run-one">
1.38 - <param name="test.cp" value="build/new-api/classes:build/new-spi/classes"/>
1.39 + <param name="test.cp" value="build/new-api/classes"/>
1.40 </antcall>
1.41 </target>
1.42
1.43 @@ -41,13 +43,25 @@
1.44
1.45 <property name="junit.jar" location="../libs/dist/junit-4.4.jar"/>
1.46 </target>
1.47 +
1.48 + <target name="-debug-one" if="netbeans.home" unless="nodebug">
1.49 + <nbjpdastart addressproperty="jpda.address" name="MessageDigest and Bridges" transport="dt_socket" >
1.50 + <sourcepath path="src-new-api:src-bridge:src-test:build/test/classes"/>
1.51 + <classpath path="build/new-api/classes:build/bridge/classes:build/test/classes"/>
1.52 + </nbjpdastart>
1.53 + <property name="debug1" value="-Xdebug"/>
1.54 + <property name="debug2" value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
1.55 + </target>
1.56
1.57 - <target name="-run-one">
1.58 + <target name="-run-one" depends="-debug-one">
1.59 + <property name="debug1" value="-Dn1"/>
1.60 + <property name="debug2" value="-Dn2"/>
1.61 + <property name="include" value="**/*Test"/>
1.62 <mkdir dir="build/testresults"/>
1.63 <junit dir="build/test/classes" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
1.64 <batchtest todir="build/testresults">
1.65 <fileset dir="build/test/classes">
1.66 - <filename name="**/*Test.class"/>
1.67 + <filename name="${include}.class"/>
1.68 </fileset>
1.69 </batchtest>
1.70 <classpath>
1.71 @@ -57,6 +71,8 @@
1.72 </classpath>
1.73 <formatter type="brief" usefile="false"/>
1.74 <formatter type="xml"/>
1.75 + <jvmarg value="${debug1}"/>
1.76 + <jvmarg value="${debug2}"/>
1.77 </junit>
1.78 </target>
1.79
1.80 @@ -70,6 +86,7 @@
1.81 destdir="build/${version}/classes"
1.82 source="1.5" target="1.5"
1.83 classpath="${cp}"
1.84 + debug="true" debuglevel="lines,vars,source"
1.85 />
1.86 <copy todir="build/${version}/classes">
1.87 <fileset dir="src-${version}">