laforge submitted this change.

View Change

Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, approved
Fix: Only run pcscd with "--diable-polkit" if supported

For example, if bankd tests run on Debian Bookwork, pcscd does not have
the "--disable-polkit" option. This option is not required, because it
does not support Polit anyway.

Only add "--disable-polkit" to the command line if supported by pcscd.

Change-Id: Ib2cdf7fcd698c33810ebfbb1db2fa666b9d7dbb3
---
M remsim/testenv_bankd.cfg
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/remsim/testenv_bankd.cfg b/remsim/testenv_bankd.cfg
index 62df381..1cda9b0 100644
--- a/remsim/testenv_bankd.cfg
+++ b/remsim/testenv_bankd.cfg
@@ -5,7 +5,7 @@

[pcscd]
prepare=require_vsmartcard_vpcd.sh
-program=pcscd -f -d --disable-polkit
+program=pcscd -f -d $(pcscd --help 2>&1 | grep -q -- --disable-polkit && echo "--disable-polkit")
make=no
package=pcscd


To view, visit change 42711. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ib2cdf7fcd698c33810ebfbb1db2fa666b9d7dbb3
Gerrit-Change-Number: 42711
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas@eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>