Move tests to /opt. JB#57272

rpm/libquillmetadata-qt5.spec

@@ -1,9 +1,9 @@
 Name:       libquillmetadata-qt5
 Summary:    Qt based library for still image metadata manipulation
-Version:    1.111111.0
+Version:    2.0.0
 Release:    0
 License:    LGPLv2 or GPLv3 or Qt Commercial or LGPLv2 with Nokia Qt LGPL Exception v1.1
-URL:        https://git.sailfishos.org/mer-core/quillmetadata
+URL:        https://github.com/sailfishos/quillmetadata
 Source0:    %{name}-%{version}.tar.bz2
 Requires:   qt5-plugin-imageformat-jpeg
 Requires(post): /sbin/ldconfig
@@ -72,8 +72,7 @@ rm -rf %{buildroot}
 
 %files tests
 %defattr(-,root,root,-)
-%{_datadir}/libquillmetadata-qt5-tests/*
-%{_libdir}/libquillmetadata-qt5-tests/*
+/opt/tests/libquillmetadata-qt5/
 
 %files devel
 %defattr(-,root,root,-)

tests/tests.pri

@@ -22,7 +22,7 @@ LIBS += -lquillmetadata-qt5
 QT += testlib
 
 # --- install
-target.path = $$[QT_INSTALL_LIBS]/libquillmetadata-qt5-tests/
+target.path = /opt/tests/libquillmetadata-qt5/
 INSTALLS += target
 
 # --- clean

tests/tests.pro

@@ -1,5 +1,3 @@
-PACKAGENAME = libquillmetadata-qt5
-
 TEMPLATE = subdirs
 
 DEPENDPATH += .
@@ -10,27 +8,15 @@ CONFIG += ordered
 SUBDIRS += ut_metadata \
 	    ut_regions
 
-# --- generate tests.xml
-tests_xml.target = tests.xml
-tests_xml.depends = $$PWD/tests.xml.in
-tests_xml.commands = sed -e "s:@PACKAGENAME@:$${PACKAGENAME}:g" $< > $@
-
-QMAKE_EXTRA_TARGETS = tests_xml
-QMAKE_CLEAN += $$tests_xml.target
-PRE_TARGETDEPS += $$tests_xml.target
-
-# --- install
-tatam.depends = tests_xml
-tatam.files = $$tests_xml.target
-tatam.path  = $$(DESTDIR)/usr/share/$${PACKAGENAME}-tests/
-tatam.CONFIG += no_check_exist
+tests_xml.files = tests.xml
+tests_xml.path  = $$(DESTDIR)/opt/tests/libquillmetadata-qt5/
 
-tatamimages.files += images/exif.jpg
-tatamimages.files += images/xmp.jpg
-tatamimages.files += images/iptc.jpg
-tatamimages.files += images/gps.jpg
-tatamimages.files += images/mnaa.jpg
+images.files += images/exif.jpg
+images.files += images/xmp.jpg
+images.files += images/iptc.jpg
+images.files += images/gps.jpg
+images.files += images/mnaa.jpg
 
-tatamimages.path  = $${tatam.path}/images/
+images.path  = $${tests_xml.path}/images/
 
-INSTALLS = tatam tatamimages
+INSTALLS = tests_xml images

tests/tests.xml.in → tests/tests.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <testdefinition version="0.1">
-  <suite name="@PACKAGENAME@-tests" domain="application-domain">
+  <suite name="libquillmetadata-qt5" domain="application-domain">
     <description>Automated test cases for libquill</description>
 
-    <set name="@PACKAGENAME@-test0" feature="metadata">
+    <set name="libquillmetadata-qt5" feature="libquillmetadata">
       <description>quill metadata test</description>
       <case name="ut_metadata" type="Functional" level="Component">
-	<step>/usr/lib/@PACKAGENAME@-tests/ut_metadata </step>
+        <step>/opt/tests/libquillmetadata-qt5/ut_metadata </step>
       </case>
     </set>
   </suite>

tests/ut_metadata/ut_metadata.cpp

@@ -48,11 +48,7 @@
 
 ut_metadata::ut_metadata()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    imagePath = "/usr/share/libquillmetadata-qt5-tests/images/";
-#else
-    imagePath = "/usr/share/libquillmetadata-tests/images/";
-#endif
+    imagePath = "/opt/tests/libquillmetadata-qt5/images/";
 }
 
 void ut_metadata::initTestCase()
@@ -449,11 +445,7 @@ void ut_metadata::testWriteGps()
 void ut_metadata::testGps_XmpExif()
 {
     // TODO: Stop skipping the test once that it becomes possible to only read XMP data
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     QSKIP("Reading only XMP data is still unsupported");
-#else
-    QSKIP("Reading only XMP data is still unsupported", SkipSingle);
-#endif
 
     QTemporaryFile file;
     file.open();

tests/ut_regions/ut_regions.cpp

@@ -48,11 +48,7 @@
 
 ut_regions::ut_regions()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    imagePath = "/usr/share/libquillmetadata-qt5-tests/images/";
-#else
-    imagePath = "/usr/share/libquillmetadata-tests/images/";
-#endif
+    imagePath = "/opt/tests/libquillmetadata-qt5/images/";
 }
 
 void ut_regions::initTestCase()