diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-13 15:45:40 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-13 16:15:04 +0000 |
| commit | 75453f4ce61e6ad9e44b39c3681b5ede133af447 (patch) | |
| tree | 0197190e5cbacd76efd08c464a807a78a2fbf08e /tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script | |
| parent | 2ac6f661130322e63b8d2737145ea11d445aaa79 (diff) | |
| download | morph-75453f4ce61e6ad9e44b39c3681b5ede133af447.tar.gz | |
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.
Diffstat (limited to 'tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script')
| -rwxr-xr-x | tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script | 7 |
1 files changed, 1 insertions, 6 deletions
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" |