[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 31a40fc6ecc413ac4d7c2c74fcac21b4767d457a

Roland Mas lolando at fusionforge.org
Mon Dec 15 11:51:54 CET 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, Branch_5_3 has been updated
       via  31a40fc6ecc413ac4d7c2c74fcac21b4767d457a (commit)
      from  d9dc226373ad5661ad733c2cc75baac7c555765f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 31a40fc6ecc413ac4d7c2c74fcac21b4767d457a
Author: Roland Mas <lolando at debian.org>
Date:   Mon Dec 15 11:51:43 2014 +0100

    Install PHPUnit using the current method (the PEAR repository is going
    away, and there's no PHPUnit in EPEL7)

diff --git a/tests/scripts/fusionforge-build-and-test-rpm.sh b/tests/scripts/fusionforge-build-and-test-rpm.sh
index 1d7e94a..4524c53 100755
--- a/tests/scripts/fusionforge-build-and-test-rpm.sh
+++ b/tests/scripts/fusionforge-build-and-test-rpm.sh
@@ -48,7 +48,18 @@ case $VM in
     centos5|centos6)
 	setup_epel_repo $@
 	ssh root@$HOST "yum -y --enablerepo=epel install cronolog"
-	ssh root@$HOST "yum -y --enablerepo=epel install php-phpunit-PHPUnit-Selenium"
+	;;
+esac
+
+case $VM in
+    centos5)
+	ssh root@$HOST "yum -y wget"
+	wget https://phar.phpunit.de/phpunit.phar
+	chmod +x phpunit.phar
+	mv phpunit.phar /usr/local/bin/phpunit
+	;;
+    centos6)
+	ssh root@$HOST "yum -y --enablerepo=epel install php-pear-PHPUnit php-phpunit-PHPUnit-Selenium"
 	;;
 esac
 
diff --git a/tests/scripts/fusionforge-build-and-test-src-cos.sh b/tests/scripts/fusionforge-build-and-test-src-cos.sh
index 2957472..27e54f5 100755
--- a/tests/scripts/fusionforge-build-and-test-src-cos.sh
+++ b/tests/scripts/fusionforge-build-and-test-src-cos.sh
@@ -34,7 +34,18 @@ case $VM in
     centos5|centos6)
 	setup_epel_repo $@
 	ssh root@$HOST "yum -y --enablerepo=epel install cronolog"
-	ssh root@$HOST "yum -y --enablerepo=epel install php-phpunit-PHPUnit-Selenium"
+	;;
+esac
+
+case $VM in
+    centos5)
+	ssh root@$HOST "yum -y wget"
+	wget https://phar.phpunit.de/phpunit.phar
+	chmod +x phpunit.phar
+	mv phpunit.phar /usr/local/bin/phpunit
+	;;
+    centos6)
+	ssh root@$HOST "yum -y --enablerepo=epel install php-pear-PHPUnit php-phpunit-PHPUnit-Selenium"
 	;;
 esac
 

-----------------------------------------------------------------------

Summary of changes:
 tests/scripts/fusionforge-build-and-test-rpm.sh     |   13 ++++++++++++-
 tests/scripts/fusionforge-build-and-test-src-cos.sh |   13 ++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list