Commit 5fad0582 authored by Jeremy C. Reed's avatar Jeremy C. Reed
Browse files

Use $(abs_srcdir) for running the python test scripts.

I have another commit coming up to fix PYTHONPATH paths.


git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac153@1759 e5f2f494-b856-4b98-b285-d166d9295462
parent 77dfebbc
...@@ -8,5 +8,5 @@ check-local: ...@@ -8,5 +8,5 @@ check-local:
for pytest in $(PYTESTS) ; do \ for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \ echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_srcdir)/src/bin/bind10 \ env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_srcdir)/src/bin/bind10 \
$(PYCOVERAGE) $$pytest ; \ $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done done
...@@ -8,5 +8,5 @@ check-local: ...@@ -8,5 +8,5 @@ check-local:
for pytest in $(PYTESTS) ; do \ for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \ echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_srcdir)/src/bin \ env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_srcdir)/src/bin \
$(PYCOVERAGE) $$pytest ; \ $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done done
...@@ -10,5 +10,5 @@ EXTRA_DIST = $(PYTESTS) ...@@ -10,5 +10,5 @@ EXTRA_DIST = $(PYTESTS)
### for pytest in $(PYTESTS) ; do \ ### for pytest in $(PYTESTS) ; do \
### echo Running test: $$pytest ; \ ### echo Running test: $$pytest ; \
### env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_srcdir)/src/bin/cmdctl \ ### env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_srcdir)/src/bin/cmdctl \
### $(PYCOVERAGE) $$pytest ; \ ### $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
### done ### done
...@@ -8,6 +8,6 @@ check-local: ...@@ -8,6 +8,6 @@ check-local:
for pytest in $(PYTESTS) ; do \ for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \ echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/bin/msgq:$(abs_top_srcdir)/src/lib/python \ env PYTHONPATH=$(abs_top_srcdir)/src/bin/msgq:$(abs_top_srcdir)/src/lib/python \
$(PYCOVERAGE) $$pytest ; \ $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done done
...@@ -10,7 +10,7 @@ check-local: ...@@ -10,7 +10,7 @@ check-local:
for pytest in $(PYTESTS) ; do \ for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \ echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/dns/.libs:$(abs_top_srcdir)/src/bin/xfrin:$(abs_top_srcdir)/src/lib/python \ env PYTHONPATH=$(abs_top_srcdir)/src/lib/dns/.libs:$(abs_top_srcdir)/src/bin/xfrin:$(abs_top_srcdir)/src/lib/python \
$(PYCOVERAGE) $$pytest ; \ $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done done
endif endif
...@@ -10,7 +10,7 @@ check-local: ...@@ -10,7 +10,7 @@ check-local:
for pytest in $(PYTESTS) ; do \ for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \ echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/bin/xfrout:$(abs_top_srcdir)/src/lib/python:$(abs_top_srcdir)/src/lib/dns/.libs:$(abs_top_srcdir)/src/lib/xfr/.libs \ env PYTHONPATH=$(abs_top_srcdir)/src/bin/xfrout:$(abs_top_srcdir)/src/lib/python:$(abs_top_srcdir)/src/lib/dns/.libs:$(abs_top_srcdir)/src/lib/xfr/.libs \
$(PYCOVERAGE) $$pytest ; \ $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done done
endif endif
...@@ -15,5 +15,5 @@ check-local: ...@@ -15,5 +15,5 @@ check-local:
for pytest in $(PYTESTS) ; do \ for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \ echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python \ env PYTHONPATH=$(abs_top_srcdir)/src/lib/python \
$(PYCOVERAGE) $$pytest ; \ $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done done
...@@ -11,5 +11,5 @@ check-local: ...@@ -11,5 +11,5 @@ check-local:
echo Running test: $$pytest ; \ echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python \ env PYTHONPATH=$(abs_top_srcdir)/src/lib/python \
CONFIG_TESTDATA_PATH=$(abs_top_srcdir)/src/lib/config/testdata \ CONFIG_TESTDATA_PATH=$(abs_top_srcdir)/src/lib/config/testdata \
$(PYCOVERAGE) $$pytest ; \ $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done done
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment