• Stephan Bergmann's avatar
    Fix creation/removal of GPG socketdir · f0305ec0
    Stephan Bergmann yazdı
    <https://gerrit.libreoffice.org/#/c/50978/> "gpg4libre: fix failing gpg test due
    to over-long filenames" had introduced the gb_CppunitTest_run_gpgconf target in
    xmlsecurity/CppunitTest_xmlsecurity_signing.mk, calling `gpgconf
    --craete-socketdir`.  A 2018-03-18 comment there notes that "Stephan's last
    comment: (and `gpgconf --remove-sockedir` be called after the test?) is not
    addressed yet, will do in follow-up commit".
    
    Follow-up d7ecf4a4 "properly check for gpgconf
    (and --create-socketdir) working" makes gb_CppunitTest_run_gpgconf conditional.
    However, in configure.ac,
    
      HAVE_GPGCONF_SOCKETDIR=TRUE
    
    is missing, so even after follow-up 7a95ee8d
    "actually add HAVE_GPGCONF_SOCKETDIR to config_host.mk.in...", config_host.mk
    will always contain
    
      export HAVE_GPGCONF_SOCKETDIR=
    
    so gb_CppunitTest_run_gpgconf will never be executed (and `pgconf
    --crate-socketdir` will never called).
    
    But even if it were executed, it would not create the socket dir that the test
    code in xmlsecurity/qa/unit/signing/signing.cxx is actually using, as
    gb_CppunitTest_run_gpgconf sets
    
      GNUPGHOME=.../workdir/CppunitTest/xmlsecurity_signing.test.user
    
    while xmlsecurity/qa/unit/signing/signing.cxx's SigningTest::setUp sets
    
      GNUPGHOME=.../workdir//CppunitTest/xmlsecurity_signing.test.user/
    
    and the GPG software is apparently picky about extra slashes when computing the
    socket dir name from the GNUPGHOME env var.
    
    (That `gpgconf --create-socketdir` was never executed with the current setup
    shows that calling it explicitly is probably not really needed, as the GPG
    software apparently creates it automatically on demand.)
    
    However, what is still missing is to remove the socket dir again (see the
    comment quoted above), and, probably more importantly, to exit any gpg-agent
    daemon operating on that socket dir that has (indirectly) been started by the
    tests in xmlsecurity/qa/unit/signing/signing.cxx.  At least with Fedora 29
    gpgconf from gnupg2-2.2.9-1.fc29.x86_64, that daemon is successfully terminated
    by calling `gpgconf --remove-socket`.
    
    So move the call to `gpgconf --create-socketdir` from the makefile to the test
    setup code (which makes it easier to guarantee that a single GNUPGHOME value,
    and thus a single socket dir, is used), and add a corresponding `gpgconf
    --remove-socketdir` call to the test shutdown code.  (As argued above, the
    `gpgconf --create-socketdir` call shouldn't be stricktly necessary, but it looks
    cleaner to do it explicitly anyway.)
    
    Change-Id: I2ec8f08943ed63ec27f8507461588ee7cdadf372
    Reviewed-on: https://gerrit.libreoffice.org/63181Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
    Tested-by: Jenkins
    Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
    f0305ec0
Adı
Son kayıt (commit)
Son güncelleme
.git-hooks Loading commit data...
UnoControls Loading commit data...
accessibility Loading commit data...
android Loading commit data...
animations Loading commit data...
apple_remote Loading commit data...
avmedia Loading commit data...
basctl Loading commit data...
basegfx Loading commit data...
basic Loading commit data...
bean Loading commit data...
bin Loading commit data...
binaryurp Loading commit data...
bridges Loading commit data...
canvas Loading commit data...
chart2 Loading commit data...
cli_ure Loading commit data...
codemaker Loading commit data...
comphelper Loading commit data...
compilerplugins Loading commit data...
config_host Loading commit data...
configmgr Loading commit data...
connectivity Loading commit data...
cppcanvas Loading commit data...
cppu Loading commit data...
cppuhelper Loading commit data...
cpputools Loading commit data...
cui Loading commit data...
dbaccess Loading commit data...
desktop Loading commit data...
dictionaries @ 86921a78
distro-configs Loading commit data...
drawinglayer Loading commit data...
dtrans Loading commit data...
editeng Loading commit data...
embeddedobj Loading commit data...
embedserv Loading commit data...
emfio Loading commit data...
eventattacher Loading commit data...
extensions Loading commit data...
external Loading commit data...
extras Loading commit data...
filter Loading commit data...
forms Loading commit data...
formula Loading commit data...
fpicker Loading commit data...
framework Loading commit data...
helpcompiler Loading commit data...
helpcontent2 @ 3a6e63bb
hwpfilter Loading commit data...
i18nlangtag Loading commit data...
i18npool Loading commit data...
i18nutil Loading commit data...
icon-themes Loading commit data...
idl Loading commit data...
idlc Loading commit data...
include Loading commit data...
instsetoo_native Loading commit data...
io Loading commit data...
ios Loading commit data...
javaunohelper Loading commit data...
jurt Loading commit data...
jvmaccess Loading commit data...
jvmfwk Loading commit data...
l10ntools Loading commit data...
librelogo Loading commit data...
libreofficekit Loading commit data...
lingucomponent Loading commit data...
linguistic Loading commit data...
lotuswordpro Loading commit data...
m4 Loading commit data...
nlpsolver Loading commit data...
o3tl Loading commit data...
odk Loading commit data...
offapi Loading commit data...
officecfg Loading commit data...
onlineupdate Loading commit data...
oovbaapi Loading commit data...
oox Loading commit data...
opencl Loading commit data...
osx Loading commit data...
package Loading commit data...
postprocess Loading commit data...
pyuno Loading commit data...
qadevOOo Loading commit data...
readlicense_oo Loading commit data...
registry Loading commit data...
remotebridges Loading commit data...
reportbuilder Loading commit data...
reportdesign Loading commit data...
ridljar Loading commit data...
sal Loading commit data...
salhelper Loading commit data...
sax Loading commit data...
sc Loading commit data...
scaddins Loading commit data...
sccomp Loading commit data...
schema Loading commit data...
scp2 Loading commit data...
scripting Loading commit data...
sd Loading commit data...
sdext Loading commit data...
setup_native Loading commit data...
sfx2 Loading commit data...
shell Loading commit data...
slideshow Loading commit data...
smoketest Loading commit data...
solenv Loading commit data...
soltools Loading commit data...
sot Loading commit data...
starmath Loading commit data...
stoc Loading commit data...
store Loading commit data...
svgio Loading commit data...
svl Loading commit data...
svtools Loading commit data...
svx Loading commit data...
sw Loading commit data...
swext Loading commit data...
sysui Loading commit data...
test Loading commit data...
testtools Loading commit data...
toolkit Loading commit data...
tools Loading commit data...
translations @ f1422154
ucb Loading commit data...
ucbhelper Loading commit data...
udkapi Loading commit data...
uitest Loading commit data...
unodevtools Loading commit data...
unoidl Loading commit data...
unoil Loading commit data...
unotest Loading commit data...
unotools Loading commit data...
unoxml Loading commit data...
ure Loading commit data...
uui Loading commit data...
vbahelper Loading commit data...
vcl Loading commit data...
winaccessibility Loading commit data...
wizards Loading commit data...
writerfilter Loading commit data...
writerperfect Loading commit data...
xmerge Loading commit data...
xmlhelp Loading commit data...
xmloff Loading commit data...
xmlreader Loading commit data...
xmlscript Loading commit data...
xmlsecurity Loading commit data...
.buckconfig Loading commit data...
.buckversion Loading commit data...
.clang-format Loading commit data...
.editorconfig Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.gitmodules Loading commit data...
.gitreview Loading commit data...
BUCK Loading commit data...
COPYING Loading commit data...
COPYING.LGPL Loading commit data...
COPYING.MPL Loading commit data...
Library_merged.mk Loading commit data...
Makefile.fetch Loading commit data...
Makefile.gbuild Loading commit data...
Makefile.in Loading commit data...
README.Solaris Loading commit data...
README.cross Loading commit data...
README.md Loading commit data...
Repository.mk Loading commit data...
RepositoryExternal.mk Loading commit data...
RepositoryFixes.mk Loading commit data...
RepositoryModule_build.mk Loading commit data...
RepositoryModule_host.mk Loading commit data...
TEMPLATE.SOURCECODE.HEADER Loading commit data...
autogen.sh Loading commit data...
config.guess Loading commit data...
config.sub Loading commit data...
config_host.mk.in Loading commit data...
config_host_lang.mk.in Loading commit data...
configure.ac Loading commit data...
download.lst Loading commit data...
g Loading commit data...
install-sh Loading commit data...
leak-suppress.txt Loading commit data...
lo.xcent.in Loading commit data...
logerrit Loading commit data...
sanitize-ubsan-blacklist Loading commit data...
setup.cfg Loading commit data...