From 211b2a722feacb145e016b8ddb8f5f6e51339272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 18 Jan 2013 18:16:14 +0000 Subject: tests.as-root/*: Remove check to run only the teset with Python 2.7 As we use ordererdict for python < 2.7 as well See 37f8d84d7ab356169bf7c04bdecb39a61b85c88d --- tests.as-root/build-handles-stratum-build-depends.script | 3 --- tests.as-root/build-with-external-strata.script | 3 --- tests.as-root/build-with-push.script | 3 --- ...a-system-branch-multiple-times-doesnt-generate-new-artifacts.script | 3 --- .../building-a-system-branch-picks-up-uncommitted-changes.script | 3 --- tests.as-root/building-a-system-branch-works-anywhere.script | 3 --- tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script | 2 -- tests.as-root/tarball-image-is-sensible.script | 2 -- .../unimportant-morphology-contents-do-not-change-cache-keys.script | 3 --- 9 files changed, 25 deletions(-) (limited to 'tests.as-root') diff --git a/tests.as-root/build-handles-stratum-build-depends.script b/tests.as-root/build-handles-stratum-build-depends.script index 5df90bfc..c99c2c06 100755 --- a/tests.as-root/build-handles-stratum-build-depends.script +++ b/tests.as-root/build-handles-stratum-build-depends.script @@ -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..0b5b8a9d 100755 --- a/tests.as-root/build-with-external-strata.script +++ b/tests.as-root/build-with-external-strata.script @@ -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..cda47be6 100755 --- a/tests.as-root/build-with-push.script +++ b/tests.as-root/build-with-push.script @@ -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..3a4d5cf4 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 @@ -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..99bc576b 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 @@ -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..3aafb154 100755 --- a/tests.as-root/building-a-system-branch-works-anywhere.script +++ b/tests.as-root/building-a-system-branch-works-anywhere.script @@ -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..714fe720 100755 --- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script +++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script @@ -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..1338a39b 100755 --- a/tests.as-root/tarball-image-is-sensible.script +++ b/tests.as-root/tarball-image-is-sensible.script @@ -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..e30d7d09 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 @@ -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. -- cgit v1.2.1