From 75453f4ce61e6ad9e44b39c3681b5ede133af447 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Tue, 13 Nov 2012 15:45:40 +0000 Subject: Consolidate checks for python version Most of the bespoke logic for the version check is unnecessary, since the output to display can be easily inferred from the filename. This fixes some test failures where the version check would cat a file to fake the output, but fail because the file was removed. --- .../building-a-system-branch-picks-up-uncommitted-changes.script | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script') 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" -- cgit v1.2.1