aboutsummaryrefslogtreecommitdiff
path: root/rpkid
diff options
context:
space:
mode:
Diffstat (limited to 'rpkid')
-rw-r--r--rpkid/Makefile.in10
l---------rpkid/rpki/POW2
-rw-r--r--rpkid/tests/Makefile.in21
3 files changed, 19 insertions, 14 deletions
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in
index f2f4b43a..674cf49c 100644
--- a/rpkid/Makefile.in
+++ b/rpkid/Makefile.in
@@ -1,9 +1,13 @@
# $Id$
+PYTHON = @PYTHON@
+PYWRAP_CMD = @PYWRAP_CMD@
+abs_top_builddir = @abs_top_builddir@
+
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 +39,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@ $$i; done
+ PWD=`pwd`; for i in rpki/*.py; do echo "[$$i]"; PYTHONPATH=$$PWD ${PYWRAP_CMD} $$i; done
all-tests:: unit-tests
@@ -46,7 +50,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/rpki/POW b/rpkid/rpki/POW
index 6551720e..c30f4cde 120000
--- a/rpkid/rpki/POW
+++ b/rpkid/rpki/POW
@@ -1 +1 @@
-../../pow/buildlib/POW \ No newline at end of file
+../../pow/POW \ No newline at end of file
diff --git a/rpkid/tests/Makefile.in b/rpkid/tests/Makefile.in
index c97d5955..b7a125e0 100644
--- a/rpkid/tests/Makefile.in
+++ b/rpkid/tests/Makefile.in
@@ -1,7 +1,8 @@
# $Id$
PYTHON = @PYTHON@
-PYWRAP = @PYWRAP@
+PYWRAP_CMD = @PYWRAP_CMD@
+abs_top_builddir = @abs_top_builddir@
all: protocol-samples
@@ -28,29 +29,29 @@ parse-test: protocol-samples
all-tests:: parse-test
all-tests::
- ${PYWRAP} smoketest.py -y smoketest.1.yaml
+ ${PYWRAP_CMD} smoketest.py -y smoketest.1.yaml
all-tests::
- ${PYWRAP} smoketest.py -y smoketest.2.yaml
+ ${PYWRAP_CMD} smoketest.py -y smoketest.2.yaml
test all-tests::
- ${PYWRAP} smoketest.py -y smoketest.3.yaml
+ ${PYWRAP_CMD} smoketest.py -y smoketest.3.yaml
all-tests::
- ${PYWRAP} smoketest.py -y smoketest.4.yaml
+ ${PYWRAP_CMD} smoketest.py -y smoketest.4.yaml
all-tests::
- ${PYWRAP} smoketest.py -y smoketest.5.yaml
+ ${PYWRAP_CMD} smoketest.py -y smoketest.5.yaml
test all-tests::
- ${PYWRAP} smoketest.py -y smoketest.6.yaml
+ ${PYWRAP_CMD} smoketest.py -y smoketest.6.yaml
all-tests::
- ${PYWRAP} smoketest.py -y smoketest.7.yaml
+ ${PYWRAP_CMD} smoketest.py -y smoketest.7.yaml
profile: all
find smoketest.dir -name '*.prof' -delete
- ${PYWRAP} smoketest.py -y smoketest.2.yaml -p
+ ${PYWRAP_CMD} 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
@@ -61,7 +62,7 @@ YAMLTEST_CONFIG = smoketest.1.yaml
yamltest:
rm -rf yamltest.dir rcynic-data
${PYTHON} sql-cleaner.py
- ${PYWRAP} yamltest.py ${YAMLTEST_CONFIG}
+ ${PYWRAP_CMD} yamltest.py ${YAMLTEST_CONFIG}
backup:
${PYTHON} sql-dumper.py