tests: Add make check target

The testfiles directory is renamed to match installation path and so allow executing tests from build directory.
sailfishos · Jun 4, 2014 · cad9997 · cad9997
1 parent bda8f64
commit cad9997
Show file tree

Hide file tree

Showing 41 changed files with 49 additions and 40 deletions.
diff --git a/tests_meego/testfiles/SAN01.bin → tests_meego/data/SAN01.bin b/tests_meego/testfiles/SAN01.bin → tests_meego/data/SAN01.bin
diff --git a/tests_meego/testfiles/SAN02.bin → tests_meego/data/SAN02.bin b/tests_meego/testfiles/SAN02.bin → tests_meego/data/SAN02.bin
diff --git a/tests_meego/testfiles/SyncMLHdrTest.txt → tests_meego/data/SyncMLHdrTest.txt b/tests_meego/testfiles/SyncMLHdrTest.txt → tests_meego/data/SyncMLHdrTest.txt
diff --git a/tests_meego/testfiles/SyncMLHdrTest_11.txt → tests_meego/data/SyncMLHdrTest_11.txt b/tests_meego/testfiles/SyncMLHdrTest_11.txt → tests_meego/data/SyncMLHdrTest_11.txt
diff --git a/tests_meego/testfiles/basicbasetransport.bin → tests_meego/data/basicbasetransport.bin b/tests_meego/testfiles/basicbasetransport.bin → tests_meego/data/basicbasetransport.bin
diff --git a/tests_meego/testfiles/basicbasetransport.txt → tests_meego/data/basicbasetransport.txt b/tests_meego/testfiles/basicbasetransport.txt → tests_meego/data/basicbasetransport.txt
diff --git a/...s_meego/testfiles/basicbasetransport2.txt → tests_meego/data/basicbasetransport2.txt b/...s_meego/testfiles/basicbasetransport2.txt → tests_meego/data/basicbasetransport2.txt
diff --git a/tests_meego/testfiles/cmdhandler_get.txt → tests_meego/data/cmdhandler_get.txt b/tests_meego/testfiles/cmdhandler_get.txt → tests_meego/data/cmdhandler_get.txt
diff --git a/tests_meego/testfiles/cmdhandler_put.txt → tests_meego/data/cmdhandler_put.txt b/tests_meego/testfiles/cmdhandler_put.txt → tests_meego/data/cmdhandler_put.txt
diff --git a/tests_meego/testfiles/devinf01.txt → tests_meego/data/devinf01.txt b/tests_meego/testfiles/devinf01.txt → tests_meego/data/devinf01.txt
diff --git a/tests_meego/testfiles/devinf02.txt → tests_meego/data/devinf02.txt b/tests_meego/testfiles/devinf02.txt → tests_meego/data/devinf02.txt
diff --git a/tests_meego/testfiles/obexresp01.bin → tests_meego/data/obexresp01.bin b/tests_meego/testfiles/obexresp01.bin → tests_meego/data/obexresp01.bin
diff --git a/tests_meego/testfiles/obexresp02.bin → tests_meego/data/obexresp02.bin b/tests_meego/testfiles/obexresp02.bin → tests_meego/data/obexresp02.bin
diff --git a/tests_meego/testfiles/obexresp03.bin → tests_meego/data/obexresp03.bin b/tests_meego/testfiles/obexresp03.bin → tests_meego/data/obexresp03.bin
diff --git a/tests_meego/testfiles/resp.txt → tests_meego/data/resp.txt b/tests_meego/testfiles/resp.txt → tests_meego/data/resp.txt
diff --git a/tests_meego/testfiles/resp2.txt → tests_meego/data/resp2.txt b/tests_meego/testfiles/resp2.txt → tests_meego/data/resp2.txt
diff --git a/tests_meego/testfiles/respinvalid1.txt → tests_meego/data/respinvalid1.txt b/tests_meego/testfiles/respinvalid1.txt → tests_meego/data/respinvalid1.txt
diff --git a/tests_meego/testfiles/respinvalid2.txt → tests_meego/data/respinvalid2.txt b/tests_meego/testfiles/respinvalid2.txt → tests_meego/data/respinvalid2.txt
diff --git a/tests_meego/testfiles/respinvalid3.txt → tests_meego/data/respinvalid3.txt b/tests_meego/testfiles/respinvalid3.txt → tests_meego/data/respinvalid3.txt
diff --git a/tests_meego/testfiles/respinvalid4.txt → tests_meego/data/respinvalid4.txt b/tests_meego/testfiles/respinvalid4.txt → tests_meego/data/respinvalid4.txt
diff --git a/tests_meego/testfiles/respinvalid5.txt → tests_meego/data/respinvalid5.txt b/tests_meego/testfiles/respinvalid5.txt → tests_meego/data/respinvalid5.txt
diff --git a/tests_meego/testfiles/respinvalid6.txt → tests_meego/data/respinvalid6.txt b/tests_meego/testfiles/respinvalid6.txt → tests_meego/data/respinvalid6.txt
diff --git a/tests_meego/testfiles/subcommands01.txt → tests_meego/data/subcommands01.txt b/tests_meego/testfiles/subcommands01.txt → tests_meego/data/subcommands01.txt
diff --git a/tests_meego/testfiles/syncml_init.txt → tests_meego/data/syncml_init.txt b/tests_meego/testfiles/syncml_init.txt → tests_meego/data/syncml_init.txt
diff --git a/tests_meego/testfiles/syncml_resp.txt → tests_meego/data/syncml_resp.txt b/tests_meego/testfiles/syncml_resp.txt → tests_meego/data/syncml_resp.txt
diff --git a/tests_meego/testfiles/syncml_resp2.txt → tests_meego/data/syncml_resp2.txt b/tests_meego/testfiles/syncml_resp2.txt → tests_meego/data/syncml_resp2.txt
diff --git a/tests_meego/testfiles/syncml_resp3.txt → tests_meego/data/syncml_resp3.txt b/tests_meego/testfiles/syncml_resp3.txt → tests_meego/data/syncml_resp3.txt
diff --git a/tests_meego/testfiles/syncml_resp4.txt → tests_meego/data/syncml_resp4.txt b/tests_meego/testfiles/syncml_resp4.txt → tests_meego/data/syncml_resp4.txt
diff --git a/tests_meego/testfiles/syncml_resp5.txt → tests_meego/data/syncml_resp5.txt b/tests_meego/testfiles/syncml_resp5.txt → tests_meego/data/syncml_resp5.txt
diff --git a/tests_meego/testfiles/testAdd.txt → tests_meego/data/testAdd.txt b/tests_meego/testfiles/testAdd.txt → tests_meego/data/testAdd.txt
diff --git a/tests_meego/testfiles/testAlert.txt → tests_meego/data/testAlert.txt b/tests_meego/testfiles/testAlert.txt → tests_meego/data/testAlert.txt
diff --git a/tests_meego/testfiles/testDevInf.txt → tests_meego/data/testDevInf.txt b/tests_meego/testfiles/testDevInf.txt → tests_meego/data/testDevInf.txt
diff --git a/tests_meego/testfiles/testItem.txt → tests_meego/data/testItem.txt b/tests_meego/testfiles/testItem.txt → tests_meego/data/testItem.txt
diff --git a/tests_meego/testfiles/testURI.txt → tests_meego/data/testURI.txt b/tests_meego/testfiles/testURI.txt → tests_meego/data/testURI.txt
diff --git a/tests_meego/testfiles/testconf.xsd → tests_meego/data/testconf.xsd b/tests_meego/testfiles/testconf.xsd → tests_meego/data/testconf.xsd
diff --git a/tests_meego/testfiles/testconf1.xml → tests_meego/data/testconf1.xml b/tests_meego/testfiles/testconf1.xml → tests_meego/data/testconf1.xml
diff --git a/tests_meego/testfiles/toXMLtest.txt → tests_meego/data/toXMLtest.txt b/tests_meego/testfiles/toXMLtest.txt → tests_meego/data/toXMLtest.txt
diff --git a/...meego/testfiles/transport_initrequest.txt → tests_meego/data/transport_initrequest.txt b/...meego/testfiles/transport_initrequest.txt → tests_meego/data/transport_initrequest.txt
diff --git a/...testfiles/transport_initrequest_nohdr.txt → ...eego/data/transport_initrequest_nohdr.txt b/...testfiles/transport_initrequest_nohdr.txt → ...eego/data/transport_initrequest_nohdr.txt
diff --git a/tests_meego/testapplication.pri b/tests_meego/testapplication.pri
@@ -13,3 +13,11 @@ LIBS += -L$${OUT_PWD}/$${tests_subdir_r} -lTestUtils
 
 target.path = $${INSTALL_TESTDIR}/$${tests_subdir}
 INSTALLS += target
+
+check.depends = all
+check.commands = '\
+    cd "$${PWD}" \
+    && export LD_LIBRARY_PATH="$${OUT_PWD}/$${tests_subdir_r}/../src:\$\${LD_LIBRARY_PATH}" \
+    && $${OUT_PWD}/$${TARGET}'
+check.CONFIG = phony
+QMAKE_EXTRA_TARGETS += check
diff --git a/tests_meego/tests_meego.pro b/tests_meego/tests_meego.pro
@@ -9,48 +9,49 @@ SUBDIRS = \
     syncelementstests \
     transporttests \
 
-OTHER_FILES += testfiles/transport_initrequest_nohdr.txt \
-    testfiles/transport_initrequest.txt \
-    testfiles/toXMLtest.txt \
-    testfiles/testURI.txt \
-    testfiles/testMap.txt \
-    testfiles/testAlert.txt \
-    testfiles/syncml_resp5.txt \
-    testfiles/syncml_resp4.txt \
-    testfiles/syncml_resp3.txt \
-    testfiles/syncml_resp2.txt \
-    testfiles/syncml_resp.txt \
-    testfiles/syncml_init.txt \
-    testfiles/SyncMLHdrTest_11.txt \
-    testfiles/SyncMLHdrTest.txt \
-    testfiles/resp.txt \
-    testfiles/basicbasetransport.txt \
-    testfiles/basicbasetransport.bin \
-    testfiles/basicbasetransport2.txt \
-    testfiles/cmdhandler_put.txt \
-    testfiles/cmdhandler_get.txt \
-    testfiles/SAN01.bin \
-    testfiles/SAN02.bin \
-    testfiles/obexresp01.bin \
-    testfiles/obexresp02.bin \
-    testfiles/obexresp03.bin \
-    testfiles/respinvalid1.txt \
-    testfiles/respinvalid2.txt \
-    testfiles/respinvalid3.txt \
-    testfiles/respinvalid4.txt \
-    testfiles/respinvalid5.txt \
-    testfiles/respinvalid6.txt \
-    testfiles/testconf.xsd \
-    testfiles/testconf1.xml \
-    testfiles/devinf01.txt \
-    testfiles/devinf02.txt \
-    testfiles/subcommands01.txt \
-    testfiles/resp2.txt
+OTHER_FILES += \
+    data/transport_initrequest_nohdr.txt \
+    data/transport_initrequest.txt \
+    data/toXMLtest.txt \
+    data/testURI.txt \
+    data/testMap.txt \
+    data/testAlert.txt \
+    data/syncml_resp5.txt \
+    data/syncml_resp4.txt \
+    data/syncml_resp3.txt \
+    data/syncml_resp2.txt \
+    data/syncml_resp.txt \
+    data/syncml_init.txt \
+    data/SyncMLHdrTest_11.txt \
+    data/SyncMLHdrTest.txt \
+    data/resp.txt \
+    data/basicbasetransport.txt \
+    data/basicbasetransport.bin \
+    data/basicbasetransport2.txt \
+    data/cmdhandler_put.txt \
+    data/cmdhandler_get.txt \
+    data/SAN01.bin \
+    data/SAN02.bin \
+    data/obexresp01.bin \
+    data/obexresp02.bin \
+    data/obexresp03.bin \
+    data/respinvalid1.txt \
+    data/respinvalid2.txt \
+    data/respinvalid3.txt \
+    data/respinvalid4.txt \
+    data/respinvalid5.txt \
+    data/respinvalid6.txt \
+    data/testconf.xsd \
+    data/testconf1.xml \
+    data/devinf01.txt \
+    data/devinf02.txt \
+    data/subcommands01.txt \
+    data/resp2.txt
 
 # install
-testfiles.files = testfiles/*
-testfiles.path = $${INSTALL_TESTDATADIR}
-INSTALLS += testfiles
+testdata.files = data/*
+testdata.path = $${INSTALL_TESTDATADIR}
+INSTALLS += testdata
 testdefinition.files = tests.xml
 testdefinition.path = $${INSTALL_TESTDIR}
 INSTALLS += testdefinition