diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2021-05-25 21:15:36 +0200 |
|---|---|---|
| committer |   Ole Tr�an <otroan@employees.org> | 2022-01-31 14:58:19 +0000 |
| commit | 3a1a86f87fd7d9c84ad4b12124c50fc3927ec6cf (patch) | |
| tree | 3a4916b73fbbe7385f46558a27eaf1c427a106cf | |
| parent | c0a2f0ec9b2574441dd3280fe6ae25de5491f7a0 (diff) | |
tests: make VPP_BUILD_DIR to point to correct dir
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>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | test/test_quic.py | 2 | ||||
| -rw-r--r-- | test/test_vapi.py | 4 | ||||
| -rw-r--r-- | test/test_vcl.py | 4 |
4 files changed, 6 insertions, 6 deletions
@@ -414,7 +414,7 @@ define test $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,) $(eval libs:=lib lib64) 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_INSTALL_PATH=$(BR)/install-$(2)-native/ \ EXTENDED_TESTS=$(EXTENDED_TESTS) \ diff --git a/test/test_quic.py b/test/test_quic.py index 1257f4e2b0a..ea367c0ba14 100644 --- a/test/test_quic.py +++ b/test/test_quic.py @@ -19,7 +19,7 @@ class QUICAppWorker(Worker): testcase, env=None, *args, **kwargs): if env is None: env = {} - app = "%s/vpp/bin/%s" % (build_dir, appname) + app = "%s/bin/%s" % (build_dir, appname) self.args = [app] + executable_args self.role = role self.wait_for_gdb = 'wait-for-gdb' diff --git a/test/test_vapi.py b/test/test_vapi.py index 9b4cad090a0..106c84a9bad 100644 --- a/test/test_vapi.py +++ b/test/test_vapi.py @@ -24,7 +24,7 @@ class VAPITestCase(VppTestCase): build_dir = os.getenv(var, None) self.assertIsNotNone(build_dir, "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", self.get_api_segment_prefix()], self.logger) worker.start() @@ -53,7 +53,7 @@ class VAPITestCase(VppTestCase): build_dir = os.getenv(var, None) self.assertIsNotNone(build_dir, "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", self.get_api_segment_prefix()], self.logger) worker.start() diff --git a/test/test_vcl.py b/test/test_vcl.py index 50d36d5317d..fbbcd7b390d 100644 --- a/test/test_vcl.py +++ b/test/test_vcl.py @@ -52,10 +52,10 @@ class VCLAppWorker(Worker): app = appname env.update({'LD_PRELOAD': vcl_ldpreload_so}) 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}) else: - app = "%s/vpp/bin/%s" % (build_dir, appname) + app = "%s/bin/%s" % (build_dir, appname) self.args = [app] + executable_args super(VCLAppWorker, self).__init__(self.args, logger, env, *args, **kwargs) |