tweak all-tests:

[nepi.git] / Makefile

diff --git a/Makefile b/Makefile
index 0354813..ed7f32d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,41 +1,43 @@
+PYTHON     = python
 SRCDIR      = $(CURDIR)/src
 TESTDIR     = $(CURDIR)/test
 TESTLIB     = $(TESTDIR)/lib
-BUILDDIR    = $(CURDIR)/build
+BUILDDIR    = $(CURDIR)/build/lib
 DISTDIR     = $(CURDIR)/dist
 
-SUBBUILDDIR = $(shell python -c 'import distutils.util, sys; \
-             print "lib.%s-%s" % (distutils.util.get_platform(), \
-             sys.version[0:3])')
-PYTHON25 := $(shell python -c 'import sys; v = sys.version_info; \
-    print (1 if v[0] <= 2 and v[1] <= 5 else 0)')
-
-ifeq ($(PYTHON25),0)
-BUILDDIR := $(BUILDDIR)/$(SUBBUILDDIR)
-else
-BUILDDIR := $(BUILDDIR)/lib
-endif
-
 PYPATH = $(BUILDDIR):$(TESTLIB):$(PYTHONPATH)
 COVERAGE = $(or $(shell which coverage), $(shell which python-coverage), \
           coverage)
 
 all: clean
-       PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" ./setup.py build
+       PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" $(PYTHON) ./setup.py build
 
 install: all
-       PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" ./setup.py install
+       PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" $(PYTHON) ./setup.py install
 
 test: all
        retval=0; \
               for i in `find "$(TESTDIR)" -iname '*.py' -perm -u+x -type f`; do \
               echo $$i; \
-              PYTHONPATH="$(PYPATH)" $$i -v || retval=$$?; \
+              PYTHONPATH="$(PYPATH)" $(PYTHON) $$i -v || retval=$$?; \
               done; exit $$retval
 
+ifeq ($(file),)
+test-one:
+       echo Run $(make) $@ file=test/some/path
+else
 test-one: all
        echo $(file) $(case)
-       PYTHONPATH="$(PYPATH)" $(file) $(case)
+       PYTHONPATH="$(PYPATH)" $(PYTHON) $(file) $(case)
+endif
+
+
+all-tests: test-app test-node
+
+test-app:
+       $(MAKE) test-one file=test/resources/linux/application.py case=$(case)
+test-node:
+       $(MAKE) test-one file=test/resources/linux/node.py case=$(case)
 
 coverage: all
        rm -f .coverage
@@ -48,7 +50,7 @@ coverage: all
        rm -f .coverage
 
 clean:
-       rm -f `find -name \*.pyc` .coverage *.pcap
+       rm -f $$(find . -name '*.pyc') .coverage *.pcap
        rm -rf "$(BUILDDIR)"
 
 distclean: clean