This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat7.

commit 4fadd0b61587dca03c4e6f90355619395a52625c
Author: Emmanuel Bourg <[email protected]>
Date:   Wed May 27 09:21:58 2015 +0200

    Call ant test in override_dh_auto_test
---
 debian/rules | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index 41a7fd3..fa03f0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,18 +33,22 @@ ANT_INVOKE := ant $(ANT_ARGS) -propertyfile 
debian/ant.properties
        dh $@
 
 override_dh_auto_build:
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-       mkdir -p webapps/examples/WEB-INF/lib
-       cp /usr/share/java/jstl1.1.jar webapps/examples/WEB-INF/lib/jstl.jar
-       cp /usr/share/java/standard.jar 
webapps/examples/WEB-INF/lib/standard.jar
-       $(ANT_INVOKE) extras-jmx-remote deploy test
-else
        $(ANT_INVOKE) extras-jmx-remote deploy
-endif
+
+       # Build the Javadoc for the Servlet, JSP, EL and WebSocket APIs
        javadoc -subpackages "javax.servlet" -d "output/api" \
                -sourcepath "java" -author -version -breakiterator -notimestamp 
\
                -windowtitle "Tomcat API Documentation" -doctitle "Tomcat API" \
                -bottom "Copyright &#169; 2000-2013 Apache Software Foundation. 
All Rights Reserved."
+
+override_dh_auto_test:
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+       mkdir -p webapps/examples/WEB-INF/lib
+       cp /usr/share/java/jstl1.1.jar webapps/examples/WEB-INF/lib/jstl.jar
+       cp /usr/share/java/standard.jar 
webapps/examples/WEB-INF/lib/standard.jar
+       $(ANT_INVOKE) test
+endif
+
 override_dh_auto_clean:
        dh_auto_clean
        -$(ANT_INVOKE) clean

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/tomcat7.git

_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to