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 ad3edcd2188842434c744aab784fda431b1111ed (commit)
from 8d3a34b96950cb59e9f18139b886ab5ee0ad09da (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=ad3edcd2188842434c744aab784fda431b1111ed
commit ad3edcd2188842434c744aab784fda431b1111ed
Author: Roland Mas <[email protected]>
Date: Tue Jan 19 17:17:27 2021 +0100
Force use of phpunit from composer
diff --git a/tests/func_tests.sh b/tests/func_tests.sh
index 6d0a368..3c22d98 100755
--- a/tests/func_tests.sh
+++ b/tests/func_tests.sh
@@ -71,16 +71,16 @@ install_selenium() {
if [ -e /etc/debian_version ]; then
apt-get -y install wget firefox-esr net-tools
if grep -q ^8 /etc/debian_version; then
- apt-get -y install phpunit phpunit-selenium psmisc rsyslog
patch
+ apt-get -y install rsyslog patch
apt-get -y install -t jessie-backports openjdk-8-jdk
else
apt-get -y install php-curl unzip composer psmisc rsyslog
default-jre patch
- 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:dev-master
- popd
fi
+ 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:dev-master
+ popd
else
yum -y install wget firefox java-1.8.0-openjdk
yum --enablerepo=epel install -y php-phpunit-PHPUnit
php-phpunit-PHPUnit-Selenium psmisc net-tools patch
-----------------------------------------------------------------------
Summary of changes:
tests/func_tests.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
