summaryrefslogtreecommitdiffstats
path: root/run_test_suite
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-04-04 12:25:49 +0200
committerTails developers <amnesia@boum.org>2013-04-04 12:31:27 +0200
commit6b61e98f357ef6d272435a2f033adaf0d00b6166 (patch)
tree4649778aef42983337eca308a4a14bd0882d5850 /run_test_suite
parenta5c28bd41d1a02fc16e886675b86e0dccda40ee6 (diff)
Perform upgrades from older installations of Tails.
The "older" version of Tails used for this is the oldest (by label creation date) Tails image in the current directory (or the one specified by --old-iso). Some "helper" scenarios are added that sets up an appropriate "old" USB installation that the upgrades then are performed on.
Diffstat (limited to 'run_test_suite')
-rwxr-xr-xrun_test_suite18
1 files changed, 13 insertions, 5 deletions
diff --git a/run_test_suite b/run_test_suite
index 9f512cf..a4d27de 100755
--- a/run_test_suite
+++ b/run_test_suite
@@ -25,9 +25,13 @@ Options for '@product' features:
--view Shows the test session in a windows. Requires x11vnc
and xtightvncviewer.
--vnc-server-only Starts a VNC server for the test session. Requires x11vnc.
- --iso IMAGE Test '@product' features using IMAGE. If none is given,
- any '@product' feature will use the ISO image with most
- recet mtime in the current directory
+ --iso=IMAGE Test '@product' features using IMAGE. If none is given,
+ the ISO with most recent creation date (according to the
+ ISO's label) in the current directory will be used.
+ --old-iso=IMAGE For some '@product' features (e.g. usb_install) we need
+ an older version of Tails, which this options sets to
+ IMAGE. If none is given, the ISO with the least recent
+ creation date will be used.
Note that '@source' features has no relevant options.
"
@@ -96,9 +100,9 @@ capture_session() {
# main script
unset CAPTURE_FILE VNC_VIEWER VNC_SERVER
-unset DEBUG KEEP_SNAPSHOTS TEMP_DIR ISO
+unset DEBUG KEEP_SNAPSHOTS TEMP_DIR ISO OLD_ISO
SHORTOPTS="a:c"
-LONGOPTS="view,vnc-server-only,capture:,help,temp-dir:,keep-snapshots,iso:,debug"
+LONGOPTS="view,vnc-server-only,capture:,help,temp-dir:,keep-snapshots,iso:,old-iso:,debug"
OPTS=$(getopt -o $SHORTOPTS --longoptions $LONGOPTS -n "${NAME}" -- "$@")
eval set -- "$OPTS"
while [ $# -gt 0 ]; do
@@ -129,6 +133,10 @@ while [ $# -gt 0 ]; do
shift
export ISO="$(readlink -f $1)"
;;
+ --old-iso)
+ shift
+ export OLD_ISO="$(readlink -f $1)"
+ ;;
--help)
usage
exit 0