diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2013-01-21 17:16:23 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-01-21 17:27:30 +0000 |
commit | d1882582a3d0641a06f908c65de200e5b13ff5c2 (patch) | |
tree | cf80a101c822ddbf040f5f90b7169fd46e915d41 /tests.as-root | |
parent | 7172dca14d7306d79e93b97dcef3a006309f2e03 (diff) | |
parent | 053c0993bb62dd5e1a73d3367ea04c70874f3bd1 (diff) | |
download | morph-d1882582a3d0641a06f908c65de200e5b13ff5c2.tar.gz |
Merge branch 'jjardon/python_compatibility_fixes' of ssh://git.baserock.org/baserock/baserock/morph
This includes the following fixups:
- altering the bootstrap script to install ordereddict and simplejson.
- Adding a comment to clarify that it is intentional to use simplejson
if collections does not have OrderedDict
- Amending the copyright years to include 2013
Diffstat (limited to 'tests.as-root')
9 files changed, 9 insertions, 34 deletions
diff --git a/tests.as-root/build-handles-stratum-build-depends.script b/tests.as-root/build-handles-stratum-build-depends.script index 5df90bfc..1d1aa4ee 100755 --- a/tests.as-root/build-handles-stratum-build-depends.script +++ b/tests.as-root/build-handles-stratum-build-depends.script @@ -1,5 +1,5 @@ #!/bin/bash -# 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 @@ -18,9 +18,6 @@ set -eu -# Disable test on versions of Python before 2.7. -. "$SRCDIR/scripts/python-check" - . "$SRCDIR/tests.as-root/setup-build" cd "$DATADIR/workspace" diff --git a/tests.as-root/build-with-external-strata.script b/tests.as-root/build-with-external-strata.script index c3d84ec6..2d5d0fed 100755 --- a/tests.as-root/build-with-external-strata.script +++ b/tests.as-root/build-with-external-strata.script @@ -1,5 +1,5 @@ #!/bin/bash -# 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 @@ -19,9 +19,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" diff --git a/tests.as-root/build-with-push.script b/tests.as-root/build-with-push.script index 554edaaa..55ef54bb 100755 --- a/tests.as-root/build-with-push.script +++ b/tests.as-root/build-with-push.script @@ -1,5 +1,5 @@ #!/bin/bash -# 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 @@ -19,9 +19,6 @@ set -eu -# Disable test on versions of Python before 2.7. -source "$SRCDIR/scripts/python-check" - source "$SRCDIR/tests.as-root/setup-build" cd "$DATADIR/workspace/branch1" diff --git a/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script b/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script index 7b26e84e..829c3f96 100755 --- a/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script +++ b/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script @@ -1,6 +1,6 @@ #!/bin/bash # -# 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. -source "$SRCDIR/scripts/python-check" - source "$SRCDIR/tests.as-root/setup-build" # Build once. diff --git a/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script b/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script index 73682736..fa8159cc 100755 --- a/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script +++ b/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script @@ -1,5 +1,5 @@ #!/bin/bash -# 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. -source "$SRCDIR/scripts/python-check" - source "$SRCDIR/tests.as-root/setup-build" # Build the linux system from the system branch. diff --git a/tests.as-root/building-a-system-branch-works-anywhere.script b/tests.as-root/building-a-system-branch-works-anywhere.script index 3f96e00e..87b49199 100755 --- a/tests.as-root/building-a-system-branch-works-anywhere.script +++ b/tests.as-root/building-a-system-branch-works-anywhere.script @@ -1,6 +1,6 @@ #!/bin/bash # -# 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. -source "$SRCDIR/scripts/python-check" - source "$SRCDIR/tests.as-root/setup-build" # Build from the workspace root. diff --git a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script index 8bf25dee..088e6925 100755 --- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script +++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2011, 2012 Codethink Limited +# Copyright (C) 2011, 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,8 +21,6 @@ set -eu -. "$SRCDIR/scripts/python-check" - cache="$DATADIR/cache/artifacts" arch=$(uname -m) diff --git a/tests.as-root/tarball-image-is-sensible.script b/tests.as-root/tarball-image-is-sensible.script index 46510252..2a9044b7 100755 --- a/tests.as-root/tarball-image-is-sensible.script +++ b/tests.as-root/tarball-image-is-sensible.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,8 +21,6 @@ set -eu -. "$SRCDIR/scripts/python-check" - . "$SRCDIR/scripts/fix-committer-info" tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact \ diff --git a/tests.as-root/unimportant-morphology-contents-do-not-change-cache-keys.script b/tests.as-root/unimportant-morphology-contents-do-not-change-cache-keys.script index 27adf8c6..44b261d2 100755 --- a/tests.as-root/unimportant-morphology-contents-do-not-change-cache-keys.script +++ b/tests.as-root/unimportant-morphology-contents-do-not-change-cache-keys.script @@ -1,6 +1,6 @@ #!/bin/bash # -# 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. -source "$SRCDIR/scripts/python-check" - source "$SRCDIR/tests.as-root/setup-build" # Build once. |