diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2021-07-21 13:08:48 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2021-07-21 15:27:02 +0200 |
commit | e854abe076155fc085b56549ced50b3ee9a095d2 (patch) | |
tree | 693b520df914d2c7ede7c9258f54334fddf3e1ed /unotest | |
parent | 6fcb7ca818ebf819008cac55f08fe0e6c310d8cc (diff) |
Avoid external processes picking up instdir/program/libnspr4.so
...which is a problem in ASan builds, as seen with a failing
CppunitTest_sd_import_tests (among lots of other similarly failing tests):
> Exception in thread "main" java.lang.UnsatisfiedLinkError: /usr/lib/jvm/java-11-openjdk-11.0.11.0.9-5.fc34.x86_64/lib/libsystemconf.so: ~/lo/core/instdir/program/libnspr4.so: undefined symbol: __asan_option_detect_stack_use_after_return
> at java.base/java.lang.ClassLoader$NativeLibrary.load0(Native Method)
> at java.base/java.lang.ClassLoader$NativeLibrary.load(ClassLoader.java:2442)
> at java.base/java.lang.ClassLoader$NativeLibrary.loadLibrary(ClassLoader.java:2498)
> at java.base/java.lang.ClassLoader.loadLibrary0(ClassLoader.java:2694)
> at java.base/java.lang.ClassLoader.loadLibrary(ClassLoader.java:2648)
> at java.base/java.lang.Runtime.loadLibrary0(Runtime.java:830)
> at java.base/java.lang.System.loadLibrary(System.java:1873)
> at java.base/java.security.SystemConfigurator$1.run(SystemConfigurator.java:67)
> at java.base/java.security.SystemConfigurator$1.run(SystemConfigurator.java:65)
> at java.base/java.security.AccessController.doPrivileged(Native Method)
> at java.base/java.security.SystemConfigurator.<clinit>(SystemConfigurator.java:65)
> at java.base/java.security.Security.initialize(Security.java:208)
> at java.base/java.security.Security$2.run(Security.java:93)
> at java.base/java.security.Security$2.run(Security.java:91)
> at java.base/java.security.AccessController.doPrivileged(Native Method)
> at java.base/java.security.Security.<clinit>(Security.java:91)
> at java.base/sun.security.jca.ProviderList.<init>(ProviderList.java:176)
> at java.base/sun.security.jca.ProviderList$2.run(ProviderList.java:94)
> at java.base/sun.security.jca.ProviderList$2.run(ProviderList.java:92)
> at java.base/java.security.AccessController.doPrivileged(Native Method)
> at java.base/sun.security.jca.ProviderList.fromSecurityProperties(ProviderList.java:91)
> at java.base/sun.security.jca.Providers.<clinit>(Providers.java:54)
> at java.base/java.security.SecureRandom.getDefaultPRNG(SecureRandom.java:264)
> at java.base/java.security.SecureRandom.<init>(SecureRandom.java:219)
> at java.base/java.util.UUID$Holder.<clinit>(UUID.java:101)
> at java.base/java.util.UUID.randomUUID(UUID.java:147)
> at org.probatron.officeotron.sessionstorage.Store.putZippedResource(Unknown Source)
> at org.probatron.officeotron.CommandLineSubmission.<init>(Unknown Source)
> at org.probatron.officeotron.Driver.main(Unknown Source)
> warn:svl.items:1258842:1258842:svl/source/items/itempool.cxx:358: old secondary pool: EditEngineItemPool of pool: XOutdevItemPool must be empty.
> ~/lo/core/test/source/bootstrapfixture.cxx:232:SdImportTest::testDocumentLayout
> equality assertion failed
> - Expected: 0
> - Actual : 256
> - failed to execute: sh ~/lo/core/bin/officeotron.sh ~/lo/tmp/SdImportTest__testDocumentLayout_16w8dw.tmp > ~/lo/tmp/SdImportTest__testDocumentLayout_16w8dy.tmp
The solution reuses the arg-env bootstrap variable already used by
test::OfficeConnection::setUp (unotest/source/cpp/officeconnection.cxx) and for
that makes test::getArgumnet available outside Library_unotest. (For
simplicity, it adds the relevant gb_CppunitTest_add_arguments calls
unconditionally to the various *.mk files, even though the data is only used
conditionally for non-_WIN32 in test::BootstrapFixture::validate in
test/source/bootstrapfixture.cxx, at least for now.)
Not sure what exactly started to cause this issue now for my ASan builds on
Fedora 34.
Change-Id: I7a4d6c0e36b94935442c6c91d5ee967fcad61763
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119317
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'unotest')
-rw-r--r-- | unotest/source/cpp/getargument.cxx | 5 | ||||
-rw-r--r-- | unotest/source/cpp/getargument.hxx | 41 | ||||
-rw-r--r-- | unotest/source/cpp/gettestargument.cxx | 5 | ||||
-rw-r--r-- | unotest/source/cpp/officeconnection.cxx | 9 |
4 files changed, 8 insertions, 52 deletions
diff --git a/unotest/source/cpp/getargument.cxx b/unotest/source/cpp/getargument.cxx index 5c40a0a324b4..22cd39fc5960 100644 --- a/unotest/source/cpp/getargument.cxx +++ b/unotest/source/cpp/getargument.cxx @@ -22,10 +22,9 @@ #include <osl/diagnose.h> #include <rtl/bootstrap.hxx> #include <rtl/ustring.hxx> +#include <unotest/getargument.hxx> -#include "getargument.hxx" - -namespace test::detail +namespace test { bool getArgument(std::u16string_view name, OUString* value) { diff --git a/unotest/source/cpp/getargument.hxx b/unotest/source/cpp/getargument.hxx deleted file mode 100644 index 1a95e487b39b..000000000000 --- a/unotest/source/cpp/getargument.hxx +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#pragma once - -#include <sal/config.h> - -#include <string_view> - -#include <rtl/ustring.hxx> - -namespace test { - -namespace detail { - -// Obtain the value of an argument tunneled in via an "arg-<name>" bootstrap -// variable: -bool getArgument( - std::u16string_view name, OUString * value); - -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotest/source/cpp/gettestargument.cxx b/unotest/source/cpp/gettestargument.cxx index 915ea5690e82..4423ec3a6bb2 100644 --- a/unotest/source/cpp/gettestargument.cxx +++ b/unotest/source/cpp/gettestargument.cxx @@ -20,15 +20,14 @@ #include <sal/config.h> #include <rtl/ustring.hxx> +#include <unotest/getargument.hxx> #include <unotest/gettestargument.hxx> -#include "getargument.hxx" - namespace test { bool getTestArgument(std::u16string_view name, OUString* value) { - return detail::getArgument(OUString(OUString::Concat("testarg.") + name), value); + return getArgument(OUString(OUString::Concat("testarg.") + name), value); } } diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx index 55525736f346..649d636d0fa6 100644 --- a/unotest/source/cpp/officeconnection.cxx +++ b/unotest/source/cpp/officeconnection.cxx @@ -30,11 +30,10 @@ #include <osl/test/uniquepipename.hxx> #include <osl/time.h> #include <sal/macros.h> +#include <unotest/getargument.hxx> #include <unotest/officeconnection.hxx> #include <unotest/toabsolutefileurl.hxx> -#include "getargument.hxx" - namespace test { OfficeConnection::OfficeConnection(): process_(nullptr) {} @@ -48,7 +47,7 @@ void OfficeConnection::setUp() { OUString desc; OUString argSoffice; CPPUNIT_ASSERT( - detail::getArgument( + getArgument( u"soffice", &argSoffice)); if (argSoffice.match("path:")) { @@ -62,7 +61,7 @@ void OfficeConnection::setUp() { OUString acceptArg("--accept=" + desc + ";urp"); OUString argUser; CPPUNIT_ASSERT( - detail::getArgument(u"user", &argUser)); + getArgument(u"user", &argUser)); OUString userArg("-env:UserInstallation=" + toAbsoluteFileUrl(argUser)); OUString jreArg( "-env:UNO_JAVA_JFW_ENV_JREHOME=true"); @@ -72,7 +71,7 @@ void OfficeConnection::setUp() { jreArg.pData }; rtl_uString ** envs = nullptr; OUString argEnv; - if (detail::getArgument(u"env", &argEnv)) + if (getArgument(u"env", &argEnv)) { envs = &argEnv.pData; } |