NIHVIVO-137 Restore the "skiptests" parameter on the build.
This commit is contained in:
parent
a30c10fa54
commit
c41f94eebe
2 changed files with 6 additions and 3 deletions
|
@ -167,7 +167,7 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
|
||||||
<!-- =================================
|
<!-- =================================
|
||||||
target: test
|
target: test
|
||||||
================================= -->
|
================================= -->
|
||||||
<target name="test" depends="compile" description="--> Run JUnit tests">
|
<target name="test" depends="compile" unless="skiptests" description="--> Run JUnit tests">
|
||||||
<javac srcdir="${webapp.dir}/test"
|
<javac srcdir="${webapp.dir}/test"
|
||||||
destdir="${build.dir}/testclasses"
|
destdir="${build.dir}/testclasses"
|
||||||
debug="true"
|
debug="true"
|
||||||
|
|
|
@ -103,7 +103,10 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
|
||||||
<!-- =================================
|
<!-- =================================
|
||||||
target: test
|
target: test
|
||||||
================================= -->
|
================================= -->
|
||||||
<target name="test" depends="vitroCore.test, productTest" description="--> Run JUnit tests">
|
<target name="test"
|
||||||
|
depends="vitroCore.test, productTest"
|
||||||
|
unless="skiptests"
|
||||||
|
description="--> Run JUnit tests">
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<!-- =================================
|
<!-- =================================
|
||||||
|
@ -152,7 +155,7 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
|
||||||
<!-- - - - - - - - - - - - - - - - - -
|
<!-- - - - - - - - - - - - - - - - - -
|
||||||
target: productTest
|
target: productTest
|
||||||
- - - - - - - - - - - - - - - - - -->
|
- - - - - - - - - - - - - - - - - -->
|
||||||
<target name="productTest" depends="vitroCore.test" if="product.tests.exist">
|
<target name="productTest" depends="vitroCore.test" if="product.tests.exist" unless="skiptests">
|
||||||
<javac srcdir="${product.test.dir}"
|
<javac srcdir="${product.test.dir}"
|
||||||
destdir="${test.classes.dir}"
|
destdir="${test.classes.dir}"
|
||||||
debug="true"
|
debug="true"
|
||||||
|
|
Loading…
Add table
Reference in a new issue