diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-02-12 17:58:17 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-02-12 18:13:04 +0000 |
| commit | 1aa2a093bb8d31ddd40980ee367f4dd60c6bf403 (patch) | |
| tree | dbb58f2c1a9822884dc90adf042f930abac4c94f /tests.deploy | |
| parent | f6bd330de053c62f301d161ed47f63de4c4192b7 (diff) | |
| download | morph-1aa2a093bb8d31ddd40980ee367f4dd60c6bf403.tar.gz | |
Disable deployment test on Python 2.6
Also, make test use bash instead of sh, so it passes on squeeze
as well as Baserock.
Diffstat (limited to 'tests.deploy')
| -rwxr-xr-x | tests.deploy/deploy-rawdisk.script | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tests.deploy/deploy-rawdisk.script b/tests.deploy/deploy-rawdisk.script index 4c01ca0d..6966c520 100755 --- a/tests.deploy/deploy-rawdisk.script +++ b/tests.deploy/deploy-rawdisk.script @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright (C) 2013 Codethink Limited # @@ -22,7 +22,14 @@ set -eu -. "$SRCDIR/tests.as-root/setup-build" +# 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" \ |