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, 6.1 has been updated
via af3efa2070a8d24e41500fda642b2166100749aa (commit)
from cdc15d1414b5ac7e56111852fea50b5d72676e55 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=af3efa2070a8d24e41500fda642b2166100749aa
commit af3efa2070a8d24e41500fda642b2166100749aa
Author: Roland Mas <[email protected]>
Date: Mon Oct 30 20:22:29 2017 +0100
Install Composer stuff into /usr/local/share/php
diff --git a/tests/func_tests.sh b/tests/func_tests.sh
index 29bbef9..60e9f0c 100755
--- a/tests/func_tests.sh
+++ b/tests/func_tests.sh
@@ -72,8 +72,11 @@ install_selenium() {
apt-get -y install phpunit phpunit-selenium patch psmisc
patch rsyslog
else
apt-get -y install php-curl unzip composer patch psmisc
patch rsyslog
+ mkdir -p /usr/local/share/php
+ pushd /usr/local/share/php
composer --no-plugins --no-scripts require phpunit/phpunit
composer --no-plugins --no-scripts require
phpunit/phpunit-selenium
+ popd
fi
else
yum -y install wget firefox
@@ -229,8 +232,8 @@ if [ -n "$1" ] ; then
testname="$1"
fi
-if [ -x /usr/share/php/vendor/bin/phpunit ] ; then
- phpunit=/usr/share/php/vendor/bin/phpunit
+if [ -x /usr/local/share/php/vendor/bin/phpunit ] ; then
+ phpunit=/usr/local/share/php/vendor/bin/phpunit
else
phpunit=phpunit
fi
-----------------------------------------------------------------------
Summary of changes:
tests/func_tests.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
