X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=blobdiff_plain;f=Makefile;h=aa5cb1d22298de60dedcdfe6e8181fa67ca04d81;hp=bafeed9260f782f1cafb890ac3a1a8db465adc84;hb=342187d6e7ce34d4fdf403952637659b93aa4bee;hpb=830e7dd1a7878c57a45d6e53d638b0fe498034b2

diff --git a/Makefile b/Makefile
index bafeed92..aa5cb1d2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,9 @@
 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)
@@ -33,9 +21,19 @@ test: all
 	       PYTHONPATH="$(PYPATH)" $$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)
+endif
+
+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 +46,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