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.merging | |
| parent | bd58d7bd96a35805e9e55a520250fcb369633d97 (diff) | |
| parent | 75453f4ce61e6ad9e44b39c3681b5ede133af447 (diff) | |
| download | morph-4a2b2aa38b85971b72c925eea5ca18767c63cc50.tar.gz | |
Merge branch 'baserock/richardmaw/fix-python-check'
Diffstat (limited to 'tests.merging')
| -rwxr-xr-x | tests.merging/basic.script | 5 | ||||
| -rwxr-xr-x | tests.merging/conflict-chunks.script | 7 | ||||
| -rwxr-xr-x | tests.merging/conflict-stratum-field-ordering.script | 7 | ||||
| -rwxr-xr-x | tests.merging/move-chunk-repo.script | 6 | ||||
| -rwxr-xr-x | tests.merging/rename-chunk.script | 5 | ||||
| -rwxr-xr-x | tests.merging/rename-stratum.script | 6 |
6 files changed, 6 insertions, 30 deletions
diff --git a/tests.merging/basic.script b/tests.merging/basic.script index 6b063a20..8eddcfdb 100755 --- a/tests.merging/basic.script +++ b/tests.merging/basic.script @@ -20,10 +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 - exit 0 -fi +. "$SRCDIR/scripts/python-check" cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init diff --git a/tests.merging/conflict-chunks.script b/tests.merging/conflict-chunks.script index a9b85989..37ee4fb8 100755 --- a/tests.merging/conflict-chunks.script +++ b/tests.merging/conflict-chunks.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 - cat "$SRCDIR/tests.merging/conflict-chunks.stdout" - cat "$SRCDIR/tests.merging/conflict-chunks.stderr" >&2 - exit 0 -fi +. "$SRCDIR/scripts/python-check" . "$SRCDIR/scripts/setup-3rd-party-strata" diff --git a/tests.merging/conflict-stratum-field-ordering.script b/tests.merging/conflict-stratum-field-ordering.script index 3c1dce1c..13ddf3fb 100755 --- a/tests.merging/conflict-stratum-field-ordering.script +++ b/tests.merging/conflict-stratum-field-ordering.script @@ -25,12 +25,7 @@ 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-stratum.stdout" - cat "$SRCDIR/tests.branching/merge-conflict-stratum.stderr" >&2 - exit 1 -fi +. "$SRCDIR/scripts/python-check" cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init diff --git a/tests.merging/move-chunk-repo.script b/tests.merging/move-chunk-repo.script index 1e3befbd..a203a824 100755 --- a/tests.merging/move-chunk-repo.script +++ b/tests.merging/move-chunk-repo.script @@ -20,11 +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 - cat "$SRCDIR/tests.merging/move-chunk-repo.stderr" >&2 - exit 1 -fi +. "$SRCDIR/scripts/python-check" # Create system branch. cd "$DATADIR/workspace" diff --git a/tests.merging/rename-chunk.script b/tests.merging/rename-chunk.script index fb76491b..a50a83bd 100755 --- a/tests.merging/rename-chunk.script +++ b/tests.merging/rename-chunk.script @@ -20,10 +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 - exit 0 -fi +. "$SRCDIR/scripts/python-check" # Create system branch. cd "$DATADIR/workspace" diff --git a/tests.merging/rename-stratum.script b/tests.merging/rename-stratum.script index 64fb7e15..b0e5d57e 100755 --- a/tests.merging/rename-stratum.script +++ b/tests.merging/rename-stratum.script @@ -20,11 +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 - cat "$SRCDIR/tests.merging/rename-stratum.stderr" 1>&2 - exit 1 -fi +. "$SRCDIR/scripts/python-check" # Create system branch. cd "$DATADIR/workspace" |