From c821535c6290e47cabf85691b41d6b7dd20a7982 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Thu, 27 Sep 2012 18:55:17 +0100 Subject: Fix merge tests on Squeeze, by disabling them correctly --- tests.branching/merge-with-chunk-repo-moved.script | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tests.branching/merge-with-chunk-repo-moved.script') 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 -- cgit v1.2.1