From 155d64ba6dd114fed162bb575845ebd696b5389c Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Thu, 8 Mar 2007 17:54:38 -0700 Subject: [PATCH] add test-pyfec target, not added to the main 'test' target because it adds 20 seconds to the test run --- Makefile | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 1bd5f638..c1742b4c 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,17 @@ default: build BASE=$(shell pwd) PYTHON=python +INSTDIR=$(BASE)/instdir/lib/python$(shell $(PYTHON) -c 'import sys;print sys.version_info[0]').$(shell $(PYTHON) -c 'import sys;print sys.version_info[1]')/site-packages + +show-instdir: + @echo $(INSTDIR) + +ifneq ($(PYTHONPATH),) +PP=PYTHONPATH=${PYTHONPATH}:$(INSTDIR) +else +PP=PYTHONPATH=$(INSTDIR) +endif + .PHONY: build build: build-pyfec build-Crypto $(PYTHON) setup.py install --prefix=$(BASE)/instdir @@ -11,25 +22,19 @@ build: build-pyfec build-Crypto build-pyfec: cd src/pyfec && $(PYTHON) ./setup.py install --prefix=$(BASE)/instdir +test-pyfec: + $(PP) $(PYTHON) src/pyfec/fec/test/test_pyfec.py + clean-pyfec: cd src/pyfec && python ./setup.py clean + build-Crypto: cd src/Crypto && $(PYTHON) ./setup.py install --prefix=$(BASE)/instdir clean-Crypto: cd src/Crypto && python ./setup.py clean -INSTDIR=$(BASE)/instdir/lib/python$(shell $(PYTHON) -c 'import sys;print sys.version_info[0]').$(shell $(PYTHON) -c 'import sys;print sys.version_info[1]')/site-packages - -show-instdir: - @echo $(INSTDIR) - -ifneq ($(PYTHONPATH),) -PP=PYTHONPATH=${PYTHONPATH}:$(INSTDIR) -else -PP=PYTHONPATH=$(INSTDIR) -endif .PHONY: run-queen run-client test -- 2.45.2