summaryrefslogtreecommitdiff
path: root/check
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2014-04-25 11:57:04 +0000
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2014-04-25 11:57:04 +0000
commitb72a94ff1b31952577815839e91e410a8384d981 (patch)
treeb114d16dcefb3fb12f90ef0d9d3273d5c5f425b7 /check
parentf0a8a3137b3a8a1bbe3c5055cb4cfb175ecde52b (diff)
downloadmorph-b72a94ff1b31952577815839e91e410a8384d981.tar.gz
Exit check as soon as we have an error
Diffstat (limited to 'check')
-rwxr-xr-xcheck8
1 files changed, 2 insertions, 6 deletions
diff --git a/check b/check
index 77d4e826..82774119 100755
--- a/check
+++ b/check
@@ -92,13 +92,12 @@ export PYTHONPATH
# Run the style checks
-errors=0
if "$run_style" && [ -d .git ];
then
echo "Checking copyright statements"
if ! (git ls-files --cached -z |
xargs -0r scripts/check-copyright-year); then
- errors=1
+ exit 1
fi
echo 'Checking source code for silliness'
@@ -107,12 +106,9 @@ then
grep -Ev 'tests[^/]*/.*\.std(out|err)' |
grep -vF 'tests.build/build-system-autotools.script' |
xargs -r scripts/check-silliness); then
- errors=1
+ exit 1
fi
fi
-if [ "$errors" != 0 ]; then
- exit "$errors"
-fi
# Clean up artifacts from previous (possibly failed) runs, build,
# and run the tests.