From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BDAE5158086 for ; Tue, 30 Nov 2021 12:01:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B8A32BC043; Tue, 30 Nov 2021 12:01:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 00F302BC041 for ; Tue, 30 Nov 2021 12:01:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A6DEC342D79 for ; Tue, 30 Nov 2021 12:01:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9ED214D for ; Tue, 30 Nov 2021 12:01:04 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1638273635.9c8d408fdba995a29d3e9dc83b748acbffce7ba2.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/okular/files/okular-21.11.80-tests.patch X-VCS-Directories: kde-apps/okular/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9c8d408fdba995a29d3e9dc83b748acbffce7ba2 X-VCS-Branch: master Date: Tue, 30 Nov 2021 12:01:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3bf8121f-1989-4008-b51a-8cdc52e17169 X-Archives-Hash: f5e09a4841923568ac7150282f7056b8 commit: 9c8d408fdba995a29d3e9dc83b748acbffce7ba2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Nov 30 12:00:35 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Nov 30 12:00:35 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c8d408f kde-apps/okular: Drop obsolete part from 21.11.80-tests.patch Closes: https://bugs.gentoo.org/827875 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/okular/files/okular-21.11.80-tests.patch | 46 +---------------------- 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/kde-apps/okular/files/okular-21.11.80-tests.patch b/kde-apps/okular/files/okular-21.11.80-tests.patch index 683a07bc1a..a0babcad1c 100644 --- a/kde-apps/okular/files/okular-21.11.80-tests.patch +++ b/kde-apps/okular/files/okular-21.11.80-tests.patch @@ -9,13 +9,9 @@ Subject: [PATCH] Move tests into existing (auto)tests subdirectories generators/chm/autotests/chmgeneratortest.cpp | 2 +- generators/comicbook/CMakeLists.txt | 10 +++------- generators/comicbook/autotests/CMakeLists.txt | 6 ++++++ - generators/kimgio/CMakeLists.txt | 5 +---- - generators/kimgio/tests/CMakeLists.txt | 5 +++++ - generators/kimgio/tests/kimgiotest.cpp | 2 +- - 8 files changed, 28 insertions(+), 22 deletions(-) + 8 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 generators/chm/autotests/CMakeLists.txt create mode 100644 generators/comicbook/autotests/CMakeLists.txt - create mode 100644 generators/kimgio/tests/CMakeLists.txt diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt index 0d7452cba..3adb3fd54 100644 @@ -100,46 +96,6 @@ index 000000000..aaacb341a + TEST_NAME "comicbooktest" + LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook +) -diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt -index 6919bad1a..765f36c0b 100644 ---- a/generators/kimgio/CMakeLists.txt -+++ b/generators/kimgio/CMakeLists.txt -@@ -7,10 +7,7 @@ okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp) - target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n) - - if(BUILD_TESTING AND BUILD_DESKTOP) -- add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" ) -- set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/part/pagepainter.cpp ${CMAKE_SOURCE_DIR}/part/guiutils.cpp ${CMAKE_SOURCE_DIR}/part/debug_ui.cpp ) -- ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test) -- target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$") -+ add_subdirectory(tests) - endif() - - -diff --git a/generators/kimgio/tests/CMakeLists.txt b/generators/kimgio/tests/CMakeLists.txt -new file mode 100644 -index 000000000..844c9096a ---- /dev/null -+++ b/generators/kimgio/tests/CMakeLists.txt -@@ -0,0 +1,5 @@ -+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" ) -+ -+set( kimgiotest_SRCS kimgiotest.cpp ${CMAKE_SOURCE_DIR}/part/pagepainter.cpp ${CMAKE_SOURCE_DIR}/part/guiutils.cpp ${CMAKE_SOURCE_DIR}/part/debug_ui.cpp ) -+ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test) -+target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$") -diff --git a/generators/kimgio/tests/kimgiotest.cpp b/generators/kimgio/tests/kimgiotest.cpp -index d521a5a7b..259bb4894 100644 ---- a/generators/kimgio/tests/kimgiotest.cpp -+++ b/generators/kimgio/tests/kimgiotest.cpp -@@ -4,7 +4,7 @@ - SPDX-License-Identifier: GPL-2.0-or-later - */ - --#include "../../settings_core.h" -+#include "../../../settings_core.h" - #include "../generator_kimgio.h" - - #include -- 2.33.0