[Pkg-owncloud-commits] [php-sabredav] 01/03: Use php5 to run tests

[David Prévot]

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

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

commit f8481658149b1b3c7527f12a6e0c025e83f536d4
Author: David Prévot <taffit at debian.org>
Date:   Wed Mar 23 14:03:57 2016 -0400

    Use php5 to run tests
    
    This package is obviously not ready for PHP 7.0
---
 debian/control       | 1 +
 debian/rules         | 2 +-
 debian/tests/control | 2 +-
 debian/tests/phpunit | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index bb7a887..7db0a3a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: David Prévot <taffit at debian.org>
 Build-Depends: debhelper (>= 8.0.0),
                help2man,
                php-sabre-vobject (>= 2.1.7),
+               php5-cli,
                php5-curl,
                php5-sqlite,
                phpab,
diff --git a/debian/rules b/debian/rules
index d30d0f6..c50b659 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ override_dh_auto_clean:
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-	phpunit --configuration tests/phpunit.xml
+	php5 /usr/bin/phpunit --configuration tests/phpunit.xml
 else
 	@echo "** tests disabled"
 endif
diff --git a/debian/tests/control b/debian/tests/control
index 08b747a..b0346fc 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: phpunit
 Restrictions: rw-build-tree
-Depends: @, patch, php5-curl, php5-sqlite, phpunit
+Depends: @, patch, php5-cli, php5-curl, php5-sqlite, phpunit
diff --git a/debian/tests/phpunit b/debian/tests/phpunit
index f6c532e..bcf9ffe 100755
--- a/debian/tests/phpunit
+++ b/debian/tests/phpunit
@@ -1,6 +1,6 @@
 #! /bin/sh
 patch -p1 < debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
-phpunit --configuration tests/phpunit.xml
+php5 /usr/bin/phpunit --configuration tests/phpunit.xml
 exit=$?
 patch -Rp1 < debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
 exit $exit

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