diff options
Diffstat (limited to 'tests.as-root')
7 files changed, 7 insertions, 33 deletions
diff --git a/tests.as-root/build-with-external-strata.script b/tests.as-root/build-with-external-strata.script index affb28f5..6bd14c10 100755 --- a/tests.as-root/build-with-external-strata.script +++ b/tests.as-root/build-with-external-strata.script @@ -19,11 +19,7 @@ set -eu # Disable test on versions of Python before 2.7. -if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null -then - cat "$SRCDIR/tests.as-root/build-with-external-strata.stdout" - exit 0 -fi +. "$SRCDIR/scripts/python-check" . "$SRCDIR/scripts/setup-3rd-party-strata" diff --git a/tests.as-root/build-with-push.script b/tests.as-root/build-with-push.script index 1c3fb3fd..554edaaa 100755 --- a/tests.as-root/build-with-push.script +++ b/tests.as-root/build-with-push.script @@ -20,11 +20,7 @@ set -eu # Disable test on versions of Python before 2.7. -if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null -then - cat "$SRCDIR/tests.as-root/build-with-push.stdout" - exit 0 -fi +source "$SRCDIR/scripts/python-check" source "$SRCDIR/tests.as-root/setup-build" diff --git a/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script b/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script index 9ccc3dee..bf8ecf71 100755 --- a/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script +++ b/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script @@ -20,12 +20,7 @@ set -eu # Disable test on versions of Python before 2.7. -if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null -then - name=building-a-system-branch-multiple-times-doesnt-generate-new-artifacts - cat "$SRCDIR/tests.as-root/$name.stdout" - exit 0 -fi +source "$SRCDIR/scripts/python-check" source "$SRCDIR/tests.as-root/setup-build" diff --git a/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script b/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script index 642093dc..65c25c73 100755 --- a/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script +++ b/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script @@ -20,12 +20,7 @@ set -eu # Disable test on versions of Python before 2.7. -if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null -then - name="building-a-system-branch-picks-up-uncommitted-changes" - cat "$SRCDIR/tests.as-root/$name.stdout" - exit 0 -fi +source "$SRCDIR/scripts/python-check" source "$SRCDIR/tests.as-root/setup-build" diff --git a/tests.as-root/building-a-system-branch-works-anywhere.script b/tests.as-root/building-a-system-branch-works-anywhere.script index 2bba83dc..e79fa167 100755 --- a/tests.as-root/building-a-system-branch-works-anywhere.script +++ b/tests.as-root/building-a-system-branch-works-anywhere.script @@ -20,11 +20,7 @@ set -eu # Disable test on versions of Python before 2.7. -if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null -then - cat "$SRCDIR/tests.as-root/building-a-system-branch-works-anywhere.stdout" - exit 0 -fi +source "$SRCDIR/scripts/python-check" source "$SRCDIR/tests.as-root/setup-build" 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 fea92d65..95e7a504 100755 --- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script +++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script @@ -20,9 +20,7 @@ set -eu -case $(python --version 2>&1) in - "Python 2.6"*) exit 0 ;; -esac +. "$SRCDIR/scripts/python-check" cache="$DATADIR/cache/artifacts" kernelrepo="$DATADIR/kernel-repo" diff --git a/tests.as-root/tarball-image-is-sensible.script b/tests.as-root/tarball-image-is-sensible.script index 412d27e0..035a13c7 100755 --- a/tests.as-root/tarball-image-is-sensible.script +++ b/tests.as-root/tarball-image-is-sensible.script @@ -20,9 +20,7 @@ set -eu -case $(python --version 2>&1) in - "Python 2.6"*) exit 0 ;; -esac +. "$SRCDIR/scripts/python-check" . "$SRCDIR/scripts/fix-committer-info" |