diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2009-11-20 16:33:34 -0400 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2009-11-20 16:49:19 -0400 |
| commit | 9ca3e0f6fff55aa07bac209f46abd45ca961b07a (patch) | |
| tree | d20c17c28bc6bef4dcdb33a65c239e9d87cc9fed | |
| parent | 76588926992d20c36732b88879a7b4ff5ba1275a (diff) | |
| download | candlepin-9ca3e0f6fff55aa07bac209f46abd45ca961b07a.tar.gz candlepin-9ca3e0f6fff55aa07bac209f46abd45ca961b07a.tar.xz candlepin-9ca3e0f6fff55aa07bac209f46abd45ca961b07a.zip | |
build.xml cleanup.
| -rw-r--r-- | proxy/build.xml | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/proxy/build.xml b/proxy/build.xml index 7d85be9..9add12f 100644 --- a/proxy/build.xml +++ b/proxy/build.xml @@ -237,14 +237,10 @@ Running @{banner} ... description="Compile and pack - no code generation in this step" /> - <target name="test"> - <property name="debug" value=""/> - <antcall target="dotest"/> - </target> - - <target name="dotest" + <target name="test" description="Run the tests (use -Dtestsubsystem=<subsystem> or -Dtestcase=<testcase>)" depends="compile-main,init-tests,invoke-tests-testcase,invoke-tests-subsystem,invoke-tests-all" > + <property name="debug" value=""/> <fail if="junit_test_failure" message="One or more tests failed" /> </target> @@ -441,11 +437,8 @@ Running @{banner} ... </copy> </target> - <target name="setup-tests"> + <target name="init-tests"> <property name="test.bin.dir" value="${build.dir}/classes" /> - </target> - - <target name="init-tests" depends="setup-tests"> <property name="testresults.dir" value="${report.dir}/tests" /> <path id="tests.buildpath" > @@ -506,13 +499,6 @@ Running @{banner} ... reportdir="${testresults.dir}"/> </target> - <target name="unwar-webapp" depends="pack" > - <unjar src="${candlepin.war}" - dest="${build.dir}/webapp/${ant.project.name}" /> - </target> - - <!-- =================== Packaging Tasks ======================= --> - <target name="pack-megajar" depends="compile"> <mkdir dir="${run.lib.dir}" /> <delete file="${megajar.jar}" /> @@ -609,8 +595,8 @@ Running @{banner} ... </exec> </target> - <property name="dir.genhbm" value="build/schemagen/" /> <target name="gen-schema" depends="init-taskdefs" description="Generates database schema from Hibernate annotations."> + <property name="dir.genhbm" value="build/schemagen/" /> <delete dir="${dir.genhbm}" /> <mkdir dir="${dir.genhbm}" /> |