diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-01-29 18:03:22 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-01-29 18:04:18 +0000 |
commit | ee01dea68ecd0822785ef574f7c2ddcb44d0cafa (patch) | |
tree | 49f08d357cc8ad068b36c1c9df7ead9d1b72d077 /check | |
parent | a50a5411db21f4cde449d1bb26f85b8bbee275ac (diff) | |
parent | e06eafcbf0784271f51c0936852d1e97c0ccce8b (diff) | |
download | morph-ee01dea68ecd0822785ef574f7c2ddcb44d0cafa.tar.gz |
Merge branch 'liw/soft-pyyaml-dep'
Merge commit fixes up a copyright year and removes EOL whitespace
Diffstat (limited to 'check')
-rwxr-xr-x | check | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -2,7 +2,7 @@ # # Run test suite for morph. # -# Copyright (C) 2011, 2012 Codethink Limited +# Copyright (C) 2011-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,16 @@ python setup.py clean check cmdtest tests cmdtest tests.branching cmdtest tests.merging -if [ $(whoami) = root ] && command -v mkfs.btrfs > /dev/null +if [ $(whoami) = root ] && command -v mkfs.btrfs > /dev/null && + python -c " +import morphlib, sys +if not morphlib.got_yaml: + sys.exit(1) +" > /dev/null 2>&1 then cmdtest tests.as-root +else + echo "NOT RUNNING tests.as-root" fi if [ -d .git ]; |