From 0b9143e042be0006e1ca854c19a76b493248e1ee Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 8 Dec 2023 00:13:12 +0100 Subject: [PATCH] common: fix exception message Signed-off-by: Tomasz Gromadzki --- src/test/unittest/valgrind.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/test/unittest/valgrind.py b/src/test/unittest/valgrind.py index f272946cd7c..f2d4a4bcfdd 100644 --- a/src/test/unittest/valgrind.py +++ b/src/test/unittest/valgrind.py @@ -201,11 +201,7 @@ def _get_valgrind_exe(self, force_enable): raise futils.Skip('Valgrind not found') try: -<<<<<<< HEAD _ = sp.check_output('../valgrind_check/valgrind_check', -======= - out = sp.check_output('./valgrind_check/valgrind_check', ->>>>>>> 51a2a049c (common: fix valgrind_check command path) shell=True, universal_newlines=True, stderr=sp.STDOUT) except sp.CalledProcessError: