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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 092D0139083 for ; Fri, 15 Dec 2017 06:20:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 091AAE1078; Fri, 15 Dec 2017 06:20:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CA1AFE1078 for ; Fri, 15 Dec 2017 06:20:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A03C33BEAC for ; Fri, 15 Dec 2017 06:20:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB61E7449 for ; Fri, 15 Dec 2017 06:20:48 +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: <1513318836.5e8ef2f80aeba8adf204076ae910e8bcfbe0ba64.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/okular/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/okular/files/okular-tests.patch X-VCS-Directories: kde-apps/okular/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5e8ef2f80aeba8adf204076ae910e8bcfbe0ba64 X-VCS-Branch: master Date: Fri, 15 Dec 2017 06:20:48 +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-Archives-Salt: 038a354c-53ea-4770-b754-975cded0119f X-Archives-Hash: 18dbeff2f194456c04055503db8abd07 commit: 5e8ef2f80aeba8adf204076ae910e8bcfbe0ba64 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Dec 15 06:19:56 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Dec 15 06:20:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e8ef2f8 kde-apps/okular: Add missing patch Package-Manager: Portage-2.3.18, Repoman-2.3.6 kde-apps/okular/files/okular-tests.patch | 112 +++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/kde-apps/okular/files/okular-tests.patch b/kde-apps/okular/files/okular-tests.patch new file mode 100644 index 00000000000..0e2cdaecd4a --- /dev/null +++ b/kde-apps/okular/files/okular-tests.patch @@ -0,0 +1,112 @@ +From 5f093fa9798ad30cda115cea573d18296696a0a9 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 12 Oct 2017 14:09:09 +0200 +Subject: [PATCH] Move tests into existing (auto)tests subdirectories + +--- + generators/chm/CMakeLists.txt | 12 +++--------- + generators/chm/autotests/CMakeLists.txt | 8 ++++++++ + generators/chm/autotests/chmgeneratortest.cpp | 2 +- + generators/kimgio/CMakeLists.txt | 6 +----- + generators/kimgio/tests/CMakeLists.txt | 5 +++++ + generators/kimgio/tests/kimgiotest.cpp | 2 +- + 6 files changed, 19 insertions(+), 16 deletions(-) + create mode 100644 generators/chm/autotests/CMakeLists.txt + create mode 100644 generators/kimgio/tests/CMakeLists.txt + +diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt +index 9d82b9394..b3a33afe4 100644 +--- a/generators/chm/CMakeLists.txt ++++ b/generators/chm/CMakeLists.txt +@@ -30,15 +30,9 @@ set(okularGenerator_chmlib_SRCS + okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS}) + target_link_libraries(okularGenerator_chmlib okularcore ${CHM_LIBRARY} ${LIBZIP_LIBRARY} KF5::KHtml) + +-########### autotests ############### +- +-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" ) +-ecm_add_test(autotests/chmgeneratortest.cpp +- TEST_NAME "chmgeneratortest" +- LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore +-) +- +-target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$") ++if(BUILD_TESTING) ++ add_subdirectory(autotests) ++endif() + + ########### install files ############### + install( FILES okularChm.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) +diff --git a/generators/chm/autotests/CMakeLists.txt b/generators/chm/autotests/CMakeLists.txt +new file mode 100644 +index 000000000..59753ca45 +--- /dev/null ++++ b/generators/chm/autotests/CMakeLists.txt +@@ -0,0 +1,8 @@ ++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" ) ++ ++ecm_add_test(chmgeneratortest.cpp ++ TEST_NAME "chmgeneratortest" ++ LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore ++) ++ ++target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$") +diff --git a/generators/chm/autotests/chmgeneratortest.cpp b/generators/chm/autotests/chmgeneratortest.cpp +index 6b0b8efc7..25fd6631a 100644 +--- a/generators/chm/autotests/chmgeneratortest.cpp ++++ b/generators/chm/autotests/chmgeneratortest.cpp +@@ -34,7 +34,7 @@ void ChmGeneratorTest::initTestCase() + { + Okular::SettingsCore::instance( QStringLiteral("ChmGeneratorTest") ); + m_document = new Okular::Document( 0 ); +- const QString testFile = QStringLiteral(KDESRCDIR "autotests/data/test.chm"); ++ const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm"); + QMimeDatabase db; + const QMimeType mime = db.mimeTypeForFile( testFile ); + QCOMPARE( m_document->openDocument(testFile, QUrl(), mime), Okular::Document::OpenSuccess ); +diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt +index b8cac76df..49f893bc1 100644 +--- a/generators/kimgio/CMakeLists.txt ++++ b/generators/kimgio/CMakeLists.txt +@@ -13,13 +13,9 @@ okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp) + target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n) + + if(BUILD_TESTING) +- add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" ) +- set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/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() + +- + ########### install files ############### + install( FILES okularKimgio.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) + install( PROGRAMS okularApplication_kimgio.desktop org.kde.mobile.okular_kimgio.desktop DESTINATION ${KDE_INSTALL_APPDIR} ) +diff --git a/generators/kimgio/tests/CMakeLists.txt b/generators/kimgio/tests/CMakeLists.txt +new file mode 100644 +index 000000000..f31bf3fe8 +--- /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}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/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 b3039a6bb..78608df9d 100644 +--- a/generators/kimgio/tests/kimgiotest.cpp ++++ b/generators/kimgio/tests/kimgiotest.cpp +@@ -9,7 +9,7 @@ + + + #include "../generator_kimgio.h" +-#include "../../settings_core.h" ++#include "../../../settings_core.h" + + #include + #include +-- +2.14.2 +