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.0 has been updated
via 9305496eaa7c876d65b68bda9934133a05a593d5 (commit)
from 6a5b0356506e73574fcefcdb95cf3606edcebf07 (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=9305496eaa7c876d65b68bda9934133a05a593d5
commit 9305496eaa7c876d65b68bda9934133a05a593d5
Author: Roland Mas <[email protected]>
Date: Wed Dec 21 11:24:06 2016 +0100
Revert "Insert /etc/hosts entries for all addresses"
This reverts commit 6a5b0356506e73574fcefcdb95cf3606edcebf07, which
broke the buildbot for some reason.
diff --git a/tests/func_tests.sh b/tests/func_tests.sh
index 226e341..fda84e6 100755
--- a/tests/func_tests.sh
+++ b/tests/func_tests.sh
@@ -77,13 +77,11 @@ install_selenium() {
-O /usr/share/selenium/selenium-server.jar
# Add alias to /etc/hosts
- for h in $(hostname -I) ; do
- if ! grep -q ^$h /etc/hosts ; then
- echo $h $(hostname -f) $(hostname)>> /etc/hosts
- fi
- grep -q "^$h.*$(forge_get_config scm_host)" /etc/hosts || sed -i -e
"s/^$h.*/& $(forge_get_config scm_host)/" /etc/hosts
- done
-
+ if ! grep -q ^$(hostname -i) /etc/hosts ; then
+ echo $(hostname -i) $(hostname -f) $(hostname)>> /etc/hosts
+ fi
+ 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 screenshot default black background (/usr/share/{php,pear}) (fix
available upstream)
patch -N /usr/share/*/PHPUnit/Extensions/SeleniumTestCase.php <<'EOF' ||
true
--- /usr/share/php/PHPUnit/Extensions/SeleniumTestCase.php-dist
2014-02-10 19:48:34.000000000 +0000
-----------------------------------------------------------------------
Summary of changes:
tests/func_tests.sh | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
