matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

tests: properly locate files in builddir

Browse source 
test_cli.refout is written by configure into the build directory, thus
we need a little special glue to find it correctly.

Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2018-08-18 05:00:54 +02:00 committed by David Lamparter
parent 74dc19a2f5
commit b37ccace1e
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -176,8 +176,14 @@ class TestRefOut(object):
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)
refin = program + '.in' if getattr(self, 'built_refin', False):
refout = program + '.refout' refin = binpath(program) + '.in'
else:
refin = program + '.in'
if getattr(self, 'built_refout', False):
refout = binpath(program) + '.refout'
else:
refout = program + '.refout'
intext = '' intext = ''
if os.path.exists(refin): if os.path.exists(refin):

1
tests/lib/cli/test_cli.py
View file

@ -2,3 +2,4 @@ import frrtest
class TestCli(frrtest.TestRefOut): class TestCli(frrtest.TestRefOut):
program = './test_cli' program = './test_cli'
built_refout = True