summaryrefslogtreecommitdiff
path: root/check
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-01-29 13:50:46 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-01-29 14:32:49 +0000
commite06eafcbf0784271f51c0936852d1e97c0ccce8b (patch)
treee7e914cd82348e79b7662e6bd06851a0100e7751 /check
parent63f608d7c05095c16d1a8863b13c55634c0cae8b (diff)
downloadmorph-e06eafcbf0784271f51c0936852d1e97c0ccce8b.tar.gz
Make yaml be an optional dependency
This can go away when we have made a release with yaml in it, and its staging filler.
Diffstat (limited to 'check')
-rwxr-xr-xcheck9
1 files changed, 8 insertions, 1 deletions
diff --git a/check b/check
index 7288e55f..3ee752a4 100755
--- a/check
+++ b/check
@@ -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 ];