stephan 2003/04/16 06:45:04
Modified: src/targets admin-build.xml test-build.xml Log: Removed dependency of the block-test to the main tests. So shouldn't fail if the main tests fail. Revision Changes Path 1.4 +1 -1 cocoon-2.1/src/targets/admin-build.xml Index: admin-build.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/src/targets/admin-build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- admin-build.xml 9 Apr 2003 14:39:26 -0000 1.3 +++ admin-build.xml 16 Apr 2003 13:45:04 -0000 1.4 @@ -31,7 +31,7 @@ <target name="gump-scratchpad" depends="package-scratchpad"/> <!-- compiles and packages a single block identified by ${block-name} --> - <target name="gump-block" depends="compile-core, compile-deprecated, prepare-blocks, junit-tests"> + <target name="gump-block" depends="compile-core, compile-deprecated, prepare-blocks, compile-tests"> <ant antfile="${build.temp}/blocks-build.xml" inheritAll="true" inheritRefs="false" 1.13 +7 -5 cocoon-2.1/src/targets/test-build.xml Index: test-build.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/src/targets/test-build.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- test-build.xml 14 Apr 2003 13:11:21 -0000 1.12 +++ test-build.xml 16 Apr 2003 13:45:04 -0000 1.13 @@ -3,10 +3,9 @@ <!-- Runs all tests --> <target name="test" depends="junit-tests, anteater-tests, block-tests" description="Runs all tests"/> - <!-- Runs JUnit tests --> - <target name="junit-tests" depends="compile-core, compile-deprecated"> + <target name="compile-tests" depends="compile-core, compile-deprecated"> <mkdir dir="${build.test}"/> - + <!-- Copy test files to build test dir --> <copy todir="${build.test}" filtering="on"> <fileset dir="${test}" excludes="**/*.java"/> @@ -25,7 +24,7 @@ <include name="*.jar"/> </fileset> </path> - + <!-- Compile tests --> <javac srcdir="${test}" destdir="${build.test}" @@ -36,7 +35,10 @@ fork="true"> <classpath refid="test.classpath"/> </javac> + </target> + <!-- Runs JUnit tests --> + <target name="junit-tests" depends="compile-tests"> <junit printsummary="yes" haltonfailure="yes" fork="yes"> <classpath refid="test.classpath"/> <formatter type="plain" usefile="no" /> @@ -69,7 +71,7 @@ </target> <!-- Block tests --> - <target name="block-tests" depends="compile-core, compile-deprecated, prepare-blocks"> + <target name="block-tests" depends="compile-tests, prepare-blocks"> <ant antfile="${build.temp}/blocks-build.xml" inheritAll="true"