From: Steve L. <st...@us...> - 2004-06-29 16:03:26
|
Update of /cvsroot/smartfrog/core/testharness In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19396/core/testharness Modified Files: build.xml Log Message: -New build file for components -uprated common.xml with much more commonality -removed duplicates from the build.xml files of common.xml users Index: build.xml =================================================================== RCS file: /cvsroot/smartfrog/core/testharness/build.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** build.xml 26 May 2004 16:48:19 -0000 1.22 --- build.xml 29 Jun 2004 16:03:16 -0000 1.23 *************** *** 64,73 **** - <!-- turn on the tests. If you dont want this, set one (or both) to false) in the unit tests--> - <property name="system.tests" value="true" /> - <property name="unit.tests" value="true" /> - - - <!-- ========================================================== --> <!-- Test settings --> --- 64,67 ---- *************** *** 75,88 **** <target name="init" depends="init-common,init-standard-output-dirs,use-smartfrog-tasks"> - <condition property="system.tests.enabled"> - <istrue value="${system.tests}"/> - </condition> - - <condition property="unit.tests.enabled"> - <istrue value="${unit.tests}"/> - </condition> - <echo>system.tests.enabled=${system.tests.enabled}</echo> - <echo>unit.tests.enabled=${unit.tests.enabled}</echo> <!-- the compile time path --> --- 69,73 ---- *************** *** 106,110 **** <!-- compile the tests --> <!-- ========================================================== --> ! <target name="compile-tests" depends="verify-smartfrog,init,init-common"> <depend srcdir="${test.src.dir}" --- 91,95 ---- <!-- compile the tests --> <!-- ========================================================== --> ! <target name="compile" depends="verify-smartfrog,init,init-common"> <depend srcdir="${test.src.dir}" *************** *** 125,133 **** tests dont depend on it --> <!-- ========================================================== --> ! <target name="compile-RMI" ! depends="verify-smartfrog,init,init-common"> ! <rmic includesfile="rmitargets" base="${test.classes.dir}"> <classpath refid="compile.classpath"/> ! </rmic> </target> --- 110,120 ---- tests dont depend on it --> <!-- ========================================================== --> ! <target name="rmi" ! depends="compile"> ! <sf-rmic includesfile="rmitargets" ! base="${test.classes.dir}" ! verify="true"> <classpath refid="compile.classpath"/> ! </sf-rmic> </target> *************** *** 156,160 **** <!-- run the unit tests tests --> <!-- ========================================================== --> ! <target name="unit-tests" depends="compile-tests" unless="testcase" description="run unit tests"> <sf-junit --- 143,147 ---- <!-- run the unit tests tests --> <!-- ========================================================== --> ! <target name="unit-tests" depends="compile" unless="testcase" description="run unit tests"> <sf-junit *************** *** 187,191 **** --> <!-- ========================================================== --> ! <target name="system-tests" depends="compile-tests,compile-RMI,jar, probe-local-daemon" description="run system tests" if="system.tests.enabled"> --- 174,179 ---- --> <!-- ========================================================== --> ! <target name="system-tests" ! depends="compile,rmi,jar, probe-local-daemon" description="run system tests" if="system.tests.enabled"> *************** *** 234,278 **** </target> - <!-- ========================================================== --> - <!-- generate the reports--> - <!-- ========================================================== --> - <target name="reports" depends="init" - description="generate the test reports" > - <sf-test-report data="${test.data.dir}" - reports="${test.reports.dir}" - failed="test.failed"/> - </target> - - - <!-- ========================================================== --> - <!-- ========================================================== --> - <target name="run-tests" - depends="unit-tests,system-tests" /> - <!-- ========================================================== --> - <!-- public entry point does all tests and the reports --> - <!-- ========================================================== --> - <target name="test" - depends="run-tests,reports" - description="compile and run all the tests" - /> - - <!-- ========================================================== --> - <!-- shortcut for testing --> - <!-- ========================================================== --> - <target name="smartfrog-dist" - depends="init-common" - > - <ant dir="${smartfrog.home}" target="dist" inheritall="false"/> - </target> - - <!-- ========================================================== --> - <!-- shortcut for development --> - <!-- ========================================================== --> - <target name="buildtest" - depends="smartfrog-dist,test" - description="compile the distribution, compile and run all the tests" - /> <!-- ========================================================== --> --- 222,227 ---- *************** *** 280,284 **** <!-- this contains only the tests not the utility classes --> <!-- ========================================================== --> ! <target name="jar" depends="compile-tests" description="creates the jar file for the test cases"> <!-- Create sfTestCases.jar file --> --- 229,233 ---- <!-- this contains only the tests not the utility classes --> <!-- ========================================================== --> ! <target name="jar" depends="compile" description="creates the jar file for the test cases"> <!-- Create sfTestCases.jar file --> *************** *** 292,296 **** includes="**/system/**, **/unit/**" > </jar> ! </target> <!-- ========================================================== --> --- 241,245 ---- includes="**/system/**, **/unit/**" > </jar> ! </target> <!-- ========================================================== --> *************** *** 298,302 **** <!-- this contains only the test utility classes, not the tests --> <!-- ========================================================== --> ! <target name="dist" depends="compile-tests" description="creates the jar file for the testharness"> --- 247,251 ---- <!-- this contains only the test utility classes, not the tests --> <!-- ========================================================== --> ! <target name="dist" depends="compile" description="creates the jar file for the testharness"> *************** *** 308,312 **** basedir="${test.classes.dir}" includes="org/smartfrog/test/*" /> ! </target> </project> --- 257,261 ---- basedir="${test.classes.dir}" includes="org/smartfrog/test/*" /> ! </target> </project> |