Adding ns3wrapper debug to dump ns-3 experiment execution to a runnable script

[nepi.git] / Makefile

diff --git a/Makefile b/Makefile
index f3b1e06..24e5b15 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 SRCDIR      = $(CURDIR)/src
 TESTDIR     = $(CURDIR)/test
-TESTLIB     = $(TESTDIR)/lib
+TESTLIB  = $(TESTDIR)/lib
 BUILDDIR    = $(CURDIR)/build
 DISTDIR     = $(CURDIR)/dist
 
@@ -17,37 +17,40 @@ else
 BUILDDIR := $(BUILDDIR)/lib
 endif
 
-#PYPATH = $(BUILDDIR):$(TESTLIB):$(PYTHONPATH)
-PYPATH = "../nepi2/src:../nepi2/test/lib:../netns/src"
+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 || retval=$$?; \
+              PYTHONPATH="$(PYPATH)" $$i -v || retval=$$?; \
               done; exit $$retval
 
+test-one: all
+       echo $(file) $(case)
+       PYTHONPATH="$(PYPATH)" python $(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; \
+               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)"