diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-05-29 14:00:27 +0100 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-05-29 13:32:43 +0000 |
| commit | 37f2f67d16dfd2e0a496e0dcf5b692973e5a0ff4 (patch) | |
| tree | 92c281bb6bddbfa2b801a97b3e0415a3b30a8329 /tests.deploy | |
| parent | 9885b51a7a7633a5363533fa86166fc2758c080c (diff) | |
| download | morph-37f2f67d16dfd2e0a496e0dcf5b692973e5a0ff4.tar.gz | |
Make deploy-rawdisk test pass and add a test for undefined DISK_SIZE
Diffstat (limited to 'tests.deploy')
| -rwxr-xr-x | tests.deploy/deploy-rawdisk-without-disk-size-fails.script | 37 | ||||
| -rwxr-xr-x | tests.deploy/deploy-rawdisk.script | 2 |
2 files changed, 38 insertions, 1 deletions
diff --git a/tests.deploy/deploy-rawdisk-without-disk-size-fails.script b/tests.deploy/deploy-rawdisk-without-disk-size-fails.script new file mode 100755 index 00000000..ea4072b5 --- /dev/null +++ b/tests.deploy/deploy-rawdisk-without-disk-size-fails.script @@ -0,0 +1,37 @@ +#!/bin/bash +# +# Copyright (C) 2013 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + +# Test "morph deploy" refuses to deploy if DISK_SIZE is unset. + +set -eu + + +# Disable if Python is 2.6. +if python --version 2>&1 | grep ' 2\.6\.' > /dev/null +then + exit 0 +fi + + +. "$SRCDIR/tests.deploy/setup-build" +cd "$DATADIR/workspace/branch1" +"$SRCDIR/scripts/test-morph" build linux-system +! "$SRCDIR/scripts/test-morph" --log "$DATADIR/deploy.log" \ + deploy rawdisk linux-system "$DATADIR/disk.img" > /dev/null 2>&1 +! [ -e "$DATADIR/disk.img" ] + diff --git a/tests.deploy/deploy-rawdisk.script b/tests.deploy/deploy-rawdisk.script index 6966c520..ce367ae0 100755 --- a/tests.deploy/deploy-rawdisk.script +++ b/tests.deploy/deploy-rawdisk.script @@ -33,6 +33,6 @@ fi cd "$DATADIR/workspace/branch1" "$SRCDIR/scripts/test-morph" build linux-system "$SRCDIR/scripts/test-morph" --log "$DATADIR/deploy.log" \ - deploy rawdisk linux-system "$DATADIR/disk.img" > /dev/null + deploy rawdisk linux-system "$DATADIR/disk.img" DISK_SIZE=1G > /dev/null [ -e "$DATADIR/disk.img" ] |