From 2b82040f847a5595dccb80f8ed537e7d6c5a1e6e Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Thu, 13 Sep 2012 15:39:07 +0100 Subject: Fix things so test suite works on Debian squeeze This requires disabling the feature that retains the original order of fields in a morphlogy when it gets overwritten. The implementation relies on features that are not available in Python 2.6. We need to support Morph on Debian squeeze, for bootstrapping purposes, and therefore need to have it work with Python 2.6. However, the morphology rewriting is only relevant for system branching and merging, and that isn't needed for bootstrapping, so we disable the affected tests on Python 2.6. --- .../building-a-system-branch-picks-up-uncommitted-changes.script | 8 ++++++++ 1 file changed, 8 insertions(+) (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 002f4abd..0ba6ebad 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 @@ -19,6 +19,14 @@ 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/fix-committer-info" # Initialise the workspace. -- cgit v1.2.1