summaryrefslogtreecommitdiff
path: root/check
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2016-03-31 11:44:02 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2016-03-31 11:44:02 +0100
commitffdfee2c78462b53ae9af1e414cc71a8734e606a (patch)
treea191f4c60261e974a5124bf7207e6c19c0d3356f /check
parente36043737201a645897d366ba0eb44e91748d16e (diff)
downloadmorph-ffdfee2c78462b53ae9af1e414cc71a8734e606a.tar.gz
Fix issues running tests outside a Baserock system
Warn if 'Yarn' isn't available, since this means most tests don't run. Also fix some issue with missing .coverage file that I hit. Change-Id: I675354799bbdefe1ced0f5a0c5221b103de29a1c
Diffstat (limited to 'check')
-rwxr-xr-xcheck17
1 files changed, 11 insertions, 6 deletions
diff --git a/check b/check
index 276c0337..4a13d1c9 100755
--- a/check
+++ b/check
@@ -2,7 +2,7 @@
#
# Run test suite for morph.
#
-# Copyright (C) 2011-2015 Codethink Limited
+# Copyright (C) 2011-2016 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
@@ -138,9 +138,14 @@ fi
# explicitly which environment variables to set in addition to the set
# it sets anyway.
-if "$run_yarns" && command -v yarn > /dev/null
-then
- yarn --env "PYTHONPATH=$PYTHONPATH" --env "TMPDIR=$TMPDIR" $snapshot \
- --tempdir "$TMPDIR" -s yarns/morph.shell-lib \
- yarns/*.yarn
+if "$run_yarns"; then
+ if command -v yarn > /dev/null; then
+ yarn --env "PYTHONPATH=$PYTHONPATH" --env "TMPDIR=$TMPDIR" $snapshot \
+ --tempdir "$TMPDIR" -s yarns/morph.shell-lib \
+ yarns/*.yarn
+ else
+ echo "WARNING: 'yarn' scenario test tool (part of 'cmdtest' " \
+ "package) was not found." >&2
+ echo "Not running Yarn tests." >&2
+ fi
fi