From bc3aa14991c3f5d70ce10094dc475ee1cddedbae Mon Sep 17 00:00:00 2001
From: Olivier Berger <olivier.berger@it-sudparis.eu>
Date: Wed, 9 Feb 2011 15:51:18 +0000
Subject: [PATCH] Updates and more testing.

Should be ready for production, more or less ;)
---
 tools/VM-scripts/build.sh             |  9 +++++++++
 tools/VM-scripts/configure-scripts.sh |  9 +++++++++
 tools/VM-scripts/install.sh           |  9 +++++++++
 tools/VM-scripts/start-selenium.sh    | 17 +++++++++++++++++
 tools/VM-scripts/update.sh            | 13 ++++++++++++-
 5 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/tools/VM-scripts/build.sh b/tools/VM-scripts/build.sh
index ec31ac0..b6c62ed 100755
--- a/tools/VM-scripts/build.sh
+++ b/tools/VM-scripts/build.sh
@@ -1,5 +1,14 @@
 #! /bin/sh
 
+# Authors :
+#  Roland Mas
+#  Olivier BERGER <olivier.berger@it-sudparis.eu>
+
+# This script will build the Debian packages to be tested
+
+# Prerequisite : running 'update.sh' and its prerequisites
+
+
 # removed as the grep test below would break otherwise
 #set -e
 
diff --git a/tools/VM-scripts/configure-scripts.sh b/tools/VM-scripts/configure-scripts.sh
index 41d9cf6..5fa61db 100644
--- a/tools/VM-scripts/configure-scripts.sh
+++ b/tools/VM-scripts/configure-scripts.sh
@@ -63,3 +63,12 @@ fi
 echo "Creating a link from 'fusionforge-$BRANCH/tools/VM-scripts/' to './scripts'."
 ln -s "fusionforge-$BRANCH/tools/VM-scripts/" scripts
 
+if [ -L scripts/reload-db.sh ]; then
+    oldlink=$(ls -ld scripts/reload-db.sh)
+    echo "Removing old scripts/reload-db.sh link ($oldlink)"
+    rm scripts/reload-db.sh
+fi
+
+echo "Creating a link from 'fusionforge-$BRANCH/tests/func/db_reload.sh' to 'scripts/reload-db.sh'."
+ln -s "../../tests/func/db_reload.sh" scripts/reload-db.sh
+
diff --git a/tools/VM-scripts/install.sh b/tools/VM-scripts/install.sh
index 9052efb..e8dd79e 100755
--- a/tools/VM-scripts/install.sh
+++ b/tools/VM-scripts/install.sh
@@ -1,5 +1,14 @@
 #! /bin/sh
 
+
+# Authors :
+#  Roland Mas
+#  Olivier BERGER <olivier.berger@it-sudparis.eu>
+
+# This script will install the Debian packages to be tested which have been build inside the VM
+
+# Prerequisite : running 'build.sh' and its prerequisites
+
 set -e
 set -x
 
diff --git a/tools/VM-scripts/start-selenium.sh b/tools/VM-scripts/start-selenium.sh
index d7f51e3..b239211 100755
--- a/tools/VM-scripts/start-selenium.sh
+++ b/tools/VM-scripts/start-selenium.sh
@@ -1,4 +1,21 @@
 #! /bin/sh
 
+# Authors :
+#  Roland Mas
+#  Olivier BERGER <olivier.berger@it-sudparis.eu>
+
+# This script will start the Selenium server which will execute the tests on the installed forge
+
+# Prerequisite : having run 'install.sh' and its prerequisites
+
+# Note that there may be problems with the firefox profile and SSL
+# certificate.  Refer to
+# https://fusionforge.org/plugins/mediawiki/wiki/fusionforge/index.php/Virtual_machine_development_environment
+# to find instructions to workaround these.
+
+echo
+echo "You may wish to install a graphical environment (gnome, kde, lxde, ...) to run the selenium server inside the VM's display."
+echo
+
 cd /root/fusionforge/3rd-party/selenium
 make
diff --git a/tools/VM-scripts/update.sh b/tools/VM-scripts/update.sh
index 54af5ea..30dd61e 100755
--- a/tools/VM-scripts/update.sh
+++ b/tools/VM-scripts/update.sh
@@ -1,15 +1,26 @@
 #! /bin/sh
 
+# Authors :
+#  Roland Mas
+#  Olivier BERGER <olivier.berger@it-sudparis.eu>
+
+# This script will update the system and the checked-out branch to the
+# latest state to be tested.
+
+# Prerequisite : running 'sh scripts/configure-scripts.sh' once
+
+# First, make sure the Debian distro is up-to-date
 aptitude update
 aptitude dist-upgrade
 
 # Make sure to add tools needed for build.sh
-aptitude bzr install mini-dinstall devscripts dpatch sharutils docbook-to-man
+aptitude install bzr mini-dinstall devscripts dpatch sharutils docbook-to-man
 
 set -e
 
 cd /root/fusionforge
 
+# If using bzr, or git, update accordingly
 if [ -d .bzr/ ] ; then
     bzr update
 else
-- 
2.1.4