[Fusionforge-commits] r15955 - in branches/Branch_5_1: . 3rd-party/selenium tests/scripts

Roland Mas lolando at fusionforge.org
Thu Jul 5 18:19:06 CEST 2012


Author: lolando
Date: 2012-07-05 18:19:05 +0200 (Thu, 05 Jul 2012)
New Revision: 15955

Modified:
   branches/Branch_5_1/
   branches/Branch_5_1/3rd-party/selenium/Makefile
   branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-deb.sh
   branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-rpm.sh
   branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-src-cos.sh
Log:
Use current Selenium for testsuite (backport from 5.2/trunk)

Modified: branches/Branch_5_1/3rd-party/selenium/Makefile
===================================================================
--- branches/Branch_5_1/3rd-party/selenium/Makefile	2012-07-05 12:39:57 UTC (rev 15954)
+++ branches/Branch_5_1/3rd-party/selenium/Makefile	2012-07-05 16:19:05 UTC (rev 15955)
@@ -2,30 +2,30 @@
 # http://seleniumhq.org/
 # http://seleniumhq.org/projects/remote-control/
 # http://selenium.googlecode.com/svn/trunk/remote/server/
-# take http://selenium.googlecode.com/files/selenium-remote-control-1.0.3.zip
 # see tests/func/README.TXT
 #
 
-run: binary/selenium-server-1.0.3
-	cd binary/selenium-server-1.0.3 ; LANG=C java -jar selenium-server.jar -interactive
+S_VERSION=2.21.0
 
-getselenium: binary/selenium-server-current/selenium-server.jar
+run: selenium-server.jar
+	LANG=C java -jar selenium-server.jar -interactive
 
-binary/selenium-server-current/selenium-server.jar: binary/selenium-server-1.0.3
-	ln -s selenium-server-1.0.3 binary/selenium-server-current
+selenium-server.jar: Makefile
+	wget -O - http://selenium.googlecode.com/files/selenium-server-standalone-$(S_VERSION).jar > $@
 
-binary/selenium-server-1.0.3: binary/selenium-remote-control-1.0.3.zip
-	cd binary ; [ -d selenium-server-1.0.3 ] || unzip selenium-remote-control-1.0.3.zip
-
-binary/selenium-remote-control-1.0.3.zip: binary
-	cd binary ; wget -q -c http://selenium.googlecode.com/files/selenium-remote-control-1.0.3.zip
-
-binary:
-	mkdir binary
-
 svnexport:
 	svn export http://selenium.googlecode.com/svn/trunk/remote/server selenium-server
 	#svn export http://selenium.googlecode.com/svn/trunk selenium
 
 getpackage:
 	sudo apt-get install maven-debian-helper
+
+getselenium: selenium-server.jar
+
+clean:
+	rm -f selenium-server.jar
+
+botbuild: getselenium
+
+botclean:
+	@echo "Nothing to do"

Modified: branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-deb.sh
===================================================================
--- branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-deb.sh	2012-07-05 12:39:57 UTC (rev 15954)
+++ branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-deb.sh	2012-07-05 16:19:05 UTC (rev 15955)
@@ -82,7 +82,7 @@
 
 scp -r tests root@$HOST:/root
 scp -r $WORKSPACE/build/config  root@$HOST:/root
-scp 3rd-party/selenium/binary/selenium-server-current/selenium-server.jar root@$HOST:/root
+scp 3rd-party/selenium/selenium-server.jar root@$HOST:/root
 ssh root@$HOST "cat /root/tests/preseed/* | sed s/@FORGE_ADMIN_PASSWORD@/$FORGE_ADMIN_PASSWORD/ | LANG=C debconf-set-selections"
 ssh root@$HOST "echo \"deb $DEBMIRROR $DIST main\" > /etc/apt/sources.list"
 ssh root@$HOST "echo \"deb $DEBMIRRORSEC $DIST/updates main\" > /etc/apt/sources.list.d/security.list"

Modified: branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-rpm.sh
===================================================================
--- branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-rpm.sh	2012-07-05 12:39:57 UTC (rev 15954)
+++ branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-rpm.sh	2012-07-05 16:19:05 UTC (rev 15955)
@@ -98,7 +98,7 @@
 EOF
 
 scp -r $WORKSPACE/build/config  root@$HOST:/root/
-rsync -a 3rd-party/selenium/binary/selenium-server-current/selenium-server.jar root@$HOST:/root/selenium-server.jar
+rsync -a 3rd-party/selenium/binary/selenium-server.jar root@$HOST:/root/selenium-server.jar
 rsync -a --delete tests/ root@$HOST:/root/tests/
 
 ssh root@$HOST "ln -s gforge /usr/share/src"

Modified: branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-src-cos.sh
===================================================================
--- branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-src-cos.sh	2012-07-05 12:39:57 UTC (rev 15954)
+++ branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-src-cos.sh	2012-07-05 16:19:05 UTC (rev 15955)
@@ -127,7 +127,7 @@
 JOB_NAME=$JOB_NAME
 EOF
 scp -r $WORKSPACE/build/config  root@$HOST:/root/
-rsync -a 3rd-party/selenium/binary/selenium-server-current/selenium-server.jar root@$HOST:/root/selenium-server.jar
+rsync -a 3rd-party/selenium/selenium-server.jar root@$HOST:/root/selenium-server.jar
 rsync -a --delete tests/ root@$HOST:/root/tests/
 
 echo "Run phpunit test on $HOST"




More information about the Fusionforge-commits mailing list