diff options
Diffstat (limited to 'tests.branching')
| -rwxr-xr-x | tests.branching/merge-not-to-master.script | 6 | ||||
| -rwxr-xr-x | tests.branching/merge-with-stratum-renamed.script | 7 | ||||
| -rwxr-xr-x | tests.branching/merge.script | 7 | ||||
| -rwxr-xr-x | tests.branching/petrify-no-double-petrify.script | 2 | ||||
| -rwxr-xr-x | tests.branching/workflow-petrify.script | 7 |
5 files changed, 28 insertions, 1 deletions
diff --git a/tests.branching/merge-not-to-master.script b/tests.branching/merge-not-to-master.script index 3758ce3e..824e89b6 100755 --- a/tests.branching/merge-not-to-master.script +++ b/tests.branching/merge-not-to-master.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 + cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init diff --git a/tests.branching/merge-with-stratum-renamed.script b/tests.branching/merge-with-stratum-renamed.script index 8df2cd18..6daac566 100755 --- a/tests.branching/merge-with-stratum-renamed.script +++ b/tests.branching/merge-with-stratum-renamed.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-stratum-renamed.stderr" 1>&2 + exit 1 +fi + # Create system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init diff --git a/tests.branching/merge.script b/tests.branching/merge.script index 21a30116..9dbc2d84 100755 --- a/tests.branching/merge.script +++ b/tests.branching/merge.script @@ -18,6 +18,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.stdout" + exit 0 +fi + # Create system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init diff --git a/tests.branching/petrify-no-double-petrify.script b/tests.branching/petrify-no-double-petrify.script index be72ba6b..3e7ac412 100755 --- a/tests.branching/petrify-no-double-petrify.script +++ b/tests.branching/petrify-no-double-petrify.script @@ -24,7 +24,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/petrify.stdout" + cat "$SRCDIR/tests.branching/petrify-no-double-petrify.stdout" exit 0 fi diff --git a/tests.branching/workflow-petrify.script b/tests.branching/workflow-petrify.script index 887de622..d83eb06b 100755 --- a/tests.branching/workflow-petrify.script +++ b/tests.branching/workflow-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/workflow-petrify.stdout" + exit 0 +fi + . "$SRCDIR/tests.branching/setup-3rd-party-strata" cd "$DATADIR/workspace" |