From 1aa2a093bb8d31ddd40980ee367f4dd60c6bf403 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
Date: Tue, 12 Feb 2013 17:58:17 +0000
Subject: Disable deployment test on Python 2.6

Also, make test use bash instead of sh, so it passes on squeeze
as well as Baserock.
---
 tests.deploy/deploy-rawdisk.script | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'tests.deploy')

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" \
-- 
cgit v1.2.1