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 5251bdedbf7f4b1c7524a14af46b323f8d34f32c (commit)
from ad3edcd2188842434c744aab784fda431b1111ed (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=5251bdedbf7f4b1c7524a14af46b323f8d34f32c
commit 5251bdedbf7f4b1c7524a14af46b323f8d34f32c
Author: Roland Mas <[email protected]>
Date: Tue Jan 19 17:24:20 2021 +0100
Force use of phpunit from composer
diff --git a/tests/func_tests.sh b/tests/func_tests.sh
index 3c22d98..0d9fbea 100755
--- a/tests/func_tests.sh
+++ b/tests/func_tests.sh
@@ -76,15 +76,15 @@ install_selenium() {
else
apt-get -y install php-curl unzip composer psmisc rsyslog
default-jre patch
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
+ yum --enablerepo=epel install -y psmisc net-tools patch
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
# Install selenium (no packaged version available)
SELENIUMMAJOR=3
-----------------------------------------------------------------------
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
