[Fusionforge-commits] r12668 - trunk/tests/scripts

Christian Bayle cbayle at fusionforge.org
Fri Mar 11 00:30:30 CET 2011


Author: cbayle
Date: 2011-03-11 00:30:30 +0100 (Fri, 11 Mar 2011)
New Revision: 12668

Modified:
   trunk/tests/scripts/fusionforge-build-and-test-deb.sh
   trunk/tests/scripts/fusionforge-build-and-test-rpm.sh
   trunk/tests/scripts/fusionforge-build-and-test-source.sh
Log:
Prepare to run phpunit remotly


Modified: trunk/tests/scripts/fusionforge-build-and-test-deb.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-deb.sh	2011-03-10 23:30:17 UTC (rev 12667)
+++ trunk/tests/scripts/fusionforge-build-and-test-deb.sh	2011-03-10 23:30:30 UTC (rev 12668)
@@ -85,13 +85,18 @@
 ssh root@$HOST "su - postgres -c \"pg_dump -Fc $DB_NAME\" > /root/dump"
 ssh root@$HOST "invoke-rc.d cron stop" || true
 
-cd tests
-phpunit --log-junit $WORKSPACE/reports/phpunit-selenium.xml DEBDebian60Tests.php
+if $REMOTESELENIUM
+then
+	echo "Run phpunit test on $HOST"
+else
+	cd tests
+	phpunit --log-junit $WORKSPACE/reports/phpunit-selenium.xml DEBDebian60Tests.php
+	cd ..
+fi
 if [ "x$SELENIUM_RC_DIR" != "x" ]
 then
 	scp -r root@$HOST:/var/log $SELENIUM_RC_DIR
 fi
-cd ..
 if $KEEPVM 
 then
 	echo "Keeping vm $HOST alive"

Modified: trunk/tests/scripts/fusionforge-build-and-test-rpm.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-03-10 23:30:17 UTC (rev 12667)
+++ trunk/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-03-10 23:30:30 UTC (rev 12668)
@@ -81,13 +81,18 @@
 # ssh root@".HOST." 'perl -spi -e s#/usr/sbin/sendmail#/usr/share/tests/scripts/catch_mail.php# /etc/gforge/local.inc'
 ssh root@$HOST "service crond stop" || true
 
-cd tests
-phpunit --log-junit $WORKSPACE/reports/phpunit-selenium.xml RPMCentos52Tests.php
+if $REMOTESELENIUM
+then
+	echo "Run phpunit test on $HOST"
+else
+	cd tests
+	phpunit --log-junit $WORKSPACE/reports/phpunit-selenium.xml RPMCentos52Tests.php
+	cd ..
+fi
 if [ "x$SELENIUM_RC_DIR" != "x" ]
 then
 	scp -r root@$HOST:/var/log $SELENIUM_RC_DIR
 fi
-cd ..
 if $KEEPVM 
 then
 	echo "Keeping vm $HOST alive"

Modified: trunk/tests/scripts/fusionforge-build-and-test-source.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-source.sh	2011-03-10 23:30:17 UTC (rev 12667)
+++ trunk/tests/scripts/fusionforge-build-and-test-source.sh	2011-03-10 23:30:30 UTC (rev 12668)
@@ -84,13 +84,18 @@
 # ssh root@$HOST "perl -spi -e s#/usr/sbin/sendmail#/opt/tests/scripts/catch_mail.php# /etc/gforge/local.inc"
 ssh root@$HOST "service crond stop" || true
 
-cd tests
-phpunit --log-junit $WORKSPACE/reports/phpunit-selenium.xml TarCentos52Tests.php
+if $REMOTESELENIUM
+then
+	echo "Run phpunit test on $HOST"
+else
+	cd tests
+	phpunit --log-junit $WORKSPACE/reports/phpunit-selenium.xml TarCentos52Tests.php
+	cd ..
+fi
 if [ "x$SELENIUM_RC_DIR" != "x" ]
 then
 	scp -r root@$HOST:/var/log $SELENIUM_RC_DIR
 fi
-cd ..
 if $KEEPVM 
 then
 	echo "Keeping vm $HOST alive"




More information about the Fusionforge-commits mailing list