summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtests.deploy/deploy-rawdisk.script11
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" \