Merge branch 'baserock/richardmaw/fix-distbuild-v3'

Reviewed-by: Sam Thursfield
Reviewed-by: Richard Ipsum
Reviewed-by: Pedro Alvarez

1 files changed, 0 insertions, 30 deletions

diff --git a/check b/check
index 82774119..dc4f96bc 100755
--- a/check
+++ b/check
@@ -153,20 +153,6 @@ else
     echo "NOT RUNNING test.branching"
 fi
 
-if false && "$run_cmdtests"
-then
-    cmdtest tests.merging
-else
-    echo "NOT RUNNING test.merging"
-fi
-
-if "$run_cmdtests"
-then
-    cmdtest tests.deploy
-else
-    echo "NOT RUNNING test.deploy"
-fi
-
 # Building systems requires the 'filter' parameter of tarfile.TarFile.add():
 # this was introduced in Python 2.7
 if ! "$run_cmdtests"; then
@@ -176,19 +162,3 @@ elif ! (python --version 2>&1 | grep -q '^Python 2\.[78]'); then
 else
     cmdtest tests.build
 fi
-
-# The as-root tests use YAML morphologies, so they require the PyYAML module.
-if ! "$run_slow_cmdtests"; then
-    echo "NOT RUNNING tests.as-root"
-elif [ $(whoami) != root ] || ! command -v mkfs.btrfs > /dev/null; then
-    echo "NOT RUNNING tests.as-root (no btrfs)"
-elif ! python -c "
-import morphlib, sys
-if not morphlib.got_yaml:
-    sys.exit(1)
-" > /dev/null 2>&1
-then
-    echo "NOT RUNNING tests.as-root (requires PyYAML)"
-else
-    cmdtest tests.as-root
-fi