From e263685ac82454c39eee6e2a2146dd1e02d61de8 Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Tue, 16 Mar 2021 12:52:12 +0100 Subject: tests: support attaching to existing vpp Introduce a new option DEBUG=attach to run a test against existing already running vpp. A new target 'make test-start-gdb' will spawn VPP in gdb for this purpose. Customization options explained in test-help. Type: improvement Change-Id: Ia160a85b33da3b2df292d44bb95729af9dd9da96 Signed-off-by: Klement Sekera --- src/plugins/quic/test/test_quic.py | 2 +- src/vcl/test/test_vcl.py | 4 ++-- src/vpp-api/test/test_vapi.py | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/plugins/quic/test/test_quic.py b/src/plugins/quic/test/test_quic.py index 0e4cb2dacca..1257f4e2b0a 100644 --- a/src/plugins/quic/test/test_quic.py +++ b/src/plugins/quic/test/test_quic.py @@ -199,7 +199,7 @@ class QUICEchoExtTestCase(QUICTestCase): "uri", self.uri, "json", self.test_bytes, - "socket-name", self.api_sock, + "socket-name", self.get_api_sock_path(), "quic-setup", self.quic_setup, "nthreads", "1", "mq-size", f"{self.evt_q_len}" diff --git a/src/vcl/test/test_vcl.py b/src/vcl/test/test_vcl.py index 80b9f2f0211..8950470e8fc 100644 --- a/src/vcl/test/test_vcl.py +++ b/src/vcl/test/test_vcl.py @@ -87,7 +87,7 @@ class VCLTestCase(VppTestCase): self.vapi.session_enable_disable(is_enable=0) def cut_thru_test(self, server_app, server_args, client_app, client_args): - self.env = {'VCL_VPP_API_SOCKET': self.api_sock, + self.env = {'VCL_VPP_API_SOCKET': self.get_api_sock_path(), 'VCL_APP_SCOPE_LOCAL': "true"} worker_server = VCLAppWorker(self.build_dir, server_app, server_args, self.logger, self.env) @@ -192,7 +192,7 @@ class VCLTestCase(VppTestCase): @unittest.skipUnless(_have_iperf3, "'%s' not found, Skipping.") def thru_host_stack_test(self, server_app, server_args, client_app, client_args): - self.env = {'VCL_VPP_API_SOCKET': self.api_sock, + self.env = {'VCL_VPP_API_SOCKET': self.get_api_sock_path(), 'VCL_APP_SCOPE_GLOBAL': "true", 'VCL_APP_NAMESPACE_ID': "1", 'VCL_APP_NAMESPACE_SECRET': "1234"} diff --git a/src/vpp-api/test/test_vapi.py b/src/vpp-api/test/test_vapi.py index 09f9f83e984..d91099210d2 100644 --- a/src/vpp-api/test/test_vapi.py +++ b/src/vpp-api/test/test_vapi.py @@ -25,8 +25,8 @@ class VAPITestCase(VppTestCase): self.assertIsNotNone(built_root, "Environment variable `%s' not set" % var) executable = "%s/vapi_test/vapi_c_test" % built_root - worker = Worker( - [executable, "vapi client", self.shm_prefix], self.logger) + worker = Worker([executable, "vapi client", + self.get_api_segment_prefix()], self.logger) worker.start() timeout = 60 worker.join(timeout) @@ -54,8 +54,8 @@ class VAPITestCase(VppTestCase): self.assertIsNotNone(built_root, "Environment variable `%s' not set" % var) executable = "%s/vapi_test/vapi_cpp_test" % built_root - worker = Worker( - [executable, "vapi client", self.shm_prefix], self.logger) + worker = Worker([executable, "vapi client", + self.get_api_segment_prefix()], self.logger) worker.start() timeout = 120 worker.join(timeout) -- cgit 1.2.3-korg