summaryrefslogtreecommitdiff
path: root/tests.branching
diff options
context:
space:
mode:
Diffstat (limited to 'tests.branching')
-rwxr-xr-xtests.branching/ambiguous-refs.script5
-rwxr-xr-xtests.branching/edit-updates-stratum-build-depends.script5
-rwxr-xr-xtests.branching/edit-updates-stratum.script5
-rwxr-xr-xtests.branching/petrify-no-double-petrify.script5
-rwxr-xr-xtests.branching/petrify.script5
-rwxr-xr-xtests.branching/workflow-petrify.script5
6 files changed, 6 insertions, 24 deletions
diff --git a/tests.branching/ambiguous-refs.script b/tests.branching/ambiguous-refs.script
index 0ea8a55f..cce7b52e 100755
--- a/tests.branching/ambiguous-refs.script
+++ b/tests.branching/ambiguous-refs.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2012 Codethink Limited
+# Copyright (C) 2012-2013 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,9 +23,6 @@
set -eu
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
. "$SRCDIR/scripts/fix-committer-info"
cd "$DATADIR/morphs"
diff --git a/tests.branching/edit-updates-stratum-build-depends.script b/tests.branching/edit-updates-stratum-build-depends.script
index 525822c9..83d5e2a4 100755
--- a/tests.branching/edit-updates-stratum-build-depends.script
+++ b/tests.branching/edit-updates-stratum-build-depends.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2012 Codethink Limited
+# Copyright (C) 2012-2013 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,9 +20,6 @@
set -eu
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
# Add a second stratum that build-depends on the first. We can ignore the fact
# that both strata contain the same chunk for this test.
cd "$DATADIR/morphs"
diff --git a/tests.branching/edit-updates-stratum.script b/tests.branching/edit-updates-stratum.script
index c2716cab..bfe16c8b 100755
--- a/tests.branching/edit-updates-stratum.script
+++ b/tests.branching/edit-updates-stratum.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2012 Codethink Limited
+# Copyright (C) 2012-2013 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,9 +20,6 @@
set -eu
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
# 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 25c977b6..c263e590 100755
--- a/tests.branching/petrify-no-double-petrify.script
+++ b/tests.branching/petrify-no-double-petrify.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2012 Codethink Limited
+# Copyright (C) 2012-2013 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,9 +21,6 @@
set -eu
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
cd "$DATADIR/workspace"
"$SRCDIR/scripts/test-morph" init
"$SRCDIR/scripts/test-morph" branch test:morphs test/petrify
diff --git a/tests.branching/petrify.script b/tests.branching/petrify.script
index 6b6581d3..76c906c3 100755
--- a/tests.branching/petrify.script
+++ b/tests.branching/petrify.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2012 Codethink Limited
+# Copyright (C) 2012-2013 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,9 +21,6 @@
set -eu
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
. "$SRCDIR/tests.branching/setup-second-chunk"
cd "$DATADIR/workspace"
diff --git a/tests.branching/workflow-petrify.script b/tests.branching/workflow-petrify.script
index b84dd977..79279340 100755
--- a/tests.branching/workflow-petrify.script
+++ b/tests.branching/workflow-petrify.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2012 Codethink Limited
+# Copyright (C) 2012-2013 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,9 +21,6 @@
set -eu
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
. "$SRCDIR/scripts/setup-3rd-party-strata"
cd "$DATADIR/workspace"