[Fusionforge-commits] r11659 - in trunk: src/docs src/plugins/wiki/www/doc tests/func/Testing tests/scripts

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Sat Nov 27 19:04:53 CET 2010


Author: aljeux
Date: 2010-11-27 19:04:53 +0100 (Sat, 27 Nov 2010)
New Revision: 11659

Modified:
   trunk/src/docs/fusionforge.doxygen
   trunk/src/plugins/wiki/www/doc/phpwiki.doxygen
   trunk/tests/func/Testing/TarSeleniumRemoteSuite.php
   trunk/tests/scripts/fusionforge-build-and-test-source.sh
Log:
Tests: Use env. var for packages & apidocs

Modified: trunk/src/docs/fusionforge.doxygen
===================================================================
--- trunk/src/docs/fusionforge.doxygen	2010-11-27 18:04:23 UTC (rev 11658)
+++ trunk/src/docs/fusionforge.doxygen	2010-11-27 18:04:53 UTC (rev 11659)
@@ -563,7 +563,7 @@
 # and error messages should be written. If left blank the output is written
 # to stderr.
 
-WARN_LOGFILE           = ../apidocs/fusionforge/output.log
+WARN_LOGFILE           = $(DOCSDIR)/fusionforge/output.log
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
@@ -574,7 +574,7 @@
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = gforge/common
+INPUT                  = src/common
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -773,7 +773,7 @@
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT            = ../apidocs/fusionforge
+HTML_OUTPUT            = $(DOCSDIR)/fusionforge
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank

Modified: trunk/src/plugins/wiki/www/doc/phpwiki.doxygen
===================================================================
--- trunk/src/plugins/wiki/www/doc/phpwiki.doxygen	2010-11-27 18:04:23 UTC (rev 11658)
+++ trunk/src/plugins/wiki/www/doc/phpwiki.doxygen	2010-11-27 18:04:53 UTC (rev 11659)
@@ -563,7 +563,7 @@
 # and error messages should be written. If left blank the output is written
 # to stderr.
 
-WARN_LOGFILE           = ../apidocs/phpwiki/output.log
+WARN_LOGFILE           = $(DOCSDIR)/phpwiki/output.log
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
@@ -773,7 +773,7 @@
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT            = ../apidocs/phpwiki
+HTML_OUTPUT            = $(DOCSDIR)/phpwiki
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank

Modified: trunk/tests/func/Testing/TarSeleniumRemoteSuite.php
===================================================================
--- trunk/tests/func/Testing/TarSeleniumRemoteSuite.php	2010-11-27 18:04:23 UTC (rev 11658)
+++ trunk/tests/func/Testing/TarSeleniumRemoteSuite.php	2010-11-27 18:04:53 UTC (rev 11659)
@@ -10,7 +10,11 @@
 
 		system("scp -r ../tests root@".HOST.":/opt");
 
-		system("scp ../../build/packages/fusionforge-*.tar.bz2 root at centos52:");
+		if (getenv('BUILDRESULT')) {
+			system("scp ".getenv('BUILDRESULT')."/fusionforge-*.tar.bz2 root@".HOST.":");
+		} else {
+			system("scp ../../build/packages/fusionforge-*.tar.bz2 root@".HOST.":");
+		}
 		system("ssh root at centos52 'tar jxf fusionforge-*.tar.bz2'");
 
 		if (is_file("/tmp/timedhosts.txt")) {

Modified: trunk/tests/scripts/fusionforge-build-and-test-source.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-source.sh	2010-11-27 18:04:23 UTC (rev 11658)
+++ trunk/tests/scripts/fusionforge-build-and-test-source.sh	2010-11-27 18:04:53 UTC (rev 11659)
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh -xe
 
 export CONFIG_PHP=func/config.php.buildbot
 export SELENIUM_RC_HOST=${SELENIUM_RC_HOST:-`hostname -i`}
@@ -9,10 +9,12 @@
 export DB_NAME=fforge
 export CONFIGURED=true
 
+export BUILDRESULT=$WORKSPACE/build/packages
+
 rm -fr $WORKSPACE/build/packages $WORKSPACE/reports $WORKSPACE/apidocs
 mkdir -p $WORKSPACE/build/packages $WORKSPACE/reports/coverage $WORKSPACE/apidocs
 
-make build-doc DOXYGEN=$HOME/doxygen-1.6.3/bin/doxygen
+make build-doc DOCSDIR=$WORKSPACE/apidocs DOXYGEN=$HOME/doxygen-1.6.3/bin/doxygen
 make BUILDRESULT=$WORKSPACE/build/packages buildtar
 
 cp gforge/rpm-specific/fusionforge.repo $WORKSPACE/build/packages/fusionforge.repo




More information about the Fusionforge-commits mailing list