Browse Source

Cleanup Makefile; make tests run through setup.py when outside emacs

tags/nilmdb-1.2
Jim Paris 9 years ago
parent
commit
7d44f4eaa0
1 changed files with 7 additions and 1 deletions
  1. +7
    -1
      Makefile

+ 7
- 1
Makefile View File

@@ -21,7 +21,13 @@ lint:
pylint --rcfile=.pylintrc nilmdb

test:
ifeq ($(INSIDE_EMACS), t)
# Use the slightly more flexible script
python tests/runtests.py
else
# Let setup.py check dependencies, build stuff, and run the test
python setup.py nosetests
endif

clean::
find . -name '*pyc' | xargs rm -f
@@ -33,4 +39,4 @@ clean::
gitclean::
git clean -dXf

.PHONY: all build dist sdist install docs lint test clean
.PHONY: all version build dist sdist install docs lint test clean

Loading…
Cancel
Save