From 1bb16a68dcf4ffe3e8b7b12e5a271f923f4472af Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Tue, 1 Mar 2022 21:10:29 +0000 Subject: [PATCH] Test fixes for running under valgrind --- test/broker/01-connect-unix-socket.py | 10 ++++++++-- test/broker/16-cmd-args.py | 6 +++++- test/broker/16-config-parse-errors.py | 6 +++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/test/broker/01-connect-unix-socket.py b/test/broker/01-connect-unix-socket.py index 7a560ac2..799e4fed 100755 --- a/test/broker/01-connect-unix-socket.py +++ b/test/broker/01-connect-unix-socket.py @@ -4,11 +4,13 @@ from mosq_test_helper import * +vg_index = 0 def start_broker(filename): + global vg_index cmd = ['../../src/mosquitto', '-v', '-c', filename] if os.environ.get('MOSQ_USE_VALGRIND') is not None: - logfile = filename+'.'+str(vg_index)+'.vglog' + logfile = os.path.basename(__file__)+'.'+str(vg_index)+'.vglog' if os.environ.get('MOSQ_USE_VALGRIND') == 'callgrind': cmd = ['valgrind', '-q', '--tool=callgrind', '--log-file='+logfile] + cmd elif os.environ.get('MOSQ_USE_VALGRIND') == 'massif': @@ -16,6 +18,7 @@ def start_broker(filename): else: cmd = ['valgrind', '-q', '--trace-children=yes', '--leak-check=full', '--show-leak-kinds=all', '--log-file='+logfile] + cmd + vg_index += 1 return subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE) @@ -36,7 +39,10 @@ def do_test(): broker = start_broker(filename=conf_file) try: - time.sleep(0.1) + if os.environ.get('MOSQ_USE_VALGRIND') is None: + time.sleep(0.1) + else: + time.sleep(2) sock = mosq_test.do_client_connect_unix(connect_packet, connack_packet, path=f"{port}.sock") sock.close() diff --git a/test/broker/16-cmd-args.py b/test/broker/16-cmd-args.py index 0f232fca..fb131415 100755 --- a/test/broker/16-cmd-args.py +++ b/test/broker/16-cmd-args.py @@ -4,11 +4,14 @@ from mosq_test_helper import * +vg_index = 0 + def start_broker(args): + global vg_index cmd = ['../../src/mosquitto'] + args if os.environ.get('MOSQ_USE_VALGRIND') is not None: - logfile = filename+'.'+str(vg_index)+'.vglog' + logfile = os.path.basename(__file__)+'.'+str(vg_index)+'.vglog' if os.environ.get('MOSQ_USE_VALGRIND') == 'callgrind': cmd = ['valgrind', '-q', '--tool=callgrind', '--log-file='+logfile] + cmd elif os.environ.get('MOSQ_USE_VALGRIND') == 'massif': @@ -16,6 +19,7 @@ def start_broker(args): else: cmd = ['valgrind', '-q', '--trace-children=yes', '--leak-check=full', '--show-leak-kinds=all', '--log-file='+logfile] + cmd + vg_index += 1 return subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE) diff --git a/test/broker/16-config-parse-errors.py b/test/broker/16-config-parse-errors.py index 976d2aba..4163be22 100755 --- a/test/broker/16-config-parse-errors.py +++ b/test/broker/16-config-parse-errors.py @@ -4,11 +4,14 @@ from mosq_test_helper import * +vg_index = 0 + def start_broker(filename): + global vg_index cmd = ['../../src/mosquitto', '-v', '-c', filename] if os.environ.get('MOSQ_USE_VALGRIND') is not None: - logfile = filename+'.'+str(vg_index)+'.vglog' + logfile = os.path.basename(__file__)+'.'+str(vg_index)+'.vglog' if os.environ.get('MOSQ_USE_VALGRIND') == 'callgrind': cmd = ['valgrind', '-q', '--tool=callgrind', '--log-file='+logfile] + cmd elif os.environ.get('MOSQ_USE_VALGRIND') == 'massif': @@ -16,6 +19,7 @@ def start_broker(filename): else: cmd = ['valgrind', '-q', '--trace-children=yes', '--leak-check=full', '--show-leak-kinds=all', '--log-file='+logfile] + cmd + vg_index += 1 return subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE)