[Pkg-owncloud-commits] [php-sabredav] 270/275: Run phpcs with other tests

[David Prévot]

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

taffit pushed a commit to branch master
in repository php-sabredav.

commit f5c9ff1d646f0ba637a06678cff83a8b3cf11779
Author: David Prévot <taffit at debian.org>
Date:   Tue Sep 23 22:34:55 2014 -0400

    Run phpcs with other tests
---
 debian/control       | 2 +-
 debian/rules         | 1 +
 debian/tests/control | 5 ++++-
 debian/tests/phpunit | 4 ----
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 428b292..8afd52e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Thomas Mueller <thomas.mueller at tmit.eu>,
            Paul van Tilburg <paulvt at debian.org>,
            David Prévot <taffit at debian.org>
 Build-Depends: debhelper (>= 8.0.0),
+               php-codesniffer,
                php-sabre-event,
                php-sabre-http,
                php-sabre-vobject (>= 3.2.0),
@@ -18,7 +19,6 @@ Standards-Version: 3.9.5
 Homepage: http://sabre.io/dav/
 Vcs-Git: git://anonscm.debian.org/pkg-owncloud/php-sabredav.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/php-sabredav.git
-XS-Testsuite: autopkgtest
 
 Package: php-sabre-dav
 Architecture: all
diff --git a/debian/rules b/debian/rules
index aef6451..c870fb7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 	cd tests && phpunit
+	phpcs -p --standard=tests/phpcs/ruleset.xml lib
 else
 	@echo "** tests disabled"
 endif
diff --git a/debian/tests/control b/debian/tests/control
index eb9858b..f221d01 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,6 @@
-Tests: phpunit
+Test-Command: phpcs -p --standard=tests/phpcs/ruleset.xml /usr/share/php/Sabre/*DAV*
+Depends: @, php-codesniffer
+
+Test-Command: quilt pop -f && cd tests && phpunit
 Restrictions: rw-build-tree
 Depends: @, php-symfony-classloader, php5-curl, php5-sqlite, phpunit, quilt
diff --git a/debian/tests/phpunit b/debian/tests/phpunit
deleted file mode 100755
index fcaf159..0000000
--- a/debian/tests/phpunit
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh
-quilt pop -f
-cd tests
-phpunit

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git