proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 01:40:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: fix out-of-tree build

Browse Source 
Fix pytest with $(top_srcdir) != "."

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2017-02-11 01:03:57 +01:00 committed by Christian Franke
parent cbbf41cbb3
commit 43dac2baae
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Makefile.am
View File

@ -139,5 +139,5 @@ EXTRA_DIST = \
.PHONY: tests.xml .PHONY: tests.xml
tests.xml: $(check_PROGRAMS) tests.xml: $(check_PROGRAMS)
$(PYTHON) runtests.py --junitxml=$@ -v $(PYTHON) $(srcdir)/runtests.py --junitxml=$@ -v $(srcdir)
check: tests.xml check: tests.xml

10
tests/helpers/python/frrtest.py
View File

@ -35,6 +35,12 @@ import frrsix
# See below for the definition of actual TestMultiOut tests. # See below for the definition of actual TestMultiOut tests.
# #
srcbase = os.path.abspath(inspect.getsourcefile(frrsix))
for i in range(0, 3):
srcbase = os.path.dirname(srcbase)
def binpath(srcpath):
return os.path.relpath(os.path.abspath(srcpath), srcbase)
class MultiTestFailure(Exception): class MultiTestFailure(Exception):
pass pass
@ -59,7 +65,7 @@ class _TestMultiOut(object):
self.__class__.tests_run = True self.__class__.tests_run = True
basedir = os.path.dirname(inspect.getsourcefile(type(self))) basedir = os.path.dirname(inspect.getsourcefile(type(self)))
program = os.path.join(basedir, self.program) program = os.path.join(basedir, self.program)
proc = subprocess.Popen([program], stdout=subprocess.PIPE) proc = subprocess.Popen([binpath(program)], stdout=subprocess.PIPE)
self.output,_ = proc.communicate('') self.output,_ = proc.communicate('')
self.exitcode = proc.wait() self.exitcode = proc.wait()
@ -167,7 +173,7 @@ class TestRefOut(object):
with open(refout, 'rb') as f: with open(refout, 'rb') as f:
reftext = f.read() reftext = f.read()
proc = subprocess.Popen([program], proc = subprocess.Popen([binpath(program)],
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
outtext,_ = proc.communicate(intext) outtext,_ = proc.communicate(intext)