[Fusionforge-commits] FusionForge branch master updated. ba17f61b6f9885a9b38f9106c74c170d3fa1f121

Roland Mas lolando at fusionforge.org
Mon Nov 17 16:20:47 CET 2014


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  ba17f61b6f9885a9b38f9106c74c170d3fa1f121 (commit)
      from  a4715d753a11073f2f132f95ad6aaf067def0a51 (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 -----------------------------------------------------------------
commit ba17f61b6f9885a9b38f9106c74c170d3fa1f121
Author: Roland Mas <lolando at debian.org>
Date:   Mon Nov 17 16:20:35 2014 +0100

    Testsuite tweaks

diff --git a/autoinstall/run-testsuite.sh b/autoinstall/run-testsuite.sh
index 9be3d3a..b4523bd 100755
--- a/autoinstall/run-testsuite.sh
+++ b/autoinstall/run-testsuite.sh
@@ -19,7 +19,7 @@
 # with FusionForge; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-set -e
+set -ex
 export DEBIAN_FRONTEND=noninteractive
 
 if [ -z "$1" ]; then
diff --git a/tests/func/phpunit-selenium.sh b/tests/func/phpunit-selenium.sh
index 293a6c5..aa38827 100755
--- a/tests/func/phpunit-selenium.sh
+++ b/tests/func/phpunit-selenium.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 usage () {
        echo "Usage: $0 <install_method>/<install_os> testsuite_name"
@@ -42,6 +42,8 @@ case $INSTALL_OS in
 	;;
 esac
 
+HOST=$(hostname -f)
+
 scriptdir=$(dirname $0)
 FORGE_HOME=$(cd $scriptdir/../..; pwd)
 cd $FORGE_HOME
@@ -52,8 +54,7 @@ cd $FORGE_HOME
 
 SELENIUM_RC_DIR=/var/log
 SELENIUM_RC_URL=${HUDSON_URL}job/${JOB_NAME}/ws/reports
-SELENIUM_RC_HOST=`hostname -f`
-HOST=`hostname -f`
+SELENIUM_RC_HOST=$HOST
 # the PHP file provided through CONFIG_PHP will be loaded inside the functionnal test suite with require_once, in SeleniumRemoteSuite.php
 CONFIG_PHP=func/config.php
 export SELENIUM_RC_DIR SELENIUM_RC_URL SELENIUM_RC_HOST HOST DB_NAME DB_USER CONFIG_PHP

-----------------------------------------------------------------------

Summary of changes:
 autoinstall/run-testsuite.sh   |    2 +-
 tests/func/phpunit-selenium.sh |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list