diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-27 18:55:17 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-27 19:22:21 +0100 |
| commit | c821535c6290e47cabf85691b41d6b7dd20a7982 (patch) | |
| tree | 716e22fb1f5ad34c15a246c0863d1fa519cc7cdc /tests.branching | |
| parent | 2a89dbb8251e998e66956fef68875467cbe8a9b9 (diff) | |
| download | morph-c821535c6290e47cabf85691b41d6b7dd20a7982.tar.gz | |
Fix merge tests on Squeeze, by disabling them correctly
Diffstat (limited to 'tests.branching')
| -rwxr-xr-x | tests.branching/merge-conflict-chunks.script | 2 | ||||
| -rwxr-xr-x | tests.branching/merge-conflict-stratum.script | 4 | ||||
| -rwxr-xr-x | tests.branching/merge-with-chunk-renamed.script | 6 | ||||
| -rwxr-xr-x | tests.branching/merge-with-chunk-repo-moved.script | 7 |
4 files changed, 18 insertions, 1 deletions
diff --git a/tests.branching/merge-conflict-chunks.script b/tests.branching/merge-conflict-chunks.script index f53edd82..a156ea57 100755 --- a/tests.branching/merge-conflict-chunks.script +++ b/tests.branching/merge-conflict-chunks.script @@ -22,6 +22,8 @@ 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/merge-conflict-chunks.stdout" + cat "$SRCDIR/tests.branching/merge-conflict-chunks.stderr" >&2 exit 0 fi diff --git a/tests.branching/merge-conflict-stratum.script b/tests.branching/merge-conflict-stratum.script index 76e3309e..8f0a3170 100755 --- a/tests.branching/merge-conflict-stratum.script +++ b/tests.branching/merge-conflict-stratum.script @@ -21,7 +21,9 @@ set -eu # Disable test on versions of Python before 2.7. if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null then - exit 0 + cat "$SRCDIR/tests.branching/merge-conflict-stratum.stdout" + cat "$SRCDIR/tests.branching/merge-conflict-stratum.stderr" >&2 + exit 1 fi cd "$DATADIR/workspace" diff --git a/tests.branching/merge-with-chunk-renamed.script b/tests.branching/merge-with-chunk-renamed.script index 1ca2ee48..06969b70 100755 --- a/tests.branching/merge-with-chunk-renamed.script +++ b/tests.branching/merge-with-chunk-renamed.script @@ -19,6 +19,12 @@ set -eu +# Disable test on versions of Python before 2.7. +if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null +then + exit 0 +fi + # Create system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init diff --git a/tests.branching/merge-with-chunk-repo-moved.script b/tests.branching/merge-with-chunk-repo-moved.script index c67ccc6d..d14d586f 100755 --- a/tests.branching/merge-with-chunk-repo-moved.script +++ b/tests.branching/merge-with-chunk-repo-moved.script @@ -19,6 +19,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/merge-with-chunk-repo-moved.stderr" >&2 + exit 1 +fi + # Create system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init |