tests: Fix install path to /opt/tests/%{name}/

This basically adds the -qt5 suffix. Test definition tests.xml constains hardcoded -qt5 paths and Qt4 installation is left de facto broken - hopefully this is not an issue nowadays.
sailfishos · Jun 4, 2014 · abc9ed0 · abc9ed0
1 parent ca5d650
commit abc9ed0
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 59 deletions.
diff --git a/rpm/buteo-syncml-qt5.spec b/rpm/buteo-syncml-qt5.spec
@@ -52,7 +52,7 @@ Requires: %{name} = %{version}-%{release}
 
 %files tests
 %defattr(-,root,root,-)
-/opt/tests/buteo-syncml/*
+/opt/tests/%{name}/*
 
 
 %prep

diff --git a/tests_meego/runstarget.sh b/tests_meego/runstarget.sh
@@ -5,7 +5,7 @@ if [ $# -lt 1 ]; then
     exit 1
 fi
 
-cd /opt/tests/buteo-syncml
+cd "$(dirname "${0}")"
 
 PATH=".:${PATH}"
 exec "${@}" -maxwarnings 0
diff --git a/tests_meego/tests.xml b/tests_meego/tests.xml
@@ -1,166 +1,166 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <testdefinition version="0.1">
-  <suite name="buteo-syncml" domain="synchronization">
+  <suite name="buteo-syncml-qt5" domain="synchronization">
 
-    <set name="general" description="buteo-syncml general tests" feature="Sync ML 1.1">
+    <set name="general" description="buteo-syncml-qt5 general tests" feature="Sync ML 1.1">
       <case name="AlertPackageTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh AlertPackageTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh AlertPackageTest</step>
       </case>
       <case name="AuthHelperTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh AuthHelperTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh AuthHelperTest</step>
       </case>
       <case name="AuthenticationPackageTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh AuthenticationPackageTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh AuthenticationPackageTest</step>
       </case>
       <!--case name="ChangeLogHandlerTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh ChangeLogHandlerTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh ChangeLogHandlerTest</step>
       </case-->
       <case name="ChangeLogTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh ChangeLogTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh ChangeLogTest</step>
       </case>
       <case name="CommandHandlerTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh CommandHandlerTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh CommandHandlerTest</step>
       </case>
       <case name="ConflictResolverTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh ConflictResolverTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh ConflictResolverTest</step>
       </case>
       <case name="DevInfHandlerTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh DevInfHandlerTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh DevInfHandlerTest</step>
       </case>
       <case name="DevInfPackageTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh DevInfPackageTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh DevInfPackageTest</step>
       </case>
       <case name="FinalPackageTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh FinalPackageTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh FinalPackageTest</step>
       </case>
       <case name="LocalChangesPackageTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh LocalChangesPackageTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh LocalChangesPackageTest</step>
       </case>
       <case name="LocalMappingsPackageTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh LocalMappingsPackageTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh LocalMappingsPackageTest</step>
       </case>
       <case name="NonceStorageTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh NonceStorageTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh NonceStorageTest</step>
       </case>
       <case name="ResponseGeneratorTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh ResponseGeneratorTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh ResponseGeneratorTest</step>
       </case>
       <case name="SANTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh SANTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh SANTest</step>
       </case>
       <case name="SessionHandlerTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh SessionHandlerTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh SessionHandlerTest</step>
       </case>
       <case name="StorageHandlerTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh StorageHandlerTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh StorageHandlerTest</step>
       </case>
       <case name="SyncAgentConfigTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh SyncAgentConfigTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh SyncAgentConfigTest</step>
       </case>
       <case name="SyncAgentTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh SyncAgentTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh SyncAgentTest</step>
       </case>
       <case name="SyncItemPrefetcherTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh SyncItemPrefetcherTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh SyncItemPrefetcherTest</step>
       </case>
       <case name="SyncModeTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh SyncModeTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh SyncModeTest</step>
       </case>
       <case name="SyncResultTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh SyncResultTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh SyncResultTest</step>
       </case>
       <case name="SyncTargetTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh SyncTargetTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh SyncTargetTest</step>
       </case>
     </set>
 
-    <set name="client" description="buteo-syncml client tests" feature="Sync ML 1.1">
+    <set name="client" description="buteo-syncml-qt5 client tests" feature="Sync ML 1.1">
       <case name="clienttests/ClientSessionHandlerTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh clienttests/ClientSessionHandlerTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh clienttests/ClientSessionHandlerTest</step>
       </case>
     </set>
 
-    <set name="server" description="buteo-syncml server tests" feature="Sync ML 1.1">
+    <set name="server" description="buteo-syncml-qt5 server tests" feature="Sync ML 1.1">
       <!--case name="servertests/ServerCommandHandlerTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh servertests/ServerCommandHandlerTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh servertests/ServerCommandHandlerTest</step>
       </case-->
       <case name="servertests/ServerSessionHandlerTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh servertests/ServerSessionHandlerTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh servertests/ServerSessionHandlerTest</step>
       </case>
     </set>
 
-    <set name="sync-element" description="buteo-syncml sync-element tests" feature="Sync ML 1.1">
+    <set name="sync-element" description="buteo-syncml-qt5 sync-element tests" feature="Sync ML 1.1">
       <case name="syncelementstests/SyncMLAddTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLAddTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLAddTest</step>
       </case>
       <case name="syncelementstests/SyncMLAlertTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLAlertTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLAlertTest</step>
       </case>
       <case name="syncelementstests/SyncMLBodyTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLBodyTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLBodyTest</step>
       </case>
       <case name="syncelementstests/SyncMLCmdObjectTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLCmdObjectTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLCmdObjectTest</step>
       </case>
       <case name="syncelementstests/SyncMLCredTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLCredTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLCredTest</step>
       </case>
       <case name="syncelementstests/SyncMLDeleteTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLDeleteTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLDeleteTest</step>
       </case>
       <case name="syncelementstests/SyncMLDevInfTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLDevInfTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLDevInfTest</step>
       </case>
       <case name="syncelementstests/SyncMLHdrTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLHdrTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLHdrTest</step>
       </case>
       <case name="syncelementstests/SyncMLItemTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLItemTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLItemTest</step>
       </case>
       <case name="syncelementstests/SyncMLLocalChangeTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLLocalChangeTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLLocalChangeTest</step>
       </case>
       <case name="syncelementstests/SyncMLMapTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLMapTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLMapTest</step>
       </case>
       <case name="syncelementstests/SyncMLMessageParserTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLMessageParserTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLMessageParserTest</step>
       </case>
       <case name="syncelementstests/SyncMLMessageTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLMessageTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLMessageTest</step>
       </case>
       <case name="syncelementstests/SyncMLPutTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLPutTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLPutTest</step>
       </case>
       <case name="syncelementstests/SyncMLReplaceTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLReplaceTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLReplaceTest</step>
       </case>
       <case name="syncelementstests/SyncMLResultsTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLResultsTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLResultsTest</step>
       </case>
       <case name="syncelementstests/SyncMLStatusTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLStatusTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLStatusTest</step>
       </case>
       <case name="syncelementstests/SyncMLSyncTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh syncelementstests/SyncMLSyncTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh syncelementstests/SyncMLSyncTest</step>
       </case>
     </set>
 
-    <set name="transport" description="buteo-syncml transport tests" feature="Sync ML 1.1">
+    <set name="transport" description="buteo-syncml-qt5 transport tests" feature="Sync ML 1.1">
       <case name="transporttests/BaseTransportTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh transporttests/BaseTransportTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh transporttests/BaseTransportTest</step>
       </case>
       <case name="transporttests/ClientWorkerTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh transporttests/ClientWorkerTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh transporttests/ClientWorkerTest</step>
       </case>
       <case name="transporttests/HTTPTransportTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh transporttests/HTTPTransportTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh transporttests/HTTPTransportTest</step>
       </case>
       <case name="transporttests/OBEXTransportTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh transporttests/OBEXTransportTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh transporttests/OBEXTransportTest</step>
       </case>
       <case name="transporttests/ServerWorkerTest">
-        <step>/opt/tests/buteo-syncml/runstarget.sh transporttests/ServerWorkerTest</step>
+        <step>/opt/tests/buteo-syncml-qt5/runstarget.sh transporttests/ServerWorkerTest</step>
       </case>
     </set>
 

diff --git a/tests_meego/tests_common.pri b/tests_meego/tests_common.pri
@@ -44,8 +44,7 @@ DEPENDPATH = \
     $${PWD}/../src/server \
     $${PWD}/../src/client \
 
-# TODO: append $${DASH_QT_VERSION}
-INSTALL_TESTDIR = /opt/tests/buteo-syncml
+INSTALL_TESTDIR = /opt/tests/buteo-syncml$${DASH_QT_VERSION}
 INSTALL_TESTDATADIR = $${INSTALL_TESTDIR}/data
 
 }