diff --git a/Makefile b/Makefile index a1430e1b1f689df8a3c048523e8c888246c03f3b..140822a63eb08e10d271bfaa5a3fd2aaaaaf3588 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ default: groupConnectivity.so clean_obj +.PHONY: test + groupConnectivity.so: groupConnectivity.pyx group-connectivity.h setup.py compileTimeOptions.h generateCompileTimeOptions.sh rings.h fast-array.h twoCuts.h parmap.py groupConnectivityNaive.py ./generateCompileTimeOptions.sh > options.h python setup.py build_ext @@ -12,3 +14,7 @@ clean_obj: clean: clean_obj rm -f groupConnectivity.so +test: *.py + python2 parmap.py + python2 groupConnectivityNaive.py + diff --git a/groupConnectivityNaive.py b/groupConnectivityNaive.py index 76b0fa087a6a0af128613c2eea7ccfe27cfcab91..8f15d7153f3cf3e3ef8850ce5de463b8684ecba2 100644 --- a/groupConnectivityNaive.py +++ b/groupConnectivityNaive.py @@ -151,8 +151,10 @@ def myHistogram(data): return s if __name__ == "__main__": - import doctest - ret = doctest.testmod() - print "%i tests of %i failed." % ret + import doctest + (f, t) = doctest.testmod() + print "%s: %i tests of %i failed." % (__file__, f, t) + if f > 0: + exit(1)