From e06eafcbf0784271f51c0936852d1e97c0ccce8b Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Tue, 29 Jan 2013 13:50:46 +0000 Subject: Make yaml be an optional dependency This can go away when we have made a release with yaml in it, and its staging filler. --- check | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'check') 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 ]; -- cgit v1.2.1