diff options
| author | Rob Austein <sra@hactrn.net> | 2010-12-30 06:28:27 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2010-12-30 06:28:27 +0000 |
| commit | b3783eb14322f2901db5b39216de9433806c5005 (patch) | |
| tree | f3a4f10ea5243acc035acc004758e39edc10d9ed | |
| parent | 6f6eefa8183c9d91c7c3f36925e14e68083dc735 (diff) | |
Platforms that require pywrap require it when running the test
programs too.
svn path=/rpkid/Makefile.in; revision=3590
| -rw-r--r-- | rpkid/Makefile.in | 6 | ||||
| -rw-r--r-- | rpkid/tests/Makefile.in | 26 |
2 files changed, 16 insertions, 16 deletions
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index 8162bee7..54423217 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -3,7 +3,7 @@ all: rpki/relaxng.py myrpki.rng rpki/relaxng.py: ../scripts/make-relaxng.py left-right-schema.rng up-down-schema.rng publication-schema.rng - python ../scripts/make-relaxng.py >$@.tmp + @PYTHON@ ../scripts/make-relaxng.py >$@.tmp mv $@.tmp $@ left-right-schema.rng: left-right-schema.rnc @@ -35,7 +35,7 @@ relaxng: left-right-schema.rng up-down-schema.rng publication-schema.rng xmllint --noout --relaxng publication-schema.rng tests/publication-protocol-samples/*.xml unit-tests: all - PWD=`pwd`; for i in rpki/*.py; do echo "[$$i]"; PYTHONPATH=$$PWD python $$i; done + PWD=`pwd`; for i in rpki/*.py; do echo "[$$i]"; PYTHONPATH=$$PWD @PYWRAP@ $$i; done all-tests:: unit-tests @@ -46,7 +46,7 @@ test all-tests parse-test profile yamltest:: irbe_cli.usage: irbe_cli.py - python irbe_cli.py --help | sed 's/^/ /' >$@ + @PYTHON@ irbe_cli.py --help | sed 's/^/ /' >$@ tags: Makefile find . -type f \( -name '*.py' -o -name '*.sql' -o -name '*.rnc' -o -name '*.py.in' \) ! -name relaxng.py ! -name __doc__.py | etags - diff --git a/rpkid/tests/Makefile.in b/rpkid/tests/Makefile.in index d194e546..01d16f84 100644 --- a/rpkid/tests/Makefile.in +++ b/rpkid/tests/Makefile.in @@ -20,35 +20,35 @@ publication-protocol-samples/.stamp: publication-protocol-samples.xml split-prot touch $@ parse-test: protocol-samples - python xml-parse-test.py + @PYTHON@ xml-parse-test.py all-tests:: parse-test all-tests:: - python smoketest.py -y smoketest.1.yaml + @PYWRAP@ smoketest.py -y smoketest.1.yaml all-tests:: - python smoketest.py -y smoketest.2.yaml + @PYWRAP@ smoketest.py -y smoketest.2.yaml test all-tests:: - python smoketest.py -y smoketest.3.yaml + @PYWRAP@ smoketest.py -y smoketest.3.yaml all-tests:: - python smoketest.py -y smoketest.4.yaml + @PYWRAP@ smoketest.py -y smoketest.4.yaml all-tests:: - python smoketest.py -y smoketest.5.yaml + @PYWRAP@ smoketest.py -y smoketest.5.yaml test all-tests:: - python smoketest.py -y smoketest.6.yaml + @PYWRAP@ smoketest.py -y smoketest.6.yaml all-tests:: - python smoketest.py -y smoketest.7.yaml + @PYWRAP@ smoketest.py -y smoketest.7.yaml profile: all find smoketest.dir -name '*.prof' -delete - python smoketest.py -y smoketest.2.yaml -p - for i in smoketest.dir/*.prof; do python -c "import pstats;pstats.Stats('$$i').sort_stats('time').print_stats()"; done + @PYWRAP@ smoketest.py -y smoketest.2.yaml -p + for i in smoketest.dir/*.prof; do @PYTHON@ -c "import pstats;pstats.Stats('$$i').sort_stats('time').print_stats()"; done # This isn't a full exercise of the yamltest framework, but is # probably as good as we can do under make. @@ -57,10 +57,10 @@ YAMLTEST_CONFIG = smoketest.1.yaml yamltest: rm -rf yamltest.dir rcynic-data - python sql-cleaner.py - python yamltest.py ${YAMLTEST_CONFIG} + @PYTHON@ sql-cleaner.py + @PYWRAP@ yamltest.py ${YAMLTEST_CONFIG} backup: - python sql-dumper.py + @PYTHON@ sql-dumper.py tar cvvzf yamltest.backup.$$(TZ='' date +%Y.%m.%d.%H.%M.%S).tgz screenlog.* yamltest.dir backup.*.sql rm backup.*.sql |