summaryrefslogtreecommitdiff
path: root/tests.as-root
diff options
context:
space:
mode:
authorJavier Jardón <javier.jardon@codethink.co.uk>2013-01-18 18:16:14 +0000
committerJavier Jardón <javier.jardon@codethink.co.uk>2013-01-18 18:23:53 +0000
commit211b2a722feacb145e016b8ddb8f5f6e51339272 (patch)
treea5136ce56a231140ac761c3e6e5c9a15c25c4c89 /tests.as-root
parent9238543df7efc0adfea43e43e3bfb3c3f32ec3d5 (diff)
downloadmorph-211b2a722feacb145e016b8ddb8f5f6e51339272.tar.gz
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
Diffstat (limited to 'tests.as-root')
-rwxr-xr-xtests.as-root/build-handles-stratum-build-depends.script3
-rwxr-xr-xtests.as-root/build-with-external-strata.script3
-rwxr-xr-xtests.as-root/build-with-push.script3
-rwxr-xr-xtests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script3
-rwxr-xr-xtests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script3
-rwxr-xr-xtests.as-root/building-a-system-branch-works-anywhere.script3
-rwxr-xr-xtests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script2
-rwxr-xr-xtests.as-root/tarball-image-is-sensible.script2
-rwxr-xr-xtests.as-root/unimportant-morphology-contents-do-not-change-cache-keys.script3
9 files changed, 0 insertions, 25 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..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.