diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-10-12 16:23:03 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-10-12 17:02:02 +0100 |
| commit | f5b2eb8fe4ea19af7cc2ed76a21784d33c00577a (patch) | |
| tree | b60cea79adcdf94458e625df5008fb782b980957 /tests.as-root | |
| parent | 6c293b17cdd309896b1201d4db6e76b3db996496 (diff) | |
| download | morph-f5b2eb8fe4ea19af7cc2ed76a21784d33c00577a.tar.gz | |
Disable two tests if Python 2.6 is being used
Diffstat (limited to 'tests.as-root')
| -rwxr-xr-x | tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script | 4 | ||||
| -rwxr-xr-x | tests.as-root/tarball-image-is-sensible.script | 4 |
2 files changed, 8 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 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" \ |