diff options
Diffstat (limited to 'rpkid')
| -rw-r--r-- | rpkid/Makefile.in | 23 | ||||
| -rw-r--r-- | rpkid/tests/Makefile.in | 19 |
2 files changed, 19 insertions, 23 deletions
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index 2a03a670..d9406aae 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -2,8 +2,6 @@ SUBDIRS = @RPKID_SUBDIRS@ PYTHON = @PYTHON@ -PYWRAP = @PYWRAP@ -PYWRAP_CMD = @PYWRAP_CMD@ SECRET_KEY = @SECRET_KEY@ WEBUSER = @WEBUSER@ @@ -104,7 +102,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 ${PYWRAP_CMD} $$i; done + PWD=`pwd`; for i in rpki/*.py; do echo "[$$i]"; PYTHONPATH=$$PWD ${PYTHON} $$i; done all-tests:: unit-tests @@ -180,14 +178,13 @@ distclean:: clean docclean all install clean test distclean deinstall uninstall:: @for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} $@); done -COMPILE_COMMON = \ +COMPILE_PYTHON = \ + rm -f $@; \ + AC_PYTHON_INTERPRETER='${PYTHON}' \ AC_RPKI_CONFIG_DIR='${DESTDIR}${sysconfdir}' \ ${PYTHON} ${abs_top_srcdir}/buildtools/make-python-executable.py <$? >$@; \ chmod 555 $@ -COMPILE_PYTHON = rm -f $@; AC_PYTHON_INTERPRETER='${PYTHON}' ${COMPILE_COMMON} -COMPILE_PYWRAP = rm -f $@; AC_PYTHON_INTERPRETER='${PYWRAP}' ${COMPILE_COMMON} - COMPILE_SETTINGS = \ rm -f $@; \ AC_DATABASE_PATH='${DESTDIR}${localstatedir}/rpki/gui.db' \ @@ -208,22 +205,22 @@ rpki-start-servers: rpki-start-servers.py ${COMPILE_PYTHON} irbe_cli: irbe_cli.py - ${COMPILE_PYWRAP} + ${COMPILE_PYTHON} irdbd: irdbd.py - ${COMPILE_PYWRAP} + ${COMPILE_PYTHON} myrpki: myrpki.py - ${COMPILE_PYWRAP} + ${COMPILE_PYTHON} pubd: pubd.py - ${COMPILE_PYWRAP} + ${COMPILE_PYTHON} rootd: rootd.py - ${COMPILE_PYWRAP} + ${COMPILE_PYTHON} rpkid: rpkid.py - ${COMPILE_PYWRAP} + ${COMPILE_PYTHON} portal-gui/scripts/rpkigui-load-csv: portal-gui/scripts/load_csv.py ${COMPILE_PYTHON} diff --git a/rpkid/tests/Makefile.in b/rpkid/tests/Makefile.in index b7a125e0..f86573da 100644 --- a/rpkid/tests/Makefile.in +++ b/rpkid/tests/Makefile.in @@ -1,7 +1,6 @@ # $Id$ PYTHON = @PYTHON@ -PYWRAP_CMD = @PYWRAP_CMD@ abs_top_builddir = @abs_top_builddir@ all: protocol-samples @@ -29,29 +28,29 @@ parse-test: protocol-samples all-tests:: parse-test all-tests:: - ${PYWRAP_CMD} smoketest.py -y smoketest.1.yaml + ${PYTHON} smoketest.py -y smoketest.1.yaml all-tests:: - ${PYWRAP_CMD} smoketest.py -y smoketest.2.yaml + ${PYTHON} smoketest.py -y smoketest.2.yaml test all-tests:: - ${PYWRAP_CMD} smoketest.py -y smoketest.3.yaml + ${PYTHON} smoketest.py -y smoketest.3.yaml all-tests:: - ${PYWRAP_CMD} smoketest.py -y smoketest.4.yaml + ${PYTHON} smoketest.py -y smoketest.4.yaml all-tests:: - ${PYWRAP_CMD} smoketest.py -y smoketest.5.yaml + ${PYTHON} smoketest.py -y smoketest.5.yaml test all-tests:: - ${PYWRAP_CMD} smoketest.py -y smoketest.6.yaml + ${PYTHON} smoketest.py -y smoketest.6.yaml all-tests:: - ${PYWRAP_CMD} smoketest.py -y smoketest.7.yaml + ${PYTHON} smoketest.py -y smoketest.7.yaml profile: all find smoketest.dir -name '*.prof' -delete - ${PYWRAP_CMD} smoketest.py -y smoketest.2.yaml -p + ${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 # This isn't a full exercise of the yamltest framework, but is @@ -62,7 +61,7 @@ YAMLTEST_CONFIG = smoketest.1.yaml yamltest: rm -rf yamltest.dir rcynic-data ${PYTHON} sql-cleaner.py - ${PYWRAP_CMD} yamltest.py ${YAMLTEST_CONFIG} + ${PYTHON} yamltest.py ${YAMLTEST_CONFIG} backup: ${PYTHON} sql-dumper.py |