diff options
Diffstat (limited to 'tests.merging')
| -rwxr-xr-x | tests.merging/basic.script | 5 | ||||
| -rwxr-xr-x | tests.merging/conflict-chunks.script | 5 | ||||
| -rwxr-xr-x | tests.merging/conflict-stratum-field-ordering.script | 5 | ||||
| -rwxr-xr-x | tests.merging/move-chunk-repo.script | 5 | ||||
| -rwxr-xr-x | tests.merging/rename-chunk.script | 5 | ||||
| -rwxr-xr-x | tests.merging/rename-stratum.script | 5 |
6 files changed, 6 insertions, 24 deletions
diff --git a/tests.merging/basic.script b/tests.merging/basic.script index 0dbc2367..6d01ba16 100755 --- a/tests.merging/basic.script +++ b/tests.merging/basic.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 diff --git a/tests.merging/conflict-chunks.script b/tests.merging/conflict-chunks.script index e5f6618d..5a0c5f52 100755 --- a/tests.merging/conflict-chunks.script +++ b/tests.merging/conflict-chunks.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" # Create stable branch to merge TO diff --git a/tests.merging/conflict-stratum-field-ordering.script b/tests.merging/conflict-stratum-field-ordering.script index f5bfb4b8..c96c59ab 100755 --- a/tests.merging/conflict-stratum-field-ordering.script +++ b/tests.merging/conflict-stratum-field-ordering.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 @@ -26,9 +26,6 @@ set -eu -# Disable test on versions of Python before 2.7. -. "$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 7b96bc81..3a00015b 100755 --- a/tests.merging/move-chunk-repo.script +++ b/tests.merging/move-chunk-repo.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" - # Create system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init diff --git a/tests.merging/rename-chunk.script b/tests.merging/rename-chunk.script index ef4c96a2..8c323798 100755 --- a/tests.merging/rename-chunk.script +++ b/tests.merging/rename-chunk.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" - # Create system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init diff --git a/tests.merging/rename-stratum.script b/tests.merging/rename-stratum.script index c5c92823..ba759fa3 100755 --- a/tests.merging/rename-stratum.script +++ b/tests.merging/rename-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 @@ -21,9 +21,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 |