From a6402fed71b77baabbffe715f3403d67ab81dec0 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 24 Jan 2025 16:49:04 +0100 Subject: [PATCH] test-client: fix TestNmCloudSetup valgrind run Allow running the following locally (for quick loval nm-c-s valgrind check), without requiring $NM_TEST_CLIENT_NMCLI_PATH to be set. $ NM_TEST_CLIENT_CLOUD_SETUP_PATH=build/src/nm-cloud-setup/nm-cloud-setup \ NMTST_USE_VALGRIND=1 python src/tests/client/test-client.py TestNmCloudSetup --- src/tests/client/test-client.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tests/client/test-client.py b/src/tests/client/test-client.py index 989f743295..0a61c32e40 100755 --- a/src/tests/client/test-client.py +++ b/src/tests/client/test-client.py @@ -738,7 +738,7 @@ class Configuration: ) if not os.path.isdir(v): raise Exception("Missing builddir. Set NM_TEST_CLIENT_BUILDDIR?") - elif name == ENV_NM_TEST_CLIENT_NMCLI_PATH: + elif name == "ENV_NM_TEST_CLIENT_NMCLI_UNCHECKED_PATH": v = os.environ.get(ENV_NM_TEST_CLIENT_NMCLI_PATH, None) if v is None: try: @@ -747,6 +747,8 @@ class Configuration: ) except: pass + elif name == ENV_NM_TEST_CLIENT_NMCLI_PATH: + v = self.get("ENV_NM_TEST_CLIENT_NMCLI_UNCHECKED_PATH") if not os.path.exists(v): raise Exception("Missing nmcli binary. Set NM_TEST_CLIENT_NMCLI_PATH?") elif name == ENV_NM_TEST_CLIENT_CLOUD_SETUP_PATH: @@ -811,7 +813,7 @@ class Configuration: v = os.environ.get(name, None) if v is None: v = os.path.abspath( - os.path.dirname(self.get(ENV_NM_TEST_CLIENT_NMCLI_PATH)) + os.path.dirname(self.get("ENV_NM_TEST_CLIENT_NMCLI_UNCHECKED_PATH")) + "/../../libtool" ) if not os.path.isfile(v):