summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kellner <christian@kellner.me>2017-03-21 18:07:41 +0000
committerBastien Nocera <hadess@hadess.net>2017-03-25 18:08:50 +0100
commit90aec997ce82afeae0f7e2e51fcd313d260816b3 (patch)
treea9affcb21bf556c9e727f7d20485099823e758bb
parentb292ee20359aca431f6634e2d320f7c29648bf2f (diff)
downloadupower-90aec997ce82afeae0f7e2e51fcd313d260816b3.tar.gz
integration-test: enable running from JHBuild
https://bugs.freedesktop.org/show_bug.cgi?id=99763
-rwxr-xr-xsrc/linux/integration-test5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/linux/integration-test b/src/linux/integration-test
index e94669f..15ccfef 100755
--- a/src/linux/integration-test
+++ b/src/linux/integration-test
@@ -87,6 +87,11 @@ class Tests(dbusmock.DBusTestCase):
cls.daemon_path = os.path.join(builddir, 'src', 'upowerd')
print('Testing binaries from local build tree')
cls.local_daemon = True
+ elif os.environ.get('UNDER_JHBUILD', False):
+ jhbuild_prefix = os.environ['JHBUILD_PREFIX']
+ cls.daemon_path = os.path.join(jhbuild_prefix, 'libexec', 'upowerd')
+ print('Testing binaries from JHBuild')
+ cls.local_daemon = False
else:
print('Testing installed system binaries')
cls.daemon_path = None