[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.5-2-g6a5b035

Roland Mas lolando at libremir.placard.fr.eu.org
Wed Dec 21 10:13:38 CET 2016


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  6a5b0356506e73574fcefcdb95cf3606edcebf07 (commit)
      from  7b81cfbe86bd63e8266d4f5fa03e2c33d991abe8 (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=6a5b0356506e73574fcefcdb95cf3606edcebf07

commit 6a5b0356506e73574fcefcdb95cf3606edcebf07
Author: Roland Mas <lolando at debian.org>
Date:   Wed Dec 21 10:11:21 2016 +0100

    Insert /etc/hosts entries for all addresses
    
    If the host where the testsuite is run has several IP addresses (in
    particular IPv4+IPv6), add entries to /etc/hosts for all of them.
    This avoids having only the IPv6 one, which breaks the CVS testsuite
    because CVS doesn't talk IPv6 (when using anonymous/pserver).

diff --git a/tests/func_tests.sh b/tests/func_tests.sh
index fda84e6..226e341 100755
--- a/tests/func_tests.sh
+++ b/tests/func_tests.sh
@@ -77,11 +77,13 @@ install_selenium() {
 	      -O /usr/share/selenium/selenium-server.jar
     
     # Add alias to /etc/hosts
-    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
-    
+    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
+
     # 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, 7 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list