diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-13 18:00:49 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-13 18:00:49 +0000 |
| commit | 4a2b2aa38b85971b72c925eea5ca18767c63cc50 (patch) | |
| tree | 3bc83675b7b3762aeb32d22347709a5b2b8b641c /tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script | |
| parent | bd58d7bd96a35805e9e55a520250fcb369633d97 (diff) | |
| parent | 75453f4ce61e6ad9e44b39c3681b5ede133af447 (diff) | |
| download | morph-4a2b2aa38b85971b72c925eea5ca18767c63cc50.tar.gz | |
Merge branch 'baserock/richardmaw/fix-python-check'
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" |