ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: make VPP_BUILD_DIR to point to correct dir

Browse Source 
Make VPP_BUILD_DIR hold the correct value and adjust paths where
necessary.

Type: refactor
Change-Id: I5bc60666c04919956bf26badaf1ee1f1b188ef65
Signed-off-by: Klement Sekera <ksekera@cisco.com>
This commit is contained in:
Klement Sekera
2021-05-25 21:15:36 +02:00
committed by Ole Tr�an
parent c0a2f0ec9b
commit 3a1a86f87f
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -414,7 +414,7 @@ define test
$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,) $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
$(eval libs:=lib lib64) $(eval libs:=lib lib64)
make -C test \ make -C test \
VPP_BUILD_DIR=$(BR)/build-$(2)-native \ VPP_BUILD_DIR=$(BR)/build-$(2)-native/vpp \
VPP_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \ VPP_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
VPP_INSTALL_PATH=$(BR)/install-$(2)-native/ \ VPP_INSTALL_PATH=$(BR)/install-$(2)-native/ \
EXTENDED_TESTS=$(EXTENDED_TESTS) \ EXTENDED_TESTS=$(EXTENDED_TESTS) \

2
test/test_quic.py
View File

@ -19,7 +19,7 @@ class QUICAppWorker(Worker):
testcase, env=None, *args, **kwargs): testcase, env=None, *args, **kwargs):
if env is None: if env is None:
env = {} env = {}
app = "%s/vpp/bin/%s" % (build_dir, appname) app = "%s/bin/%s" % (build_dir, appname)
self.args = [app] + executable_args self.args = [app] + executable_args
self.role = role self.role = role
self.wait_for_gdb = 'wait-for-gdb' self.wait_for_gdb = 'wait-for-gdb'

4
test/test_vapi.py
View File

@ -24,7 +24,7 @@ class VAPITestCase(VppTestCase):
build_dir = os.getenv(var, None) build_dir = os.getenv(var, None)
self.assertIsNotNone(build_dir, self.assertIsNotNone(build_dir,
"Environment variable `%s' not set" % var) "Environment variable `%s' not set" % var)
executable = f"{build_dir}/vpp/bin/vapi_c_test" executable = f"{build_dir}/bin/vapi_c_test"
worker = Worker([executable, "vapi client", worker = Worker([executable, "vapi client",
self.get_api_segment_prefix()], self.logger) self.get_api_segment_prefix()], self.logger)
worker.start() worker.start()
@ -53,7 +53,7 @@ class VAPITestCase(VppTestCase):
build_dir = os.getenv(var, None) build_dir = os.getenv(var, None)
self.assertIsNotNone(build_dir, self.assertIsNotNone(build_dir,
"Environment variable `%s' not set" % var) "Environment variable `%s' not set" % var)
executable = f"{build_dir}/vpp/bin/vapi_cpp_test" executable = f"{build_dir}/bin/vapi_cpp_test"
worker = Worker([executable, "vapi client", worker = Worker([executable, "vapi client",
self.get_api_segment_prefix()], self.logger) self.get_api_segment_prefix()], self.logger)
worker.start() worker.start()

4
test/test_vcl.py
View File

@ -52,10 +52,10 @@ class VCLAppWorker(Worker):
app = appname app = appname
env.update({'LD_PRELOAD': vcl_ldpreload_so}) env.update({'LD_PRELOAD': vcl_ldpreload_so})
elif "sock" in appname: elif "sock" in appname:
app = "%s/vpp/bin/%s" % (build_dir, appname) app = "%s/bin/%s" % (build_dir, appname)
env.update({'LD_PRELOAD': vcl_ldpreload_so}) env.update({'LD_PRELOAD': vcl_ldpreload_so})
else: else:
app = "%s/vpp/bin/%s" % (build_dir, appname) app = "%s/bin/%s" % (build_dir, appname)
self.args = [app] + executable_args self.args = [app] + executable_args
super(VCLAppWorker, self).__init__(self.args, logger, env, super(VCLAppWorker, self).__init__(self.args, logger, env,
*args, **kwargs) *args, **kwargs)