fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2026-05-08 12:28:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux: Allow running upowerd under valgrind in tests

Browse source
This commit is contained in:
Bastien Nocera 2017-01-24 17:08:57 +01:00
parent caf53bd982
commit c5d1660b5c
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/linux/integration-test
View file

@ -66,6 +66,7 @@ class Tests(unittest.TestCase):
if os.access(os.path.join(builddir, 'src', 'upowerd'), os.X_OK):
cls.daemon_path = os.path.join(builddir, 'src', 'upowerd')
print('Testing binaries from local build tree')
cls.local_daemon = True
else:
print('Testing installed system binaries')
cls.daemon_path = None
@ -75,6 +76,7 @@ class Tests(unittest.TestCase):
cls.daemon_path = line.split('=', 1)[1].strip()
break
assert cls.daemon_path, 'could not determine daemon path from D-BUS .service file'
cls.local_daemon = False
# fail on CRITICALs on client side
GLib.log_set_always_fatal(GLib.LogLevelFlags.LEVEL_WARNING |
@ -138,7 +140,14 @@ class Tests(unittest.TestCase):
# have to do that ourselves
env['UMOCKDEV_DIR'] = self.testbed.get_root_dir()
self.log = tempfile.NamedTemporaryFile()
self.daemon = subprocess.Popen([self.daemon_path, '-v'],
if os.getenv('VALGRIND') != None:
if self.local_daemon:
daemon_path = ['libtool', '--mode=execute', 'valgrind', self.daemon_path, '-v']
else:
daemon_path = ['valgrind', self.daemon_path, '-v']
else:
daemon_path = [self.daemon_path, '-v']
self.daemon = subprocess.Popen(daemon_path,
env=env, stdout=self.log,
stderr=subprocess.STDOUT)