diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-05-29 15:56:34 +0100 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-05-29 15:56:34 +0100 |
| commit | 37670fafb2678d0e0a2fc48fc87a59ab3697de5b (patch) | |
| tree | 628c31e94b8a0f4ed071d9c2fb8bf6990ac9c1b5 /tests.deploy | |
| parent | 37f2f67d16dfd2e0a496e0dcf5b692973e5a0ff4 (diff) | |
| download | morph-37670fafb2678d0e0a2fc48fc87a59ab3697de5b.tar.gz | |
Apply Richard Maw's suggestions
Diffstat (limited to 'tests.deploy')
| -rwxr-xr-x | tests.deploy/deploy-rawdisk-without-disk-size-fails.script | 9 | ||||
| -rwxr-xr-x | tests.deploy/deploy-rawdisk.script | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/tests.deploy/deploy-rawdisk-without-disk-size-fails.script b/tests.deploy/deploy-rawdisk-without-disk-size-fails.script index ea4072b5..94084a5c 100755 --- a/tests.deploy/deploy-rawdisk-without-disk-size-fails.script +++ b/tests.deploy/deploy-rawdisk-without-disk-size-fails.script @@ -21,17 +21,10 @@ 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" ] +test ! -e "$DATADIR/disk.img" diff --git a/tests.deploy/deploy-rawdisk.script b/tests.deploy/deploy-rawdisk.script index ce367ae0..bead945b 100755 --- a/tests.deploy/deploy-rawdisk.script +++ b/tests.deploy/deploy-rawdisk.script @@ -22,17 +22,10 @@ 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" DISK_SIZE=1G > /dev/null -[ -e "$DATADIR/disk.img" ] +test -e "$DATADIR/disk.img" |