gunnar: server Makefile,1.109,1.110
cvs at kolab.org
cvs at kolab.org
Wed Mar 24 18:12:54 CET 2010
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv3167
Modified Files:
Makefile
Log Message:
Reactivate testing and ensure we set a default timezone. That fixes some problems already. kolab/issue3983 (Phpunit testsuite fails on OpenPKG Kolab 2.2.2)
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- Makefile 7 Mar 2010 21:31:03 -0000 1.109
+++ Makefile 24 Mar 2010 17:12:52 -0000 1.110
@@ -165,13 +165,13 @@
CURRENT_SOURCE_RELEASE = http://files.kolab.org/server/release/kolab-server-$(KOLAB_VERSION)/sources/
CURRENT_BINARY_RELEASE = http://files.kolab.org/server/release/kolab-server-$(KOLAB_VERSION)/$(PLATFORM)/
-PHPUNIT=$(HOME)/bin/phpunit
+PHPUNIT=$(KOLABDIR)/bin/phpunit
-PHPUNIT_TESTS=$(HOME)/lib/php/test/Kolab_Server/Horde/Kolab/Server/AllTests.php \
-# $(HOME)/lib/php/test/Kolab_Format/Horde/Kolab/Format/AllTests.php \
-# $(HOME)/lib/php/test/Kolab_Storage/Horde/Kolab/Storage/AllTests.php \
-# $(HOME)/lib/php/test/Kolab_Filter/Horde/Kolab/Filter/AllTests.php \
-# $(HOME)/lib/php/test/Kolab_FreeBusy/Horde/Kolab/FreeBusy/AllTests.php
+PHPUNIT_TESTS=$(KOLABDIR)/lib/php/test/Kolab_Server/Horde/Kolab/Server/AllTests.php \
+ $(KOLABDIR)/lib/php/test/Kolab_Format/Horde/Kolab/Format/AllTests.php \
+ $(KOLABDIR)/lib/php/test/Kolab_Storage/Horde/Kolab/Storage/AllTests.php \
+ $(KOLABDIR)/lib/php/test/Kolab_Filter/Horde/Kolab/Filter/AllTests.php \
+ $(KOLABDIR)/lib/php/test/Kolab_FreeBusy/Horde/Kolab/FreeBusy/AllTests.php
PEAR_H4_CHANNEL_PACKAGES= \
pear-h4/PEAR-PHPUnit-Channel-H4 \
@@ -774,7 +774,7 @@
@for TEST in $(PHPUNIT_TESTS); \
do \
PHPUNIT=''; \
- $(PHPUNIT) -d log_errors=1 -d error_log="/tmp/$${TEST//\//_}-php-errors.log" $$TEST 2>&1 | tee -a /tmp/$${TEST//\//_}-phpunit.log | grep "^OK" > /dev/null || PHPUNIT="FAIL"; \
+ $(PHPUNIT) -d date.timezone="Europe/Berlin" -d log_errors=1 -d error_log="/tmp/$${TEST//\//_}-php-errors.log" $$TEST 2>&1 | tee -a /tmp/$${TEST//\//_}-phpunit.log | grep "^OK" > /dev/null || PHPUNIT="FAIL"; \
if [ -n "$$PHPUNIT" ]; then \
echo; \
echo "FAIL ($$TEST): Some phpunit tests failed!"; \
More information about the commits
mailing list