diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-09-13 15:39:07 +0100 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-09-13 15:39:07 +0100 |
commit | 2b82040f847a5595dccb80f8ed537e7d6c5a1e6e (patch) | |
tree | 4945051fca5c55c6e8672ad61f0c499916960121 /tests.branching | |
parent | 90821e1e58317ae105bd2ecf43f46f441e292fcd (diff) | |
download | morph-2b82040f847a5595dccb80f8ed537e7d6c5a1e6e.tar.gz |
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.
Diffstat (limited to 'tests.branching')
-rwxr-xr-x | tests.branching/edit-updates-stratum.script | 7 | ||||
-rwxr-xr-x | tests.branching/petrify.script | 7 | ||||
-rwxr-xr-x | tests.branching/setup | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/tests.branching/edit-updates-stratum.script b/tests.branching/edit-updates-stratum.script index 9815fa22..f95526e2 100755 --- a/tests.branching/edit-updates-stratum.script +++ b/tests.branching/edit-updates-stratum.script @@ -20,6 +20,13 @@ 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.branching/edit-updates-stratum.stdout" + exit 0 +fi + # Create system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init diff --git a/tests.branching/petrify.script b/tests.branching/petrify.script index d6c380b2..30f9f5df 100755 --- a/tests.branching/petrify.script +++ b/tests.branching/petrify.script @@ -21,6 +21,13 @@ 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.branching/petrify.stdout" + exit 0 +fi + cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" update-gits baserock:morphs master hello-stratum diff --git a/tests.branching/setup b/tests.branching/setup index cce3b672..f075e7b1 100755 --- a/tests.branching/setup +++ b/tests.branching/setup @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify |