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, master has been updated
via 12992ac28cab45eb9250473a91c867efc65ec729 (commit)
from 117113af86bbbe7952cc03ae8d6f3ebd41e141f6 (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=12992ac28cab45eb9250473a91c867efc65ec729
commit 12992ac28cab45eb9250473a91c867efc65ec729
Author: Roland Mas <[email protected]>
Date: Fri Apr 19 12:34:29 2019 +0200
Patch appropriate file in PHPUnit
diff --git a/tests/func_tests.sh b/tests/func_tests.sh
index 0a55bea..9a0ac99 100755
--- a/tests/func_tests.sh
+++ b/tests/func_tests.sh
@@ -115,7 +115,9 @@ install_selenium() {
grep -q "^$(hostname -i).*$(forge_get_config scm_host)" /etc/hosts ||
sed -i -e "s/^$(hostname -i).*/& $(forge_get_config scm_host)/" /etc/hosts
#fix https://github.com/giorgiosironi/phpunit-selenium/issues/427
- patch -N /usr/share/*/PHPUnit/Extensions/Selenium2TestCase/Element.php
<<'EOF' || true
+ for i in /usr/share/*/PHPUnit/Extensions/Selenium2TestCase/Element.php
./local/share/php/vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/Selenium2TestCase/Element.php
; do
+ if [ -e "$i" ] ; then
+ patch -N "$i" <<'EOF' || true
--- Element.php.dist 2014-11-02 09:23:27.000000000 +0000
+++ Element.php 2019-01-15 15:00:44.034513685 +0000
@@ -77,10 +77,21 @@
@@ -143,6 +145,8 @@ install_selenium() {
}
EOF
+ fi
+ done
}
# Mitigate testsuite timeouts, cf.
-----------------------------------------------------------------------
Summary of changes:
tests/func_tests.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
