From f5b2eb8fe4ea19af7cc2ed76a21784d33c00577a Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Fri, 12 Oct 2012 16:23:03 +0100 Subject: Disable two tests if Python 2.6 is being used --- tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script | 4 ++++ tests.as-root/tarball-image-is-sensible.script | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'tests.as-root') 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 c20efff5..ab0186c1 100755 --- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script +++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script @@ -20,6 +20,10 @@ set -eu +case $(python --version 2>&1) in + "Python 2.6"*) exit 0 ;; +esac + cache="$DATADIR/cache/artifacts" kernelrepo="$DATADIR/kernel-repo" morphsrepo="$DATADIR/morphs-repo" diff --git a/tests.as-root/tarball-image-is-sensible.script b/tests.as-root/tarball-image-is-sensible.script index fe983a2e..717d8e36 100755 --- a/tests.as-root/tarball-image-is-sensible.script +++ b/tests.as-root/tarball-image-is-sensible.script @@ -20,6 +20,10 @@ set -eu +case $(python --version 2>&1) in + "Python 2.6"*) exit 0 ;; +esac + . "$SRCDIR/scripts/fix-committer-info" tar=$("$SRCDIR/morph" \ -- cgit v1.2.1