diff options
author | Richard Maw <richard.maw@gmail.com> | 2014-10-08 13:17:00 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@gmail.com> | 2014-10-08 13:17:00 +0000 |
commit | 8b85d60e9294713097928d52b8ca4cfe5d5f801a (patch) | |
tree | 0de7707ca779b47f7c3882b5627cb3dedaf09a6a /check | |
parent | d3be16e282bfdf7a8db8538339719161725b5cad (diff) | |
parent | 9034cd11ee2b9c050f2301c84627a3d7b2e67895 (diff) | |
download | morph-8b85d60e9294713097928d52b8ca4cfe5d5f801a.tar.gz |
Merge branch 'baserock/richardmaw/fix-distbuild-v3'
Reviewed-by: Sam Thursfield
Reviewed-by: Richard Ipsum
Reviewed-by: Pedro Alvarez
Diffstat (limited to 'check')
-rwxr-xr-x | check | 30 |
1 files changed, 0 insertions, 30 deletions
@@ -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 |