diff options
Diffstat (limited to 'tests.merging/conflict-stratum-field-ordering.script')
| -rwxr-xr-x | tests.merging/conflict-stratum-field-ordering.script | 7 |
1 files changed, 1 insertions, 6 deletions
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 |