X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=e8cbf68d3aa88f807feae21474fe10aa104a48e7;hb=refs%2Fheads%2Ftests;hp=45a09ded719431e49ba22a0c585e48d267e37e33;hpb=54f157ab90a37ae410dd558a7323650d8394c59b;p=nepi.git

diff --git a/Makefile b/Makefile
index 45a09ded..e8cbf68d 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,22 @@ 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
+
+
+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 +49,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
@@ -69,7 +70,7 @@ dist: MANIFEST
 # this assumes you have an entry 'pypi' in your .pypirc
 # see pypi documentation on how to create .pypirc
 PYPI_TARGET=pypi
-PYPI_TARBALL_HOST=root@build.onelab.eu
+PYPI_TARBALL_HOST=mario@build.onelab.eu
 PYPI_TARBALL_TOPDIR=/build/nepi
 
 VERSION=$(shell cat VERSION)
@@ -83,7 +84,6 @@ pypi:
 	@if [ -n "$(ALREADY_SET)" ] ; then echo "tag $(VERSIONTAG) already set"; false; fi
 	@echo "You are about to release $(VERSION) - OK (Ctrl-c if not) ? " ; read _
 	git tag $(VERSIONTAG)
-	./setup.py sdist upload -r pypi
 	#./setup.py sdist upload -r pypi
 	./setup.py sdist
 	twine upload dist/* -r pypi