diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2013-01-22 13:25:44 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-01-22 13:47:21 +0000 |
commit | a7d9d8c8a89f6420e0dfbad9b705552296d34449 (patch) | |
tree | 911fe259103359ae6a100b8fe5c889581d0b703c | |
parent | a2dfc55fbfe470d346eb350e76414eb7668efda8 (diff) | |
download | morph-a7d9d8c8a89f6420e0dfbad9b705552296d34449.tar.gz |
Reinstate check for python 2.7
-rwxr-xr-x | tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script | 3 | ||||
-rwxr-xr-x | tests.as-root/tarball-image-is-sensible.script | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script index 088e6925..c6179aaf 100755 --- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script +++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script @@ -21,6 +21,9 @@ set -eu +# Disable test on versions of Python before 2.7. +. "$SRCDIR/scripts/python-check" + cache="$DATADIR/cache/artifacts" arch=$(uname -m) diff --git a/tests.as-root/tarball-image-is-sensible.script b/tests.as-root/tarball-image-is-sensible.script index 2a9044b7..1b4d60ae 100755 --- a/tests.as-root/tarball-image-is-sensible.script +++ b/tests.as-root/tarball-image-is-sensible.script @@ -21,6 +21,9 @@ set -eu +# Disable test on versions of Python before 2.7. +. "$SRCDIR/scripts/python-check" + . "$SRCDIR/scripts/fix-committer-info" tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact \ |