X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=24e5b158ef90b3b6483e29226ed03dafa93095bc;hb=7e3f07daf215038b5472497aad558d23ed69ddec;hp=afebb0b3c533c58c4810e3758814744fac91df90;hpb=f552d51308faee21a03833c52537aaa7afbbee86;p=nepi.git

diff --git a/Makefile b/Makefile
index afebb0b3..24e5b158 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 SRCDIR      = $(CURDIR)/src
 TESTDIR     = $(CURDIR)/test
-TESTLIB     = $(TESTDIR)/lib
+TESTLIB  = $(TESTDIR)/lib
 BUILDDIR    = $(CURDIR)/build
 DISTDIR     = $(CURDIR)/dist
 
@@ -21,32 +21,36 @@ PYPATH = $(BUILDDIR):$(TESTLIB):$(PYTHONPATH)
 COVERAGE = $(or $(shell which coverage), $(shell which python-coverage), \
 	   coverage)
 
-all:
-	./setup.py build
+all: clean
+	PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" ./setup.py build
 
 install: all
-	./setup.py install
+	PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" ./setup.py install
 
 test: all
 	retval=0; \
-	       for i in `find "$(TESTDIR)" -perm -u+x -type f`; do \
+	       for i in `find "$(TESTDIR)" -iname '*.py' -perm -u+x -type f`; do \
 	       echo $$i; \
-	       TESTLIBPATH="$(TESTLIB)" PYTHONPATH="$(PYPATH)" $$i -v || retval=$$?; \
+	       PYTHONPATH="$(PYPATH)" $$i -v || retval=$$?; \
 	       done; exit $$retval
 
+test-one: all
+	echo $(file) $(case)
+	PYTHONPATH="$(PYPATH)" python $(file) $(case)
+
 coverage: all
 	rm -f .coverage
 	for i in `find "$(TESTDIR)" -perm -u+x -type f`; do \
 		set -e; \
-		TESTLIBPATH="$(TESTLIB)" PYTHONPATH="$(PYPATH)" $(COVERAGE) -x $$i; \
+		PYTHONPATH="$(PYPATH)" $(COVERAGE) -x $$i -v; \
 		done
 	$(COVERAGE) -c
 	$(COVERAGE) -r -m `find "$(BUILDDIR)" -name \\*.py -type f`
 	rm -f .coverage
 
 clean:
-	./setup.py clean
 	rm -f `find -name \*.pyc` .coverage *.pcap
+	rm -rf "$(BUILDDIR)"
 
 distclean: clean
 	rm -rf "$(DISTDIR)"