diff options
Diffstat (limited to 'tests/auto/corelib/plugin/qpluginloader')
21 files changed, 796 insertions, 512 deletions
diff --git a/tests/auto/corelib/plugin/qpluginloader/BLACKLIST b/tests/auto/corelib/plugin/qpluginloader/BLACKLIST deleted file mode 100644 index bfcfdff61b..0000000000 --- a/tests/auto/corelib/plugin/qpluginloader/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -[loadMachO] -macos cmake diff --git a/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt index a051bb3ea6..592b8632fa 100644 --- a/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt @@ -1,4 +1,11 @@ -# Generated from qpluginloader.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qpluginloader LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() add_subdirectory(lib) add_subdirectory(staticplugin) diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt index fe5d6295aa..15ae79dfb1 100644 --- a/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from almostplugin.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## almostplugin Generic Library: @@ -10,23 +11,8 @@ qt_internal_add_cmake_library(almostplugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" SOURCES almostplugin.cpp almostplugin.h - PUBLIC_LIBRARIES + LIBRARIES Qt::Core ) -#### Keys ignored in scope 1:.:.:almostplugin.pro:<TRUE>: -# INSTALLS = "target" -# TEMPLATE = "lib" -# target.path = "$$[QT_INSTALL_TESTS]/tst_qpluginloader/bin" - -## Scopes: -##################################################################### - qt_autogen_tools_initial_setup(almostplugin) -# special case begin -# We want the opposite of this -#qt_internal_extend_target(almostplugin CONDITION GCC -# LINK_OPTIONS -# "--Wl,--no-undefined" -#) -# special case end diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.cpp b/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.cpp index 75806dd285..29b6df2683 100644 --- a/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.cpp +++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore/QString> #include "almostplugin.h" #include <QtCore/qplugin.h> diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.h b/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.h index 4dd8df52f0..dea26875c2 100644 --- a/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.h +++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef ALMOSTPLUGIN_H #define ALMOSTPLUGIN_H diff --git a/tests/auto/corelib/plugin/qpluginloader/fakeplugin.cpp b/tests/auto/corelib/plugin/qpluginloader/fakeplugin.cpp index a6d53f350f..e84bfa6dbc 100644 --- a/tests/auto/corelib/plugin/qpluginloader/fakeplugin.cpp +++ b/tests/auto/corelib/plugin/qpluginloader/fakeplugin.cpp @@ -1,36 +1,57 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Intel Corporation. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#ifndef QT_VERSION_MAJOR +# include <QtCore/qglobal.h> +#endif -#include <QtCore/qplugin.h> +extern "C" void *qt_plugin_instance() +{ + return nullptr; +} -#if QT_POINTER_SIZE == 8 -QT_PLUGIN_METADATA_SECTION const uintptr_t pluginSection = 0xc0ffeec0ffeeULL; +#ifdef QT_DEBUG +static constexpr bool IsDebug = true; #else -QT_PLUGIN_METADATA_SECTION const uintptr_t pluginSection = 0xc0ffee; +static constexpr bool IsDebug = false; +#endif + +#ifndef PLUGIN_VERSION +# define PLUGIN_VERSION (QT_VERSION_MAJOR >= 7 ? 1 : 0) +#endif +#if PLUGIN_VERSION == 1 +# define PLUGIN_HEADER 1, QT_VERSION_MAJOR, 0, IsDebug ? 0x80 : 0 +#else +# define PLUGIN_HEADER 0, QT_VERSION_MAJOR, 0, IsDebug +#endif + +#if defined(__ELF__) && PLUGIN_VERSION >= 1 +// GCC will produce: +// fakeplugin.cpp:64:3: warning: ‘no_sanitize’ attribute ignored [-Wattributes] +__attribute__((section(".note.qt.metadata"), used, no_sanitize("address"), aligned(sizeof(void*)))) +static const struct { + unsigned n_namesz = sizeof(name); + unsigned n_descsz = sizeof(payload); + unsigned n_type = 0x74510001; + char name[12] = "qt-project!"; + alignas(unsigned) unsigned char payload[2 + 4] = { + PLUGIN_HEADER, + 0xbf, + 0xff, + }; +} qtnotemetadata; +#elif PLUGIN_VERSION >= 0 +# ifdef _MSC_VER +# pragma section(".qtmetadata",read,shared) +__declspec(allocate(".qtmetadata")) +# elif defined(__APPLE__) +__attribute__ ((section ("__TEXT,qtmetadata"), used)) +# else +__attribute__ ((section(".qtmetadata"), used)) +# endif +static const unsigned char qtmetadata[] = { + 'Q', 'T', 'M', 'E', 'T', 'A', 'D', 'A', 'T', 'A', ' ', '!', + PLUGIN_HEADER, + 0xbf, + 0xff, +}; #endif -QT_PLUGIN_METADATA_SECTION const char message[] = "QTMETADATA"; diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt index 7914f07c0d..283bdb1352 100644 --- a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from lib.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qpluginloaderlib Generic Library: @@ -10,21 +11,14 @@ qt_internal_add_cmake_library(tst_qpluginloaderlib OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" SOURCES mylib.c - PUBLIC_LIBRARIES + LIBRARIES Qt::Core ) -# special case begin if(WIN32) # CMake sets for Windows-GNU platforms the suffix "lib" set_property(TARGET tst_qpluginloaderlib PROPERTY PREFIX "") endif() -# special case begin - -#### Keys ignored in scope 1:.:.:lib.pro:<TRUE>: -# INSTALLS = "target" -# TEMPLATE = "lib" -# target.path = "$$[QT_INSTALL_TESTS]/tst_qpluginloader/bin" ## Scopes: ##################################################################### @@ -34,9 +28,7 @@ qt_internal_extend_target(tst_qpluginloaderlib CONDITION MSVC WIN32_MSVC ) -# special case begin set_target_properties(tst_qpluginloaderlib PROPERTIES C_VISIBILITY_PRESET "default" CXX_VISIBILITY_PRESET "default" ) -# special case end diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/mylib.c b/tests/auto/corelib/plugin/qpluginloader/lib/mylib.c index 8d23b999c4..3f1fe03114 100644 --- a/tests/auto/corelib/plugin/qpluginloader/lib/mylib.c +++ b/tests/auto/corelib/plugin/qpluginloader/lib/mylib.c @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <qglobal.h> diff --git a/tests/auto/corelib/plugin/qpluginloader/machtest/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/machtest/CMakeLists.txt index 05cd044aa3..6cb69fc46d 100644 --- a/tests/auto/corelib/plugin/qpluginloader/machtest/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/machtest/CMakeLists.txt @@ -1,2 +1,138 @@ -# Generated from machtest.pro. +set_directory_properties(PROPERTIES + _qt_good_targets "" + _qt_stub_targets "" +) +function(add_plugin_binary) + set(no_value_options "") + set(single_value_options NAME ARCH OUT_TARGET) + set(multi_value_options SOURCES) + cmake_parse_arguments(PARSE_ARGV 0 arg + "${no_value_options}" "${single_value_options}" "${multi_value_options}" + ) + + set(output_name ${arg_NAME}.${arg_ARCH}) + set(target tst_qpluginloader.${output_name}) + set(${arg_OUT_TARGET} ${target} PARENT_SCOPE) + set_property(DIRECTORY APPEND PROPERTY _qt_${arg_NAME}_targets ${target}) + add_library(${target} MODULE ${arg_SOURCES}) + add_dependencies(tst_qpluginloader ${target}) + set_target_properties(${target} PROPERTIES + OUTPUT_NAME ${output_name} + PREFIX "" + SUFFIX ".dylib" + DEBUG_POSTFIX "" + OSX_ARCHITECTURES ${arg_ARCH} + ) +endfunction() + +function(add_good_binary) + set(no_value_options "") + set(single_value_options ARCH) + set(multi_value_options "") + cmake_parse_arguments(PARSE_ARGV 0 arg + "${no_value_options}" "${single_value_options}" "${multi_value_options}" + ) + + add_plugin_binary( + NAME good + ARCH ${arg_ARCH} + SOURCES ../fakeplugin.cpp + OUT_TARGET target + ) + + # We cannot link against Qt6::Core, because the architecture might not match. + # Extract the include directories from Qt6::Core. + get_target_property(incdirs Qt6::Core INTERFACE_INCLUDE_DIRECTORIES) + target_include_directories(${target} PRIVATE ${incdirs}) + + # Extract the compile definitions from Qt6::Core and disable version tagging. + get_target_property(compdefs Qt6::Core INTERFACE_COMPILE_DEFINITIONS) + target_compile_definitions(${target} PRIVATE + ${compdefs} + QT_NO_VERSION_TAGGING + ) +endfunction() + +function(add_stub_binary) + set(no_value_options "") + set(single_value_options ARCH) + set(multi_value_options "") + cmake_parse_arguments(PARSE_ARGV 0 arg + "${no_value_options}" "${single_value_options}" "${multi_value_options}" + ) + + add_plugin_binary( + NAME stub + ARCH ${arg_ARCH} + SOURCES stub.cpp + ) +endfunction() + +function(add_fat_binary) + set(no_value_options "") + set(single_value_options NAME OUT_TARGET) + set(multi_value_options TARGETS) + cmake_parse_arguments(PARSE_ARGV 0 arg + "${no_value_options}" "${single_value_options}" "${multi_value_options}" + ) + + set(arch_args "") + foreach(dependency IN LISTS arg_TARGETS) + get_target_property(arch ${dependency} OSX_ARCHITECTURES) + list(APPEND arch_args -arch ${arch} $<TARGET_FILE_NAME:${dependency}>) + endforeach() + + set(output_name good.fat.${arg_NAME}) + set(output_file ${output_name}.dylib) + set(target tst_qpluginloader.${output_name}) + set(${arg_OUT_TARGET} ${target} PARENT_SCOPE) + add_custom_command( + OUTPUT ${output_file} + COMMAND lipo -create -output ${output_file} ${arch_args} + DEPENDS ${arg_TARGETS} + ) + add_custom_target(${target} + DEPENDS ${output_file} + ) + add_dependencies(tst_qpluginloader ${target}) +endfunction() + +set(archs_to_test arm64 x86_64) +foreach(arch IN LISTS archs_to_test) + add_good_binary(ARCH ${arch}) + add_stub_binary(ARCH ${arch}) +endforeach() + +get_directory_property(good_targets _qt_good_targets) +add_fat_binary(NAME all TARGETS ${good_targets}) + +set(targets ${good_targets}) +list(FILTER targets EXCLUDE REGEX "\\.arm64$") +add_fat_binary(NAME no-arm64 TARGETS ${targets}) + +set(targets ${good_targets}) +list(FILTER targets EXCLUDE REGEX "\\.x86_64$") +add_fat_binary(NAME no-x86_64 TARGETS ${targets}) + +get_directory_property(stub_targets _qt_stub_targets) +set(targets ${stub_targets}) +list(FILTER targets INCLUDE REGEX "\\.arm64$") +add_fat_binary(NAME stub-arm64 TARGETS ${targets}) + +set(targets ${stub_targets}) +list(FILTER targets INCLUDE REGEX "\\.x86_64$") +add_fat_binary(NAME stub-x86_64 TARGETS ${targets}) + +set(bad_binary_names "") +foreach(i RANGE 1 13) + list(APPEND bad_binary_names "bad${i}.dylib") +endforeach() +add_custom_command( + OUTPUT ${bad_binary_names} + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/generate-bad.pl +) +add_custom_target(tst_qpluginloader_generate_bad_binaries + DEPENDS ${bad_binary_names} +) +add_dependencies(tst_qpluginloader tst_qpluginloader_generate_bad_binaries) diff --git a/tests/auto/corelib/plugin/qpluginloader/machtest/generate-bad.pl b/tests/auto/corelib/plugin/qpluginloader/machtest/generate-bad.pl index 4fed135049..3de1eb581a 100755 --- a/tests/auto/corelib/plugin/qpluginloader/machtest/generate-bad.pl +++ b/tests/auto/corelib/plugin/qpluginloader/machtest/generate-bad.pl @@ -1,31 +1,6 @@ #!/usr/bin/perl -############################################################################# -## -## Copyright (C) 2016 Intel Corporation. -## Contact: https://www.qt.io/licensing/ -## -## This file is the build configuration utility of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:GPL-EXCEPT$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 as published by the Free Software -## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2016 Intel Corporation. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 use strict; use constant FAT_MAGIC => 0xcafebabe; diff --git a/tests/auto/corelib/plugin/qpluginloader/machtest/ppcconverter.pl b/tests/auto/corelib/plugin/qpluginloader/machtest/ppcconverter.pl deleted file mode 100755 index 7242d7596b..0000000000 --- a/tests/auto/corelib/plugin/qpluginloader/machtest/ppcconverter.pl +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/perl -############################################################################# -## -## Copyright (C) 2016 Intel Corporation. -## Contact: https://www.qt.io/licensing/ -## -## This file is the build configuration utility of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:GPL-EXCEPT$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 as published by the Free Software -## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# Changes the Mach-O file type header to PowerPC. -# -# The header is (from mach-o/loader.h): -# struct mach_header { -# uint32_t magic; /* mach magic number identifier */ -# cpu_type_t cputype; /* cpu specifier */ -# cpu_subtype_t cpusubtype; /* machine specifier */ -# uint32_t filetype; /* type of file */ -# uint32_t ncmds; /* number of load commands */ -# uint32_t sizeofcmds; /* the size of all the load commands */ -# uint32_t flags; /* flags */ -# }; -# -# The 64-bit header is identical in the first three fields, except for a different -# magic number. We will not touch the magic number, we'll just reset the cputype -# field to the PowerPC type and the subtype field to zero. -# -# We will not change the file's endianness. That means we might create a little-endian -# PowerPC binary, which could not be run in real life. -# -# We will also not change the 64-bit ABI flag, which is found in the cputype's high -# byte. That means we'll create a PPC64 binary if fed a 64-bit input. -# -use strict; -use constant MH_MAGIC => 0xfeedface; -use constant MH_CIGAM => 0xcefaedfe; -use constant MH_MAGIC_64 => 0xfeedfacf; -use constant MH_CIGAM_64 => 0xcffaedfe; -use constant CPU_TYPE_POWERPC => 18; -use constant CPU_SUBTYPE_POWERPC_ALL => 0; - -my $infile = shift @ARGV or die("Missing input filename"); -my $outfile = shift @ARGV or die("Missing output filename"); - -open IN, "<$infile" or die("Can't open $infile for reading: $!\n"); -open OUT, ">$outfile" or die("Can't open $outfile for writing: $!\n"); - -binmode IN; -binmode OUT; - -# Read the first 12 bytes, which includes the interesting fields of the header -my $buffer; -read(IN, $buffer, 12); - -my $magic = vec($buffer, 0, 32); -if ($magic == MH_MAGIC || $magic == MH_MAGIC_64) { - # Big endian - # The low byte of cputype is at offset 7 - vec($buffer, 7, 8) = CPU_TYPE_POWERPC; -} elsif ($magic == MH_CIGAM || $magic == MH_CIGAM_64) { - # Little endian - # The low byte of cpytype is at offset 4 - vec($buffer, 4, 8) = CPU_TYPE_POWERPC; -} else { - $magic = ''; - $magic .= sprintf("%02X ", $_) for unpack("CCCC", $buffer); - die("Invalid input. Unknown magic $magic\n"); -} -vec($buffer, 2, 32) = CPU_SUBTYPE_POWERPC_ALL; - -print OUT $buffer; - -# Copy the rest -while (!eof(IN)) { - read(IN, $buffer, 4096) and - print OUT $buffer or - die("Problem copying: $!\n"); -} -close(IN); -close(OUT); diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt index 1448ff3933..647c8ac207 100644 --- a/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from staticplugin.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## staticplugin Generic Library: @@ -8,7 +9,7 @@ qt_internal_add_cmake_library(staticplugin STATIC SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Core MOC_OPTIONS "-M" @@ -17,7 +18,6 @@ qt_internal_add_cmake_library(staticplugin "ExtraMetaData=foo" ) -#### Keys ignored in scope 1:.:.:staticplugin.pro:<TRUE>: # TEMPLATE = "lib" qt_autogen_tools_initial_setup(staticplugin) diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/main.cpp b/tests/auto/corelib/plugin/qpluginloader/staticplugin/main.cpp index 6d163ea336..208096b425 100644 --- a/tests/auto/corelib/plugin/qpluginloader/staticplugin/main.cpp +++ b/tests/auto/corelib/plugin/qpluginloader/staticplugin/main.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 Intel Corporation. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtPlugin> #include <QObject> diff --git a/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt index 5a8bf518c5..dfce9d6a52 100644 --- a/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt @@ -1,8 +1,5 @@ -# Generated from theplugin.pro. - -##################################################################### -## theplugin Generic Library: -##################################################################### +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause qt_internal_add_cmake_library(theplugin MODULE @@ -10,13 +7,26 @@ qt_internal_add_cmake_library(theplugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" SOURCES theplugin.cpp theplugin.h - PUBLIC_LIBRARIES + LIBRARIES Qt::Core ) +qt_autogen_tools_initial_setup(theplugin) -#### Keys ignored in scope 1:.:.:theplugin.pro:<TRUE>: -# INSTALLS = "target" -# TEMPLATE = "lib" -# target.path = "$$[QT_INSTALL_TESTS]/tst_qpluginloader/bin" +if (UNIX AND NOT APPLE) + qt_internal_add_cmake_library(theoldplugin + MODULE + INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin" + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" + SOURCES + theoldplugin.cpp theoldplugin.h + LIBRARIES + Qt::Core + ) + qt_autogen_tools_initial_setup(theoldplugin) + + # Force unoptimized builds with debugging information so some "QTMETADATA !" + # strings appear elsewhere in the binary. + target_compile_options(theplugin PRIVATE -O0 -g3) + target_compile_options(theoldplugin PRIVATE -O0 -g3) +endif() -qt_autogen_tools_initial_setup(theplugin) diff --git a/tests/auto/corelib/plugin/qpluginloader/theplugin/plugininterface.h b/tests/auto/corelib/plugin/qpluginloader/theplugin/plugininterface.h index 12285ba016..3fd6c384a4 100644 --- a/tests/auto/corelib/plugin/qpluginloader/theplugin/plugininterface.h +++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/plugininterface.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef PLUGININTERFACE_H #define PLUGININTERFACE_H diff --git a/tests/auto/corelib/plugin/qpluginloader/theplugin/theoldplugin.cpp b/tests/auto/corelib/plugin/qpluginloader/theplugin/theoldplugin.cpp new file mode 100644 index 0000000000..20e65b4bb0 --- /dev/null +++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/theoldplugin.cpp @@ -0,0 +1,80 @@ +// Copyright (C) 2021 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#include "theoldplugin.h" +#include <QtCore/QString> +#include <QtCore/qplugin.h> + +QString TheOldPlugin::pluginName() const +{ + return QLatin1String("Plugin ok"); +} + +static int pluginVariable = 0xc0ffee; +extern "C" Q_DECL_EXPORT int *pointerAddress() +{ + return &pluginVariable; +} + +// This hardcodes the old plugin metadata from before Qt 6.2 +QT_PLUGIN_METADATA_SECTION +static constexpr unsigned char qt_pluginMetaData_ThePlugin[] = { + 'Q', 'T', 'M', 'E', 'T', 'A', 'D', 'A', 'T', 'A', ' ', '!', + // metadata version, Qt version, architectural requirements + 0, QT_VERSION_MAJOR, QT_VERSION_MINOR, qPluginArchRequirements(), + 0xbf, + // "IID" + 0x02, 0x78, 0x2b, 'o', 'r', 'g', '.', 'q', + 't', '-', 'p', 'r', 'o', 'j', 'e', 'c', + 't', '.', 'Q', 't', '.', 'a', 'u', 't', + 'o', 't', 'e', 's', 't', 's', '.', 'p', + 'l', 'u', 'g', 'i', 'n', 'i', 'n', 't', + 'e', 'r', 'f', 'a', 'c', 'e', + // "className" + 0x03, 0x69, 'T', 'h', 'e', 'P', 'l', 'u', + 'g', 'i', 'n', + // "MetaData" + 0x04, 0xa2, 0x67, 'K', 'P', 'l', 'u', 'g', + 'i', 'n', 0xa8, 0x64, 'N', 'a', 'm', 'e', + 0x6e, 'W', 'i', 'n', 'd', 'o', 'w', 'G', + 'e', 'o', 'm', 'e', 't', 'r', 'y', 0x68, + 'N', 'a', 'm', 'e', '[', 'm', 'r', ']', + 0x78, 0x1f, uchar('\xe0'), uchar('\xa4'), uchar('\x9a'), uchar('\xe0'), uchar('\xa5'), uchar('\x8c'), + uchar('\xe0'), uchar('\xa4'), uchar('\x95'), uchar('\xe0'), uchar('\xa4'), uchar('\x9f'), ' ', uchar('\xe0'), + uchar('\xa4'), uchar('\xad'), uchar('\xe0'), uchar('\xa5'), uchar('\x82'), uchar('\xe0'), uchar('\xa4'), uchar('\xae'), + uchar('\xe0'), uchar('\xa4'), uchar('\xbf'), uchar('\xe0'), uchar('\xa4'), uchar('\xa4'), uchar('\xe0'), uchar('\xa5'), + uchar('\x80'), 0x68, 'N', 'a', 'm', 'e', '[', 'p', + 'a', ']', 0x78, 0x24, uchar('\xe0'), uchar('\xa8'), uchar('\xb5'), uchar('\xe0'), + uchar('\xa8'), uchar('\xbf'), uchar('\xe0'), uchar('\xa9'), uchar('\xb0'), uchar('\xe0'), uchar('\xa8'), uchar('\xa1'), + uchar('\xe0'), uchar('\xa9'), uchar('\x8b'), uchar('\xe0'), uchar('\xa8'), uchar('\x9c'), uchar('\xe0'), uchar('\xa9'), + uchar('\x81'), uchar('\xe0'), uchar('\xa8'), uchar('\xae'), uchar('\xe0'), uchar('\xa9'), uchar('\x88'), uchar('\xe0'), + uchar('\xa8'), uchar('\x9f'), uchar('\xe0'), uchar('\xa8'), uchar('\xb0'), uchar('\xe0'), uchar('\xa9'), uchar('\x80'), + 0x68, 'N', 'a', 'm', 'e', '[', 't', 'h', + ']', 0x78, 0x39, uchar('\xe0'), uchar('\xb8'), uchar('\xa1'), uchar('\xe0'), uchar('\xb8'), + uchar('\xb4'), uchar('\xe0'), uchar('\xb8'), uchar('\x95'), uchar('\xe0'), uchar('\xb8'), uchar('\xb4'), uchar('\xe0'), + uchar('\xb8'), uchar('\x82'), uchar('\xe0'), uchar('\xb8'), uchar('\x99'), uchar('\xe0'), uchar('\xb8'), uchar('\xb2'), + uchar('\xe0'), uchar('\xb8'), uchar('\x94'), uchar('\xe0'), uchar('\xb8'), uchar('\x82'), uchar('\xe0'), uchar('\xb8'), + uchar('\xad'), uchar('\xe0'), uchar('\xb8'), uchar('\x87'), uchar('\xe0'), uchar('\xb8'), uchar('\xab'), uchar('\xe0'), + uchar('\xb8'), uchar('\x99'), uchar('\xe0'), uchar('\xb9'), uchar('\x89'), uchar('\xe0'), uchar('\xb8'), uchar('\xb2'), + uchar('\xe0'), uchar('\xb8'), uchar('\x95'), uchar('\xe0'), uchar('\xb9'), uchar('\x88'), uchar('\xe0'), uchar('\xb8'), + uchar('\xb2'), uchar('\xe0'), uchar('\xb8'), uchar('\x87'), 0x68, 'N', 'a', 'm', + 'e', '[', 'u', 'k', ']', 0x78, 0x19, uchar('\xd0'), + uchar('\xa0'), uchar('\xd0'), uchar('\xbe'), uchar('\xd0'), uchar('\xb7'), uchar('\xd0'), uchar('\xbc'), uchar('\xd1'), + uchar('\x96'), uchar('\xd1'), uchar('\x80'), uchar('\xd0'), uchar('\xb8'), ' ', uchar('\xd0'), uchar('\xb2'), + uchar('\xd1'), uchar('\x96'), uchar('\xd0'), uchar('\xba'), uchar('\xd0'), uchar('\xbd'), uchar('\xd0'), uchar('\xb0'), + 0x6b, 'N', 'a', 'm', 'e', '[', 'z', 'h', + '_', 'C', 'N', ']', 0x6c, uchar('\xe7'), uchar('\xaa'), uchar('\x97'), + uchar('\xe5'), uchar('\x8f'), uchar('\xa3'), uchar('\xe5'), uchar('\xbd'), uchar('\xa2'), uchar('\xe7'), uchar('\x8a'), + uchar('\xb6'), 0x6b, 'N', 'a', 'm', 'e', '[', 'z', + 'h', '_', 'T', 'W', ']', 0x6c, uchar('\xe8'), uchar('\xa6'), + uchar('\x96'), uchar('\xe7'), uchar('\xaa'), uchar('\x97'), uchar('\xe4'), uchar('\xbd'), uchar('\x8d'), uchar('\xe7'), + uchar('\xbd'), uchar('\xae'), 0x6c, 'S', 'e', 'r', 'v', 'i', + 'c', 'e', 'T', 'y', 'p', 'e', 's', 0x81, + 0x68, 'K', 'C', 'M', 'o', 'd', 'u', 'l', + 'e', 0x76, 'X', '-', 'K', 'D', 'E', '-', + 'P', 'a', 'r', 'e', 'n', 't', 'C', 'o', + 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', + 0x81, 0x6e, 'w', 'i', 'n', 'd', 'o', 'w', + 'g', 'e', 'o', 'm', 'e', 't', 'r', 'y', + 0xff, +}; +QT_MOC_EXPORT_PLUGIN(TheOldPlugin, ThePlugin) diff --git a/tests/auto/corelib/plugin/qpluginloader/theplugin/theoldplugin.h b/tests/auto/corelib/plugin/qpluginloader/theplugin/theoldplugin.h new file mode 100644 index 0000000000..786ce3f618 --- /dev/null +++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/theoldplugin.h @@ -0,0 +1,21 @@ +// Copyright (C) 2021 Intel Corportaion. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#ifndef THEOLDPLUGIN_H +#define THEOLDPLUGIN_H + +#include <QObject> +#include <QtPlugin> +#include "plugininterface.h" + +class TheOldPlugin : public QObject, public PluginInterface +{ + Q_OBJECT + // Q_PLUGIN_METADATA intentionally missing + Q_INTERFACES(PluginInterface) + +public: + virtual QString pluginName() const override; +}; + +#endif // THEOLDPLUGIN_H + diff --git a/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.cpp b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.cpp index 01563c3dc9..bfa45c7c48 100644 --- a/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.cpp +++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore/QString> #include "theplugin.h" #include <QtCore/qplugin.h> diff --git a/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.h b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.h index 7c9324b8b3..a6b7e4a083 100644 --- a/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.h +++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef THEPLUGIN_H #define THEPLUGIN_H diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt index 1193a9d731..16dd1cf9cf 100644 --- a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from tst.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qpluginloader Test: @@ -14,30 +15,57 @@ qt_internal_add_test(tst_qpluginloader ../fakeplugin.cpp ../theplugin/plugininterface.h ../tst_qpluginloader.cpp - PUBLIC_LIBRARIES + LIBRARIES staticplugin TESTDATA ${test_data} ) +add_dependencies(tst_qpluginloader tst_qpluginloaderlib staticplugin theplugin) +if (UNIX) + if(NOT APPLE) + add_dependencies(tst_qpluginloader theoldplugin) + endif() + if (NOT ANDROID AND NOT APPLE) + add_dependencies(tst_qpluginloader almostplugin) + endif() +endif() + +if(ANDROID) + add_compile_definitions(ANDROID_ARCH="${CMAKE_ANDROID_ARCH_ABI}") + set(plugins + theplugin + theoldplugin + tst_qpluginloaderlib + ) + set(extra_libs) + foreach(plugin IN LISTS plugins) + list(APPEND extra_libs + "${CMAKE_CURRENT_BINARY_DIR}/../bin/lib${plugin}_${CMAKE_ANDROID_ARCH_ABI}.so") + endforeach() + set_target_properties(tst_qpluginloader PROPERTIES + QT_ANDROID_EXTRA_LIBS "${extra_libs}" + ) +endif() + ## Scopes: ##################################################################### qt_internal_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate ) qt_internal_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release - PUBLIC_LIBRARIES + LIBRARIES # Remove: L../staticplugin/debug ) qt_internal_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug - PUBLIC_LIBRARIES + LIBRARIES # Remove: L../staticplugin/release ) qt_internal_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release - PUBLIC_LIBRARIES + LIBRARIES # Remove: L../staticplugin ) diff --git a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp index bab3544946..f4ecf5bfb3 100644 --- a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp +++ b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp @@ -1,31 +1,6 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Copyright (C) 2021 Intel Corporation. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2020 The Qt Company Ltd. +// Copyright (C) 2021 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QTest> #include <QSignalSpy> @@ -33,14 +8,16 @@ #include <qdir.h> #include <qendian.h> #include <qpluginloader.h> -#include <qprocess.h> #include <qtemporaryfile.h> +#include <QScopeGuard> #include "theplugin/plugininterface.h" #if defined(QT_BUILD_INTERNAL) && defined(Q_OF_MACH_O) # include <QtCore/private/qmachparser_p.h> #endif +using namespace Qt::StringLiterals; + // Helper macros to let us know if some suffixes are valid #define bundle_VALID false #define dylib_VALID false @@ -95,15 +72,23 @@ #endif #if defined(Q_OF_ELF) -# include <elf.h> +#if __has_include(<elf.h>) +# include <elf.h> +#else +# include <sys/elf.h> +#endif # include <memory> # include <functional> # ifdef _LP64 using ElfHeader = Elf64_Ehdr; +using ElfPhdr = Elf64_Phdr; +using ElfNhdr = Elf64_Nhdr; using ElfShdr = Elf64_Shdr; # else using ElfHeader = Elf32_Ehdr; +using ElfPhdr = Elf32_Phdr; +using ElfNhdr = Elf32_Nhdr; using ElfShdr = Elf32_Shdr; # endif @@ -142,7 +127,10 @@ static std::unique_ptr<QTemporaryFile> patchElf(const QString &source, ElfPatche QVERIFY2(srcdata, qPrintable(srclib.errorString())); // copy our source plugin so we can modify it - tmplib.reset(new QTemporaryFile(QTest::currentDataTag() + QString(".XXXXXX" SUFFIX))); + const char *basename = QTest::currentDataTag(); + if (!basename) + basename = QTest::currentTestFunction(); + tmplib.reset(new QTemporaryFile(QDir::currentPath() + u'/' + basename + u".XXXXXX" SUFFIX ""_s)); QVERIFY2(tmplib->open(), qPrintable(tmplib->errorString())); // sanity-check @@ -170,16 +158,26 @@ static std::unique_ptr<QTemporaryFile> patchElf(const QString &source, ElfPatche if (QTest::currentTestFailed()) return; \ std::move(r); \ }) -#endif +#endif // Q_OF_ELF static QString sys_qualifiedLibraryName(const QString &fileName) { +#ifdef Q_OS_ANDROID + // On Android all the libraries must be located in the APK's libs subdir + const QStringList paths = QCoreApplication::libraryPaths(); + if (!paths.isEmpty()) { + return QLatin1String("%1/%2%3_%4%5").arg(paths.first(), PREFIX, fileName, + ANDROID_ARCH, SUFFIX); + } + return fileName; +#else QString name = QLatin1String("bin/") + QLatin1String(PREFIX) + fileName + QLatin1String(SUFFIX); const QString libname = QFINDTESTDATA(name); QFileInfo fi(libname); if (fi.exists()) return fi.canonicalFilePath(); return libname; +#endif } QT_FORWARD_DECLARE_CLASS(QPluginLoader) @@ -192,19 +190,25 @@ private slots: void errorString(); void loadHints(); void deleteinstanceOnUnload(); -#if defined (__ELF__) +#if defined (Q_OF_ELF) void loadDebugObj(); void loadCorruptElf_data(); void loadCorruptElf(); +# if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) + void loadCorruptElfOldPlugin_data(); + void loadCorruptElfOldPlugin(); +# endif #endif void loadMachO_data(); void loadMachO(); void relativePath(); void absolutePath(); void reloadPlugin(); + void loadSectionTableStrippedElf(); void preloadedPlugin_data(); void preloadedPlugin(); void staticPlugins(); + void reregisteredStaticPlugins(); }; Q_IMPORT_PLUGIN(StaticPlugin) @@ -276,7 +280,9 @@ void tst_QPluginLoader::errorString() QVERIFY(!unloaded); } -#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) && !defined(Q_OS_HPUX) +// A bug in QNX causes the test to crash on exit after attempting to load +// a shared library with undefined symbols (tracked as QTBUG-114682). +#if !defined(Q_OS_WIN) && !defined(Q_OS_DARWIN) && !defined(Q_OS_HPUX) && !defined(Q_OS_QNX) { QPluginLoader loader( sys_qualifiedLibraryName("almostplugin")); //a plugin with unresolved symbols loader.setLoadHints(QLibrary::ResolveAllSymbolsHint); @@ -294,29 +300,36 @@ void tst_QPluginLoader::errorString() } #endif - { - QPluginLoader loader( sys_qualifiedLibraryName("theplugin")); //a plugin - - // Check metadata - const QJsonObject metaData = loader.metaData(); - QCOMPARE(metaData.value("IID").toString(), QStringLiteral("org.qt-project.Qt.autotests.plugininterface")); - const QJsonObject kpluginObject = metaData.value("MetaData").toObject().value("KPlugin").toObject(); - QCOMPARE(kpluginObject.value("Name[mr]").toString(), QString::fromUtf8("चौकट भूमिती")); - - // Load - QCOMPARE(loader.load(), true); - QCOMPARE(loader.errorString(), unknown); - - QVERIFY(loader.instance() != static_cast<QObject*>(0)); - QCOMPARE(loader.errorString(), unknown); - - // Make sure that plugin really works - PluginInterface* theplugin = qobject_cast<PluginInterface*>(loader.instance()); - QString pluginName = theplugin->pluginName(); - QCOMPARE(pluginName, QLatin1String("Plugin ok")); - - QCOMPARE(loader.unload(), true); - QCOMPARE(loader.errorString(), unknown); + static constexpr std::initializer_list<const char *> validplugins = { + "theplugin", +#if defined(Q_OF_ELF) && QT_VERSION < QT_VERSION_CHECK(7, 0, 0) + "theoldplugin" +#endif + }; + for (const char *basename : validplugins) { + QPluginLoader loader( sys_qualifiedLibraryName(basename)); //a plugin + + // Check metadata + const QJsonObject metaData = loader.metaData(); + QVERIFY2(!metaData.isEmpty(), "No metadata from " + loader.fileName().toLocal8Bit()); + QCOMPARE(metaData.value("IID").toString(), QStringLiteral("org.qt-project.Qt.autotests.plugininterface")); + const QJsonObject kpluginObject = metaData.value("MetaData").toObject().value("KPlugin").toObject(); + QCOMPARE(kpluginObject.value("Name[mr]").toString(), QString::fromUtf8("चौकट भूमिती")); + + // Load + QVERIFY2(loader.load(), qPrintable(loader.errorString())); + QCOMPARE(loader.errorString(), unknown); + + QVERIFY(loader.instance() != static_cast<QObject*>(0)); + QCOMPARE(loader.errorString(), unknown); + + // Make sure that plugin really works + PluginInterface* theplugin = qobject_cast<PluginInterface*>(loader.instance()); + QString pluginName = theplugin->pluginName(); + QCOMPARE(pluginName, QLatin1String("Plugin ok")); + + QCOMPARE(loader.unload(), true); + QCOMPARE(loader.errorString(), unknown); } } @@ -326,10 +339,37 @@ void tst_QPluginLoader::loadHints() QSKIP("This test requires Qt to create shared libraries."); #endif QPluginLoader loader; - QCOMPARE(loader.loadHints(), QLibrary::LoadHints{}); //Do not crash + QCOMPARE(loader.loadHints(), QLibrary::PreventUnloadHint); //Do not crash loader.setLoadHints(QLibrary::ResolveAllSymbolsHint); + QCOMPARE(loader.loadHints(), QLibrary::ResolveAllSymbolsHint); + // We can clear load hints when file name is not set. + loader.setLoadHints(QLibrary::LoadHints{}); + QCOMPARE(loader.loadHints(), QLibrary::LoadHints{}); + // Set the hints again + loader.setLoadHints(QLibrary::ResolveAllSymbolsHint); + QCOMPARE(loader.loadHints(), QLibrary::ResolveAllSymbolsHint); loader.setFileName( sys_qualifiedLibraryName("theplugin")); //a plugin QCOMPARE(loader.loadHints(), QLibrary::ResolveAllSymbolsHint); + + QPluginLoader loader4; + QCOMPARE(loader4.loadHints(), QLibrary::PreventUnloadHint); + loader4.setLoadHints(QLibrary::LoadHints{}); + QCOMPARE(loader4.loadHints(), QLibrary::LoadHints{}); + loader4.setFileName(sys_qualifiedLibraryName("theplugin")); + // Hints are merged with hints from the previous loader. + QCOMPARE(loader4.loadHints(), QLibrary::ResolveAllSymbolsHint); + // We cannot clear load hints after associating the loader with a file. + loader.setLoadHints(QLibrary::LoadHints{}); + QCOMPARE(loader.loadHints(), QLibrary::ResolveAllSymbolsHint); + + QPluginLoader loader2; + QCOMPARE(loader2.loadHints(), QLibrary::PreventUnloadHint); + loader2.setFileName(sys_qualifiedLibraryName("theplugin")); + // Hints are merged with hints from previous loaders. + QCOMPARE(loader2.loadHints(), QLibrary::PreventUnloadHint | QLibrary::ResolveAllSymbolsHint); + + QPluginLoader loader3(sys_qualifiedLibraryName("theplugin")); + QCOMPARE(loader3.loadHints(), QLibrary::PreventUnloadHint | QLibrary::ResolveAllSymbolsHint); } void tst_QPluginLoader::deleteinstanceOnUnload() @@ -359,18 +399,19 @@ void tst_QPluginLoader::deleteinstanceOnUnload() QVERIFY(spy2.isValid()); if (pass == 0) { QCOMPARE(loader2.unload(), false); // refcount not reached 0, not really unloaded - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); } QCOMPARE(instance1->pluginName(), QLatin1String("Plugin ok")); QCOMPARE(instance2->pluginName(), QLatin1String("Plugin ok")); QVERIFY(loader1.unload()); // refcount reached 0, did really unload - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); } } -#if defined (__ELF__) +#if defined(Q_OF_ELF) + void tst_QPluginLoader::loadDebugObj() { #if !defined(QT_SHARED) @@ -381,16 +422,23 @@ void tst_QPluginLoader::loadDebugObj() QCOMPARE(lib1.load(), false); } -void tst_QPluginLoader::loadCorruptElf_data() +template <typename Lambda> +static void newRow(const char *rowname, QString &&snippet, Lambda &&patcher) +{ + QTest::newRow(rowname) + << std::move(snippet) << ElfPatcher::fromLambda(std::forward<Lambda>(patcher)); +} + +static ElfPhdr *getProgramEntry(ElfHeader *h, int index) +{ + auto phdr = reinterpret_cast<ElfPhdr *>(h->e_phoff + reinterpret_cast<uchar *>(h)); + return phdr + index; +} + +static void loadCorruptElfCommonRows() { -#if !defined(QT_SHARED) - QSKIP("This test requires a shared build of Qt, as QPluginLoader::setFileName is a no-op in static builds"); -#endif QTest::addColumn<QString>("snippet"); QTest::addColumn<ElfPatcher>("patcher"); - auto newRow = [](const char *rowname, QString &&snippet, auto patcher) { - QTest::newRow(rowname) << std::move(snippet) << ElfPatcher::fromLambda(patcher); - }; using H = ElfHeader *; // because I'm lazy newRow("not-elf", "invalid signature", [](H h) { @@ -426,7 +474,7 @@ void tst_QPluginLoader::loadCorruptElf_data() memcpy(h, &o, sizeof(o)); }); newRow("invalid-word-size", "file is for a different word size", [](H h) { - h->e_ident[EI_CLASS] = ELFCLASSNONE;; + h->e_ident[EI_CLASS] = ELFCLASSNONE; }); newRow("unknown-word-size", "file is for a different word size", [](H h) { h->e_ident[EI_CLASS] |= 0x40; @@ -505,6 +553,195 @@ void tst_QPluginLoader::loadCorruptElf_data() ++h->e_version; }); + newRow("program-entry-size-zero", "unexpected program header entry size", [](H h) { + h->e_phentsize = 0; + }); + newRow("program-entry-small", "unexpected program header entry size", [](H h) { + h->e_phentsize = alignof(ElfPhdr); + }); + + newRow("program-table-starts-past-eof", "program header table extends past the end of the file", + [](H h, QFile *f) { + h->e_phoff = f->size(); + }); + newRow("program-table-ends-past-eof", "program header table extends past the end of the file", + [](H h, QFile *f) { + h->e_phoff = f->size() + 1- h->e_phentsize * h->e_phnum; + }); + + newRow("segment-starts-past-eof", "a program header entry extends past the end of the file", + [](H h, QFile *f) { + for (int i = 0; i < h->e_phnum; ++i) { + ElfPhdr *p = getProgramEntry(h, i); + if (p->p_type != PT_LOAD) + continue; + p->p_offset = f->size(); + break; + } + }); + newRow("segment-ends-past-eof", "a program header entry extends past the end of the file", + [](H h, QFile *f) { + for (int i = 0; i < h->e_phnum; ++i) { + ElfPhdr *p = getProgramEntry(h, i); + if (p->p_type != PT_LOAD) + continue; + p->p_filesz = f->size() + 1 - p->p_offset; + break; + } + }); + newRow("segment-bounds-overflow", "a program header entry extends past the end of the file", + [](H h) { + for (int i = 0; i < h->e_phnum; ++i) { + ElfPhdr *p = getProgramEntry(h, i); + if (p->p_type != PT_LOAD) + continue; + p->p_filesz = ~size_t(0); // -1 + break; + } + }); + + newRow("no-code", "file has no code", [](H h) { + for (int i = 0; i < h->e_phnum; ++i) { + ElfPhdr *p = getProgramEntry(h, i); + if (p->p_type == PT_LOAD) + p->p_flags &= ~PF_X; + } + }); +} + +void tst_QPluginLoader::loadCorruptElf_data() +{ +#if !defined(QT_SHARED) + QSKIP("This test requires a shared build of Qt, as QPluginLoader::setFileName is a no-op in static builds"); +#endif + loadCorruptElfCommonRows(); + using H = ElfHeader *; // because I'm lazy + + // PT_NOTE tests + // general validity is tested in the common rows, for all segments + + newRow("misaligned-note-segment", "note segment start is not properly aligned", [](H h) { + for (int i = 0; i < h->e_phnum; ++i) { + ElfPhdr *p = getProgramEntry(h, i); + if (p->p_type == PT_NOTE) + ++p->p_offset; + } + }); + + static const auto getFirstNote = [](void *header, ElfPhdr *phdr) { + return reinterpret_cast<ElfNhdr *>(static_cast<uchar *>(header) + phdr->p_offset); + }; + static const auto getNextNote = [](void *header, ElfPhdr *phdr, ElfNhdr *n) { + // how far into the segment are we? + size_t offset = reinterpret_cast<uchar *>(n) - static_cast<uchar *>(header) - phdr->p_offset; + + size_t delta = sizeof(*n) + n->n_namesz + phdr->p_align - 1; + delta &= -phdr->p_align; + delta += n->n_descsz + phdr->p_align - 1; + delta &= -phdr->p_align; + + offset += delta; + if (offset < phdr->p_filesz) + n = reinterpret_cast<ElfNhdr *>(reinterpret_cast<uchar *>(n) + delta); + else + n = nullptr; + return n; + }; + + // all the intra-note errors cause the notes simply to be skipped + auto newNoteRow = [](const char *rowname, auto &&lambda) { + newRow(rowname, "is not a Qt plugin (metadata not found)", std::move(lambda)); + }; + newNoteRow("no-notes", [](H h) { + for (int i = 0; i < h->e_phnum; ++i) { + ElfPhdr *p = getProgramEntry(h, i); + if (p->p_type == PT_NOTE) + p->p_type = PT_NULL; + } + }); + + newNoteRow("note-larger-than-segment-nonqt", [](H h) { + for (int i = 0; i < h->e_phnum; ++i) { + ElfPhdr *p = getProgramEntry(h, i); + if (p->p_type != PT_NOTE) + continue; + ElfNhdr *n = getFirstNote(h, p); + n->n_descsz = p->p_filesz; + n->n_type = 0; // ensure it's not the Qt note + } + }); + newNoteRow("note-larger-than-segment-qt", [](H h) { + for (int i = 0; i < h->e_phnum; ++i) { + ElfPhdr *p = getProgramEntry(h, i); + if (p->p_type != PT_NOTE || p->p_align != alignof(QPluginMetaData::ElfNoteHeader)) + continue; + + // find the Qt metadata note + constexpr QPluginMetaData::ElfNoteHeader header(0); + ElfNhdr *n = getFirstNote(h, p); + for ( ; n; n = getNextNote(h, p, n)) { + if (n->n_type == header.n_type && n->n_namesz == header.n_namesz) { + if (memcmp(n + 1, header.name, sizeof(header.name)) == 0) + break; + } + } + + if (!n) + break; + n->n_descsz = p->p_filesz; + return; + } + qWarning("Could not find the Qt metadata note in this file. Test will fail."); + }); + newNoteRow("note-size-overflow1", [](H h) { + // due to limited range, this will not overflow on 64-bit + for (int i = 0; i < h->e_phnum; ++i) { + ElfPhdr *p = getProgramEntry(h, i); + if (p->p_type != PT_NOTE) + continue; + ElfNhdr *n = getFirstNote(h, p); + n->n_namesz = ~decltype(n->n_namesz)(0); + } + }); + newNoteRow("note-size-overflow2", [](H h) { + // due to limited range, this will not overflow on 64-bit + for (int i = 0; i < h->e_phnum; ++i) { + ElfPhdr *p = getProgramEntry(h, i); + if (p->p_type != PT_NOTE) + continue; + ElfNhdr *n = getFirstNote(h, p); + n->n_namesz = ~decltype(n->n_namesz)(0) / 2; + n->n_descsz = ~decltype(n->n_descsz)(0) / 2; + } + }); +} + +static void loadCorruptElf_helper(const QString &origLibrary) +{ + QFETCH(QString, snippet); + QFETCH(ElfPatcher, patcher); + + std::unique_ptr<QTemporaryFile> tmplib = patchElf(origLibrary, patcher); + + QPluginLoader lib(tmplib->fileName()); + QVERIFY(!lib.load()); + QVERIFY2(lib.errorString().contains(snippet), qPrintable(lib.errorString())); +} + +void tst_QPluginLoader::loadCorruptElf() +{ + loadCorruptElf_helper(sys_qualifiedLibraryName("theplugin")); +} + +# if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) +void tst_QPluginLoader::loadCorruptElfOldPlugin_data() +{ +#if !defined(QT_SHARED) + QSKIP("This test requires a shared build of Qt, as QPluginLoader::setFileName is a no-op in static builds"); +#endif + loadCorruptElfCommonRows(); + using H = ElfHeader *; // because I'm lazy + newRow("section-entry-size-zero", "unexpected section entry size", [](H h) { h->e_shentsize = 0; }); @@ -514,7 +751,7 @@ void tst_QPluginLoader::loadCorruptElf_data() newRow("section-entry-misaligned", "unexpected section entry size", [](H h) { ++h->e_shentsize; }); - newRow("no-sections", "is not a Qt plugin (.qtmetadata section not found)", [](H h){ + newRow("no-sections", "is not a Qt plugin (metadata not found)", [](H h){ h->e_shnum = h->e_shoff = h->e_shstrndx = 0; }); @@ -535,17 +772,17 @@ void tst_QPluginLoader::loadCorruptElf_data() // arbitrary section bounds checks // section index = 0 is usually a NULL section, so we try 1 - newRow("section1-starts-past-eof", "a section data extends past the end of the file", + newRow("section1-starts-past-eof", "section contents extend past the end of the file", [](H h, QFile *f) { ElfShdr *s = getSection(h, 1); s->sh_offset = f->size(); }); - newRow("section1-ends-past-eof", "a section data extends past the end of the file", + newRow("section1-ends-past-eof", "section contents extend past the end of the file", [](H h, QFile *f) { ElfShdr *s = getSection(h, 1); s->sh_size = f->size() + 1 - s->sh_offset; }); - newRow("section1-bounds-overflow", "a section data extends past the end of the file", [](H h) { + newRow("section1-bounds-overflow", "section contents extend past the end of the file", [](H h) { ElfShdr *s = getSection(h, 1); s->sh_size = -sizeof(*s); }); @@ -579,7 +816,7 @@ void tst_QPluginLoader::loadCorruptElf_data() section1->sh_name = shstrtab->sh_size; }); - newRow("debug-symbols", ".qtmetadata section not found", [](H h) { + newRow("debug-symbols", "metadata not found", [](H h) { // attempt to make it look like extracted debug info for (int i = 1; i < h->e_shnum; ++i) { ElfShdr *s = getSection(h, i); @@ -603,19 +840,13 @@ void tst_QPluginLoader::loadCorruptElf_data() }); } -void tst_QPluginLoader::loadCorruptElf() +void tst_QPluginLoader::loadCorruptElfOldPlugin() { - QFETCH(QString, snippet); - QFETCH(ElfPatcher, patcher); - - std::unique_ptr<QTemporaryFile> tmplib = - patchElf(sys_qualifiedLibraryName("theplugin"), patcher); - - QPluginLoader lib(tmplib->fileName()); - QVERIFY(!lib.load()); - QVERIFY2(lib.errorString().contains(snippet), qPrintable(lib.errorString())); + // ### Qt7: don't forget to remove theoldplugin from the build + loadCorruptElf_helper(sys_qualifiedLibraryName("theoldplugin")); } -#endif // __ELF__ +# endif // Qt 7 +#endif // Q_OF_ELF void tst_QPluginLoader::loadMachO_data() { @@ -629,26 +860,23 @@ void tst_QPluginLoader::loadMachO_data() # ifdef Q_PROCESSOR_X86_64 QTest::newRow("machtest/good.x86_64.dylib") << true; - QTest::newRow("machtest/good.i386.dylib") << false; + QTest::newRow("machtest/good.arm64.dylib") << false; QTest::newRow("machtest/good.fat.no-x86_64.dylib") << false; - QTest::newRow("machtest/good.fat.no-i386.dylib") << true; -# elif defined(Q_PROCESSOR_X86_32) - QTest::newRow("machtest/good.i386.dylib") << true; + QTest::newRow("machtest/good.fat.no-arm64.dylib") << true; +# elif defined(Q_PROCESSOR_ARM) + QTest::newRow("machtest/good.arm64.dylib") << true; QTest::newRow("machtest/good.x86_64.dylib") << false; - QTest::newRow("machtest/good.fat.no-i386.dylib") << false; + QTest::newRow("machtest/good.fat.no-arm64.dylib") << false; QTest::newRow("machtest/good.fat.no-x86_64.dylib") << true; # endif -# ifndef Q_PROCESSOR_POWER_64 - QTest::newRow("machtest/good.ppc64.dylib") << false; -# endif QTest::newRow("machtest/good.fat.all.dylib") << true; QTest::newRow("machtest/good.fat.stub-x86_64.dylib") << false; - QTest::newRow("machtest/good.fat.stub-i386.dylib") << false; + QTest::newRow("machtest/good.fat.stub-arm64.dylib") << false; QDir d(QFINDTESTDATA("machtest")); - QStringList badlist = d.entryList(QStringList() << "bad*.dylib"); - foreach (const QString &bad, badlist) + const QStringList badlist = d.entryList(QStringList() << "bad*.dylib"); + for (const QString &bad : badlist) QTest::newRow(qPrintable("machtest/" + bad)) << false; #endif } @@ -672,12 +900,7 @@ void tst_QPluginLoader::loadMachO() } QVERIFY(r.pos > 0); - QVERIFY(size_t(r.length) >= sizeof(void*)); QVERIFY(r.pos + r.length < data.size()); - QCOMPARE(r.pos & (sizeof(void*) - 1), 0UL); - - void *value = *(void**)(data.constData() + r.pos); - QCOMPARE(value, sizeof(void*) > 4 ? (void*)(0xc0ffeec0ffeeL) : (void*)0xc0ffee); // now that we know it's valid, let's try to make it invalid ulong offeredlen = r.pos; @@ -695,11 +918,19 @@ void tst_QPluginLoader::relativePath() #if !defined(QT_SHARED) QSKIP("This test requires Qt to create shared libraries."); #endif +#ifdef Q_OS_ANDROID + // On Android we do not need to explicitly set library paths, as they are + // already set. + // But we need to use ARCH suffix in pulgin name + const QString pluginName("theplugin_" ANDROID_ARCH SUFFIX); +#else // Windows binaries run from release and debug subdirs, so we can't rely on the current dir. const QString binDir = QFINDTESTDATA("bin"); QVERIFY(!binDir.isEmpty()); QCoreApplication::addLibraryPath(binDir); - QPluginLoader loader("theplugin" SUFFIX); + const QString pluginName("theplugin" SUFFIX); +#endif + QPluginLoader loader(pluginName); loader.load(); // not recommended, instance() should do the job. PluginInterface *instance = qobject_cast<PluginInterface*>(loader.instance()); QVERIFY(instance); @@ -712,13 +943,27 @@ void tst_QPluginLoader::absolutePath() #if !defined(QT_SHARED) QSKIP("This test requires Qt to create shared libraries."); #endif +#ifdef Q_OS_ANDROID + // On Android we need to clear library paths to make sure that the absolute + // path works + const QStringList libraryPaths = QCoreApplication::libraryPaths(); + QVERIFY(!libraryPaths.isEmpty()); + QCoreApplication::setLibraryPaths(QStringList()); + const QString pluginPath(libraryPaths.first() + "/" PREFIX "theplugin_" ANDROID_ARCH SUFFIX); +#else // Windows binaries run from release and debug subdirs, so we can't rely on the current dir. const QString binDir = QFINDTESTDATA("bin"); QVERIFY(!binDir.isEmpty()); QVERIFY(QDir::isAbsolutePath(binDir)); - QPluginLoader loader(binDir + "/" PREFIX "theplugin" SUFFIX); + const QString pluginPath(binDir + "/" PREFIX "theplugin" SUFFIX); +#endif + QPluginLoader loader(pluginPath); loader.load(); // not recommended, instance() should do the job. PluginInterface *instance = qobject_cast<PluginInterface*>(loader.instance()); +#ifdef Q_OS_ANDROID + // Restore library paths + QCoreApplication::setLibraryPaths(libraryPaths); +#endif QVERIFY(instance); QCOMPARE(instance->pluginName(), QLatin1String("Plugin ok")); QVERIFY(loader.unload()); @@ -739,7 +984,7 @@ void tst_QPluginLoader::reloadPlugin() QSignalSpy spy(loader.instance(), &QObject::destroyed); QVERIFY(spy.isValid()); QVERIFY(loader.unload()); // refcount reached 0, did really unload - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // reload plugin QVERIFY(loader.load()); @@ -752,6 +997,54 @@ void tst_QPluginLoader::reloadPlugin() QVERIFY(loader.unload()); } +void tst_QPluginLoader::loadSectionTableStrippedElf() +{ +#ifdef Q_OS_ANDROID + if (QNativeInterface::QAndroidApplication::sdkVersion() >= 24) + QSKIP("Android 7+ (API 24+) linker doesn't allow missing or bad section header"); +#endif +#if !defined(QT_SHARED) + QSKIP("This test requires a shared build of Qt, as QPluginLoader::setFileName is a no-op in static builds"); +#elif !defined(Q_OF_ELF) + QSKIP("Test specific to the ELF file format"); +#else + ElfPatcher patcher { [](ElfHeader *header, QFile *f) { + // modify the header to make it look like the section table was stripped + header->e_shoff = header->e_shnum = header->e_shstrndx = 0; + + // and append a bad header at the end + QPluginMetaData::MagicHeader badHeader = {}; + --badHeader.header.qt_major_version; + f->seek(f->size()); + f->write(reinterpret_cast<const char *>(&badHeader), sizeof(badHeader)); + } }; + + QString tmpLibName; + { + std::unique_ptr<QTemporaryFile> tmplib = + patchElf(sys_qualifiedLibraryName("theplugin"), patcher); + + tmpLibName = tmplib->fileName(); + tmplib->setAutoRemove(false); + } +#if defined(Q_OS_QNX) + // On QNX plugin access is still too early, even when QTemporaryFile is closed + QTest::qSleep(1000); +#endif + auto removeTmpLib = qScopeGuard([=]{ + QFile::remove(tmpLibName); + }); + + // now attempt to load it + QPluginLoader loader(tmpLibName); + QVERIFY2(loader.load(), qPrintable(loader.errorString())); + PluginInterface *instance = qobject_cast<PluginInterface*>(loader.instance()); + QVERIFY(instance); + QCOMPARE(instance->pluginName(), QLatin1String("Plugin ok")); + QVERIFY(loader.unload()); +#endif +} + void tst_QPluginLoader::preloadedPlugin_data() { QTest::addColumn<bool>("doLoad"); @@ -802,19 +1095,18 @@ void tst_QPluginLoader::staticPlugins() const QObjectList instances = QPluginLoader::staticInstances(); QVERIFY(instances.size()); - bool found = false; - for (QObject *obj : instances) { - found = obj->metaObject()->className() == QLatin1String("StaticPlugin"); - if (found) - break; - } - QVERIFY(found); + // ensure the our plugin only shows up once + int foundCount = std::count_if(instances.begin(), instances.end(), [](QObject *obj) { + return obj->metaObject()->className() == QLatin1String("StaticPlugin"); + }); + QCOMPARE(foundCount, 1); const auto plugins = QPluginLoader::staticPlugins(); QCOMPARE(plugins.size(), instances.size()); // find the metadata QJsonObject metaData; + bool found = false; for (const auto &p : plugins) { metaData = p.metaData(); found = metaData.value("className").toString() == QLatin1String("StaticPlugin"); @@ -830,6 +1122,18 @@ void tst_QPluginLoader::staticPlugins() QCOMPARE(metaData.value("URI").toString(), "qt.test.pluginloader.staticplugin"); } +void tst_QPluginLoader::reregisteredStaticPlugins() +{ + // the Q_IMPORT_PLUGIN macro will have already done this + qRegisterStaticPluginFunction(qt_static_plugin_StaticPlugin()); + staticPlugins(); + if (QTest::currentTestFailed()) + return; + + qRegisterStaticPluginFunction(qt_static_plugin_StaticPlugin()); + staticPlugins(); +} + QTEST_MAIN(tst_QPluginLoader) #include "tst_qpluginloader.moc" |