X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=01a1d3bf021f4b6a30d49eb34e1e176b3839aeb3;hb=0e38569d30fcbff835b8dbb96c54177ae970d558;hp=7f5914812bcae1b371ed323547c1f87eb22120b1;hpb=c34c9f443736689404f7f9e2b3b140192147c152;p=nepi.git

diff --git a/Makefile b/Makefile
index 7f591481..01a1d3bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,9 @@
 SRCDIR      = $(CURDIR)/src
 TESTDIR     = $(CURDIR)/test
-TESTLIB     = $(TESTDIR)/lib
+TESTLIB  = $(TESTDIR)/lib
 BUILDDIR    = $(CURDIR)/build
 DISTDIR     = $(CURDIR)/dist
 
-# stupid distutils, it's broken in so many ways
 SUBBUILDDIR = $(shell python -c 'import distutils.util, sys; \
 	      print "lib.%s-%s" % (distutils.util.get_platform(), \
 	      sys.version[0:3])')
@@ -21,32 +20,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)" $(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 -v; \
+		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)"