X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=340f097400a447d92260c151c82bcbbc1177276e;hb=70c33a3b0fe396cce12d3d1c0eb6cf40ce537a95;hp=12570b28b673f5d6eb8e1fdb8aaeb86753b39fa0;hpb=17c85d161444f91bc5a34eea4c4a150fe3927f4b;p=nepi.git

diff --git a/Makefile b/Makefile
index 12570b28..340f0974 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,7 @@ else
 BUILDDIR := $(BUILDDIR)/lib
 endif
 
-#PYPATH = $(BUILDDIR):$(TESTLIB):$(PYTHONPATH)
-PYPATH = "../nepi2/src:../nepi2/test/util:../netns/src"
+PYPATH = $(BUILDDIR):$(TESTLIB):$(PYTHONPATH)
 COVERAGE = $(or $(shell which coverage), $(shell which python-coverage), \
 	   coverage)
 
@@ -30,16 +29,16 @@ install: all
 
 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 || retval=$$?; \
+	       TESTLIBPATH="$(TESTLIB)" PYTHONPATH="$(PYPATH)" $$i -v || retval=$$?; \
 	       done; exit $$retval
 
 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; \
+		TESTLIBPATH="$(TESTLIB)" PYTHONPATH="$(PYPATH)" $(COVERAGE) -x $$i -v; \
 		done
 	$(COVERAGE) -c
 	$(COVERAGE) -r -m `find "$(BUILDDIR)" -name \\*.py -type f`