summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile10
-rwxr-xr-xcheck15
2 files changed, 15 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index dd3c9db..778db60 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,3 @@ all: genbackupdata.1
genbackupdata.1: genbackupdata.1.in genbackupdata
./genbackupdata --generate-manpage=genbackupdata.1.in > genbackupdata.1
-
-check:
- python -m CoverageTestRunner --ignore-missing-from without-tests
- rm -f .coverage
- cmdtest tests
- pep8 genbackupdata genbackupdatalib
-
-clean:
- rm -rf *.py[co] */*.py[co] build dist MANIFEST
- rm -f blackboxtest.log blackboxtest-genbackupdata.log
diff --git a/check b/check
index 57e3b26..62b415d 100755
--- a/check
+++ b/check
@@ -2,6 +2,16 @@
set -eu
+# Run unit tests.
+python -m CoverageTestRunner --ignore-missing-from without-tests
+rm -f .coverage
+
+
+
+# Run yarn.
+
+# We need to set PYTHONPATH so that yarnstep.py is found in the
+# IMPLEMENTS when yarn runs them.
if env | grep '^PYTHONPATH=' > /dev/null
then
PYTHONPATH="$PYTHONPATH:."
@@ -11,3 +21,8 @@ fi
yarn --env "PYTHONPATH=$PYTHONPATH" \
--shell python2 --shell-arg '' manual.yarn "$@"
+
+
+# Run static Python checking tools.
+
+pep8 genbackupdata genbackupdatalib