summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <thibault.saunier@osg.samsung.com>2016-09-30 11:23:47 -0300
committerThibault Saunier <thibault.saunier@osg.samsung.com>2016-09-30 12:53:13 -0300
commitd01567411258358ddc6f632bf0ed2363a36ca795 (patch)
tree2c930297a39d3eb6b09192c1dee3885894b57f75
parentfdd72f28d3fc525f9fd55a4d764e08a3898052d6 (diff)
Fix getpluginsdir when run standalone
We should not make the fact that we do not find a pluginsdir fatal as for gst-plugins-good we have no way to retrieve it but still it is needed in the uninstalled case.
-rw-r--r--tests/check/getpluginsdir12
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/check/getpluginsdir b/tests/check/getpluginsdir
index 102e3c8..aa41ca8 100644
--- a/tests/check/getpluginsdir
+++ b/tests/check/getpluginsdir
@@ -16,10 +16,12 @@ for i in range(0, len(args), 2):
res += ':' + path
else:
try:
- res += ':' + subprocess.check_output(['pkg-config',
- '--variable=pluginsdir',
- pkg_name]).decode()
- except subprocess.CalledProcessError:
- exit(1)
+ res += ':' + subprocess.check_output([
+ 'pkg-config', '--variable=pluginsdir',
+ pkg_name]).decode().replace("\n", "")
+ except subprocess.CalledProcessError as e:
+ # Probably means there is no .pc file for the module
+ # and it should hopefully no be too bad.
+ pass
print(res.strip(":"))