diff --git a/buildpath.pri b/buildpath.pri deleted file mode 100644 index a79c051..0000000 --- a/buildpath.pri +++ /dev/null @@ -1,24 +0,0 @@ -isEmpty(BUILD){ - isEmpty(TARGETDIR){ - BUILD = $$PWD/build/$$TARGET - } else { - BUILD = $$PWD/build/$$TARGETDIR - } -} -isEmpty(DESTDIR){ - DESTDIR = $$BUILD -} - -OBJECTS_DIR = $$BUILD -MOC_DIR = $$BUILD -UI_DIR = $$BUILD -UI_HEADERS_DIR = $$BUILD -UI_SOURCES_DIR = $$BUILD -RCC_DIR = $$BUILD - -# This definitely needs to be refactorized somehow (the common module{.pro,.pri,_dependencies.pri} -# approach would do a good job here) -LIBS += -L$$PWD/build/libssu -LIBS += -L$$PWD/build/testutils -LD_LIBRARY_PATH = $$PWD/build/libssu:$$PWD/build/testutils -INCLUDEPATH += $$PWD/libssu diff --git a/libssu/libssu.pri b/libssu/libssu.pri new file mode 100644 index 0000000..9e8aeef --- /dev/null +++ b/libssu/libssu.pri @@ -0,0 +1,2 @@ +include(libssu_dependencies.pri) +LIBS *= -lssu diff --git a/libssu/libssu.pro b/libssu/libssu.pro index 00bf26e..9fdde0c 100644 --- a/libssu/libssu.pro +++ b/libssu/libssu.pro @@ -1,35 +1,35 @@ -BUILD = ../build/libssu -HEADERS = ssu.h \ +TARGET = ssu +include(../ssulibrary.pri) + +# TODO: which headers are public? i.e. to be installed +public_headers = \ + ssu.h \ + +HEADERS = \ + $${public_headers} \ ssucoreconfig.h \ ssudeviceinfo.h \ ssulog.h \ ssuvariables.h \ ssusettings.h \ ssurepomanager.h \ - ../constants.h -SOURCES = ssu.cpp \ + +SOURCES = \ + ssu.cpp \ ssucoreconfig.cpp \ ssudeviceinfo.cpp \ ssulog.cpp \ ssuvariables.cpp \ ssurepomanager.cpp \ ssusettings.cpp -TEMPLATE = lib -TARGET = ssu -CONFIG += dll mobility link_pkgconfig -QT -= gui + +CONFIG += mobility link_pkgconfig QT += network xml MOBILITY += systeminfo PKGCONFIG += libsystemd-journal -headers.files = ssu.h -headers.path = /usr/include - -unix:target.path = $${PREFIX}/usr/lib -INSTALLS += target headers +install_headers.files = $${public_headers} ssuconfhack { DEFINES += SSUCONFHACK } - -!include( ../buildpath.pri ) { error("Unable to find build path specification") } diff --git a/libssu/libssu_dependencies.pri b/libssu/libssu_dependencies.pri new file mode 100644 index 0000000..1d1ff8b --- /dev/null +++ b/libssu/libssu_dependencies.pri @@ -0,0 +1 @@ +# no dependencies so far diff --git a/libssu/ssu.cpp b/libssu/ssu.cpp index ba08dae..d9e675b 100644 --- a/libssu/ssu.cpp +++ b/libssu/ssu.cpp @@ -5,6 +5,7 @@ * @date 2012 */ +#include #include #include "ssu.h" diff --git a/libssu/ssu.h b/libssu/ssu.h index 980bbee..0b1e32d 100644 --- a/libssu/ssu.h +++ b/libssu/ssu.h @@ -8,15 +8,17 @@ #ifndef _Ssu_H #define _Ssu_H +#include #include #include #include -#include - #include -#include +#include "ssudeviceinfo.h" + +class QNetworkAccessManager; +class QNetworkReply; class Ssu: public QObject { Q_OBJECT diff --git a/libssu/ssucoreconfig.h b/libssu/ssucoreconfig.h index f773c28..ca88c12 100644 --- a/libssu/ssucoreconfig.h +++ b/libssu/ssucoreconfig.h @@ -11,8 +11,8 @@ #include #include -#include -#include +#include "ssusettings.h" +#include "ssu.h" #ifndef SSU_CONFIGURATION /// Path to the main SSU configuration file diff --git a/libssu/ssudeviceinfo.h b/libssu/ssudeviceinfo.h index c2a1daf..79bd7e9 100644 --- a/libssu/ssudeviceinfo.h +++ b/libssu/ssudeviceinfo.h @@ -11,7 +11,7 @@ #include #include -#include +#include "ssusettings.h" class SsuDeviceInfo: public QObject { Q_OBJECT diff --git a/rndregisterui/rndregisterui.cpp b/rndregisterui/rndregisterui.cpp index 61c815f..1355ec4 100644 --- a/rndregisterui/rndregisterui.cpp +++ b/rndregisterui/rndregisterui.cpp @@ -6,6 +6,7 @@ */ #include +#include #include #include diff --git a/rndregisterui/rndregisterui.h b/rndregisterui/rndregisterui.h index 382c838..7d2d864 100644 --- a/rndregisterui/rndregisterui.h +++ b/rndregisterui/rndregisterui.h @@ -11,7 +11,7 @@ #include #include -#include +#include "libssu/ssu.h" namespace Ui { class RndRegisterUi; diff --git a/rndregisterui/rndregisterui.pro b/rndregisterui/rndregisterui.pro index aecf8c7..bf33268 100644 --- a/rndregisterui/rndregisterui.pro +++ b/rndregisterui/rndregisterui.pro @@ -1,23 +1,20 @@ +TARGET = rndregisterui +include(../ssuapplication.pri) +include(rndregisterui_dependencies.pri) + HEADERS = rndregisterui.h SOURCES = main.cpp \ rndregisterui.cpp RESOURCES = resources.qrc -TEMPLATE = app -TARGET = rndregisterui -LIBS += -lssu CONFIG += qdeclarative-boostable -CONFIG -= app_bundle -QT += core gui declarative network +QT += gui declarative OTHER_FILES += \ resources/qml/rndregisterui.qml \ resources/qml/RndSsuPage.qml -unix:target.path = $${PREFIX}/usr/bin desktop.files = rndregisterui.desktop desktop.path = /usr/share/applications/ -INSTALLS += target desktop - -!include( ../buildpath.pri ) { error("Unable to find build path specification") } +INSTALLS += desktop diff --git a/rndregisterui/rndregisterui_dependencies.pri b/rndregisterui/rndregisterui_dependencies.pri new file mode 100644 index 0000000..48c7cf6 --- /dev/null +++ b/rndregisterui/rndregisterui_dependencies.pri @@ -0,0 +1 @@ +include(../libssu/libssu.pri) diff --git a/rndssucli/main.cpp b/rndssucli/main.cpp index cb7d572..8c88075 100644 --- a/rndssucli/main.cpp +++ b/rndssucli/main.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include "rndssucli.h" int main(int argc, char** argv){ diff --git a/rndssucli/rndssucli.cpp b/rndssucli/rndssucli.cpp index 1def9b9..587afb4 100644 --- a/rndssucli/rndssucli.cpp +++ b/rndssucli/rndssucli.cpp @@ -9,9 +9,9 @@ #include -#include -#include -#include +#include "libssu/ssudeviceinfo.h" +#include "libssu/ssurepomanager.h" +#include "libssu/ssucoreconfig.h" #include diff --git a/rndssucli/rndssucli.h b/rndssucli/rndssucli.h index 1276e32..eedaca0 100644 --- a/rndssucli/rndssucli.h +++ b/rndssucli/rndssucli.h @@ -10,9 +10,10 @@ #include #include +#include #include -#include +#include "libssu/ssu.h" class RndSsuCli: public QObject { Q_OBJECT diff --git a/rndssucli/rndssucli.pro b/rndssucli/rndssucli.pro index 0e61fdc..8ca56bb 100644 --- a/rndssucli/rndssucli.pro +++ b/rndssucli/rndssucli.pro @@ -1,17 +1,8 @@ +TARGET = ssu +include(../ssuapplication.pri) +include(rndssucli_dependencies.pri) + HEADERS = rndssucli.h SOURCES = main.cpp \ rndssucli.cpp #RESOURCES = rndregister.qrc -TEMPLATE = app -TARGET = ssu -TARGETDIR = ssucli -LIBS += -lssu -CONFIG -= app_bundle -CONFIG += console -QT -= gui -QT += network - -unix:target.path = $${PREFIX}/usr/bin -INSTALLS += target - -!include( ../buildpath.pri ) { error("Unable to find build path specification") } diff --git a/rndssucli/rndssucli_dependencies.pri b/rndssucli/rndssucli_dependencies.pri new file mode 100644 index 0000000..48c7cf6 --- /dev/null +++ b/rndssucli/rndssucli_dependencies.pri @@ -0,0 +1 @@ +include(../libssu/libssu.pri) diff --git a/ssu_common.pri b/ssu_common.pri new file mode 100644 index 0000000..9527080 --- /dev/null +++ b/ssu_common.pri @@ -0,0 +1,12 @@ +CONFIG -= gui + +INCLUDEPATH *= $$PWD +DEPENDPATH *= $$PWD + +# TODO: determine build dir automatically +SSU_BUILD_DIR = $$PWD/build + +DESTDIR_BIN = $$SSU_BUILD_DIR/bin +DESTDIR_LIB = $$SSU_BUILD_DIR/lib + +LIBS += -L$$DESTDIR_LIB diff --git a/ssuapplication.pri b/ssuapplication.pri new file mode 100644 index 0000000..bc0d852 --- /dev/null +++ b/ssuapplication.pri @@ -0,0 +1,8 @@ +isEmpty(TARGET):error("TARGET must be set before this file is included") +include(ssu_common.pri) + +TEMPLATE = app +DESTDIR = $$DESTDIR_BIN + +target.path = /usr/bin +INSTALLS += target diff --git a/ssuconfperm/ssuconfperm.pro b/ssuconfperm/ssuconfperm.pro index 0e68b80..04c84ca 100644 --- a/ssuconfperm/ssuconfperm.pro +++ b/ssuconfperm/ssuconfperm.pro @@ -1,10 +1,5 @@ -TEMPLATE = app TARGET = ssuconfperm +include(../ssuapplication.pri) + SOURCES = ssuconfperm.c -HEADERS = ../constants.h CONFIG -= qt - -!include(../buildpath.pri){ error("Unable to find build path configuration")} - -unix:target.path = $${PREFIX}/usr/bin -INSTALLS += target diff --git a/ssuks/ssukickstarter.h b/ssuks/ssukickstarter.h index f8f9909..942bc8d 100644 --- a/ssuks/ssukickstarter.h +++ b/ssuks/ssukickstarter.h @@ -12,8 +12,8 @@ #include #include -#include -#include +#include "libssu/ssudeviceinfo.h" +#include "libssu/ssu.h" /* class Q_CORE_EXPORT SsuKickstarter: public QObject { diff --git a/ssuks/ssuks.pro b/ssuks/ssuks.pro index 6cc0858..e11e33f 100644 --- a/ssuks/ssuks.pro +++ b/ssuks/ssuks.pro @@ -1,16 +1,8 @@ +TARGET = ssuks +include(../ssuapplication.pri) +include(ssuks_dependencies.pri) + HEADERS = ssuks.h \ ssukickstarter.h SOURCES = ssuks.cpp \ ssukickstarter.cpp -TEMPLATE = app -TARGET = ssuks -LIBS += -lssu -CONFIG -= app_bundle -CONFIG += console -QT -= gui -QT += network - -unix:target.path = $${PREFIX}/usr/bin -INSTALLS += target - -!include( ../buildpath.pri ) { error("Unable to find build path specification") } diff --git a/ssuks/ssuks_dependencies.pri b/ssuks/ssuks_dependencies.pri new file mode 100644 index 0000000..48c7cf6 --- /dev/null +++ b/ssuks/ssuks_dependencies.pri @@ -0,0 +1 @@ +include(../libssu/libssu.pri) diff --git a/ssulibrary.pri b/ssulibrary.pri new file mode 100644 index 0000000..412ed5a --- /dev/null +++ b/ssulibrary.pri @@ -0,0 +1,12 @@ +isEmpty(TARGET):error("TARGET must be set before this file is included") +include(ssu_common.pri) + +TEMPLATE = lib + +DESTDIR = $$DESTDIR_LIB + +target.path = /usr/lib +INSTALLS += target + +install_headers.path = /usr/include +INSTALLS += install_headers diff --git a/ssuurlresolver/main.cpp b/ssuurlresolver/main.cpp index 9e13f2d..9dcc1d6 100644 --- a/ssuurlresolver/main.cpp +++ b/ssuurlresolver/main.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include "ssuurlresolver.h" int main(int argc, char** argv){ diff --git a/ssuurlresolver/ssuurlresolver.cpp b/ssuurlresolver/ssuurlresolver.cpp index 41be6a2..7affa66 100644 --- a/ssuurlresolver/ssuurlresolver.cpp +++ b/ssuurlresolver/ssuurlresolver.cpp @@ -5,11 +5,14 @@ * @date 2012 */ +#include "ssuurlresolver.h" + #include +#include +#include #include -#include "ssuurlresolver.h" -#include "ssulog.h" +#include "libssu/ssulog.h" SsuUrlResolver::SsuUrlResolver(): QObject(){ QObject::connect(this,SIGNAL(done()), diff --git a/ssuurlresolver/ssuurlresolver.h b/ssuurlresolver/ssuurlresolver.h index c3c6e63..c530ce6 100644 --- a/ssuurlresolver/ssuurlresolver.h +++ b/ssuurlresolver/ssuurlresolver.h @@ -11,12 +11,13 @@ #include #include #include +#include #include #include #include -#include +#include "libssu/ssu.h" // quick hack for waiting for a signal class SignalWait: public QObject { diff --git a/ssuurlresolver/ssuurlresolver.pro b/ssuurlresolver/ssuurlresolver.pro index d525451..868683e 100644 --- a/ssuurlresolver/ssuurlresolver.pro +++ b/ssuurlresolver/ssuurlresolver.pro @@ -1,16 +1,14 @@ +TARGET = ssu +include(../ssuapplication.pri) +include(ssuurlresolver_dependencies.pri) + +# We do not build a typical application - override defaults from ../ssuapplication.pri +DESTDIR = $$DESTDIR_LIB/zypp/plugins/urlresolver +target.path = /usr/lib/zypp/plugins/urlresolver + HEADERS = ssuurlresolver.h SOURCES = main.cpp \ ssuurlresolver.cpp -TEMPLATE = app -TARGET = ssu -LIBS += -lssu -CONFIG -= app_bundle -CONFIG += console link_pkgconfig -QT -= gui -QT += network -PKGCONFIG += libzypp libsystemd-journal - -unix:target.path = $${PREFIX}/usr/lib/zypp/plugins/urlresolver -INSTALLS += target -!include( ../buildpath.pri ) { error("Unable to find build path specification") } +CONFIG += link_pkgconfig +PKGCONFIG += libzypp libsystemd-journal diff --git a/ssuurlresolver/ssuurlresolver_dependencies.pri b/ssuurlresolver/ssuurlresolver_dependencies.pri new file mode 100644 index 0000000..48c7cf6 --- /dev/null +++ b/ssuurlresolver/ssuurlresolver_dependencies.pri @@ -0,0 +1 @@ +include(../libssu/libssu.pri) diff --git a/tests/testapplication.pri b/tests/testapplication.pri new file mode 100644 index 0000000..4d8955e --- /dev/null +++ b/tests/testapplication.pri @@ -0,0 +1,8 @@ +include(../ssuapplication.pri) +include(tests_common.pri) + +QT += testlib + +test_data_etc.path = $${TESTS_DATA_PATH}/configroot/etc/ssu +test_data_usr_share.path = $${TESTS_DATA_PATH}/configroot/usr/share/ssu +INSTALLS += test_data_etc test_data_usr_share diff --git a/tests/testlibrary.pri b/tests/testlibrary.pri new file mode 100644 index 0000000..9d8aea9 --- /dev/null +++ b/tests/testlibrary.pri @@ -0,0 +1,2 @@ +include(../ssulibrary.pri) +include(tests_common.pri) diff --git a/tests/tests.pro b/tests/tests.pro index f31c353..c87ba44 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -CONFIG += qt ordered coverage debug +CONFIG += ordered coverage debug SUBDIRS = \ testutils \ testutils/sandboxhook.pro \ @@ -9,8 +9,7 @@ SUBDIRS = \ ut_urlresolver \ ut_variables \ -!include( tests.pri ) { error("Unable to find tests include") } - +include(tests_common.pri) tests.files = tests.xml tests.path = $$TESTS_PATH INSTALLS += tests diff --git a/tests/tests.pri b/tests/tests_common.pri similarity index 77% rename from tests/tests.pri rename to tests/tests_common.pri index fed6f55..c166f2f 100644 --- a/tests/tests.pri +++ b/tests/tests_common.pri @@ -1,8 +1,12 @@ -DEPENDPATH *= $${PWD}/testutils +isEmpty(TARGET):error("TARGET must be defined before this file is included") + +INCLUDEPATH *= $${PWD} +DEPENDPATH *= $${PWD} TESTS_PATH = /opt/tests/ssu DEFINES += TESTS_PATH="'\"$${TESTS_PATH}\"'" -isEmpty(TARGET):error("TARGET must be defined before this file is included") TESTS_DATA_PATH = /opt/tests/ssu/data/$${TARGET} DEFINES += TESTS_DATA_PATH="'\"$${TESTS_DATA_PATH}\"'" + +target.path = $${TESTS_PATH} diff --git a/tests/testutils/sandboxfileenginehandler.cpp b/tests/testutils/sandboxfileenginehandler.cpp index e8e380b..f72ff1d 100644 --- a/tests/testutils/sandboxfileenginehandler.cpp +++ b/tests/testutils/sandboxfileenginehandler.cpp @@ -13,8 +13,9 @@ #include #include -#include -#include "../../constants.h" +#include "libssu/ssucoreconfig.h" +// TODO: rename to ssuconstants.h? +#include "constants.h" /** * @class SandboxFileEngineHandler diff --git a/tests/testutils/sandboxhook.pro b/tests/testutils/sandboxhook.pro index 0b607e1..bcafced 100644 --- a/tests/testutils/sandboxhook.pro +++ b/tests/testutils/sandboxhook.pro @@ -1,17 +1,5 @@ -SOURCES = sandboxhook.cpp - -TEMPLATE = lib TARGET = sandboxhook -CONFIG -= app_bundle -CONFIG += console qtestlib -QT -= gui -QT += network testlib - -LIBS += -ltestutils +include(../testlibrary.pri) +include(sandboxhook_dependencies.pri) -!include( ../tests.pri ) { error("Unable to find tests include") } - -unix:target.path = $${PREFIX}/$$TESTS_PATH -INSTALLS += target - -!include( ../../buildpath.pri ) { error("Unable to find build path specification") } +SOURCES = sandboxhook.cpp diff --git a/tests/testutils/sandboxhook_dependencies.pri b/tests/testutils/sandboxhook_dependencies.pri new file mode 100644 index 0000000..dbc309b --- /dev/null +++ b/tests/testutils/sandboxhook_dependencies.pri @@ -0,0 +1 @@ +include(../testutils/testutils.pri) diff --git a/tests/testutils/testutils.pri b/tests/testutils/testutils.pri new file mode 100644 index 0000000..9816752 --- /dev/null +++ b/tests/testutils/testutils.pri @@ -0,0 +1,2 @@ +include(testutils_dependencies.pri) +LIBS *= -lssu-testutils diff --git a/tests/testutils/testutils.pro b/tests/testutils/testutils.pro index a19124d..8db17a1 100644 --- a/tests/testutils/testutils.pro +++ b/tests/testutils/testutils.pro @@ -1,3 +1,6 @@ +TARGET = ssu-testutils +include(../testlibrary.pri) + HEADERS = \ process.h \ sandboxfileenginehandler.h \ @@ -6,22 +9,6 @@ SOURCES = \ process.cpp \ sandboxfileenginehandler.cpp \ -TEMPLATE = lib -TARGET = testutils -CONFIG -= app_bundle -CONFIG += console qtestlib -QT -= gui -QT += network testlib - -LIBS += -lssu - -!include( ../tests.pri ) { error("Unable to find tests include") } - -unix:target.path = $${PREFIX}/$$TESTS_PATH -INSTALLS += target - -exec_wrapper.path = $${PREFIX}/$$TESTS_PATH -exec_wrapper.files = $${PWD}/runtest.sh +exec_wrapper.path = $$TESTS_PATH +exec_wrapper.files = runtest.sh INSTALLS += exec_wrapper - -!include( ../../buildpath.pri ) { error("Unable to find build path specification") } diff --git a/tests/testutils/testutils_dependencies.pri b/tests/testutils/testutils_dependencies.pri new file mode 100644 index 0000000..37c741f --- /dev/null +++ b/tests/testutils/testutils_dependencies.pri @@ -0,0 +1 @@ +include(../../libssu/libssu.pri) diff --git a/tests/ut_rndssucli/rndssuclitest.cpp b/tests/ut_rndssucli/rndssuclitest.cpp index 51f6f1a..d7db387 100644 --- a/tests/ut_rndssucli/rndssuclitest.cpp +++ b/tests/ut_rndssucli/rndssuclitest.cpp @@ -12,7 +12,7 @@ #include -#include "../testutils/process.h" +#include "testutils/process.h" typedef QStringList Args; // improve readability diff --git a/tests/ut_rndssucli/ut_rndssucli.pro b/tests/ut_rndssucli/ut_rndssucli.pro index ef98d18..4b4f9cc 100644 --- a/tests/ut_rndssucli/ut_rndssucli.pro +++ b/tests/ut_rndssucli/ut_rndssucli.pro @@ -1,3 +1,7 @@ +TARGET = ut_rndssucli +include(../testapplication.pri) +include(ut_rndssucli_dependencies.pri) + HEADERS = \ rndssuclitest.h \ @@ -5,33 +9,10 @@ SOURCES = \ main.cpp \ rndssuclitest.cpp \ -TEMPLATE = app -TARGET = ut_rndssucli - -LIBS += \ - -lssu \ - -ltestutils \ - -CONFIG -= app_bundle -CONFIG += console qtestlib -QT -= gui -QT += network testlib - -!include( ../tests.pri ) { error("Unable to find tests include") } - -unix:target.path = $${PREFIX}/$$TESTS_PATH -INSTALLS += target - -test_data_etc.path = $${TESTS_DATA_PATH}/configroot/etc/ssu test_data_etc.files = \ - $${PWD}/testdata/ssu.ini \ + testdata/ssu.ini \ -test_data_usr_share.path = $${TESTS_DATA_PATH}/configroot/usr/share/ssu test_data_usr_share.files = \ - $${PWD}/testdata/ssu-defaults.ini \ - $${PWD}/testdata/repos.ini \ - $${PWD}/testdata/board-mappings.ini \ - -INSTALLS += test_data_etc test_data_usr_share - -!include( ../../buildpath.pri ) { error("Unable to find build path specification") } + testdata/ssu-defaults.ini \ + testdata/repos.ini \ + testdata/board-mappings.ini \ diff --git a/tests/ut_rndssucli/ut_rndssucli_dependencies.pri b/tests/ut_rndssucli/ut_rndssucli_dependencies.pri new file mode 100644 index 0000000..5e56454 --- /dev/null +++ b/tests/ut_rndssucli/ut_rndssucli_dependencies.pri @@ -0,0 +1,2 @@ +include(../../libssu/libssu.pri) +include(../testutils/testutils.pri) diff --git a/tests/ut_settings/settingstest.cpp b/tests/ut_settings/settingstest.cpp index 2c5fbc0..079103f 100644 --- a/tests/ut_settings/settingstest.cpp +++ b/tests/ut_settings/settingstest.cpp @@ -9,8 +9,7 @@ #include -#include - +#include "libssu/ssusettings.h" #include "upgradetesthelper.h" void SettingsTest::initTestCase(){ diff --git a/tests/ut_settings/upgradetesthelper.cpp b/tests/ut_settings/upgradetesthelper.cpp index 4b1eb58..55e167d 100644 --- a/tests/ut_settings/upgradetesthelper.cpp +++ b/tests/ut_settings/upgradetesthelper.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include "libssu/ssusettings.h" /** * @class UpgradeTestHelper diff --git a/tests/ut_settings/ut_settings.pro b/tests/ut_settings/ut_settings.pro index a94f7fa..cbc147a 100644 --- a/tests/ut_settings/ut_settings.pro +++ b/tests/ut_settings/ut_settings.pro @@ -1,3 +1,7 @@ +TARGET = ut_settings +include(../testapplication.pri) +include(ut_settings_dependencies.pri) + HEADERS = \ settingstest.h \ upgradetesthelper.h \ @@ -8,25 +12,11 @@ SOURCES = \ upgradetesthelper.cpp \ RESOURCES = testdata.qrc -TEMPLATE = app -TARGET = ut_settings -LIBS += -lssu -CONFIG -= app_bundle -CONFIG += console qtestlib -QT -= gui -QT += network testlib - -!include( ../tests.pri ) { error("Unable to find tests include") } - -unix:target.path = $${PREFIX}/$$TESTS_PATH -INSTALLS += target - -!include( ../../buildpath.pri ) { error("Unable to find build path specification") } update_upgrade_test_recipe.target = update-upgrade-test-recipe update_upgrade_test_recipe.depends = first update_upgrade_test_recipe.commands = \ - LD_LIBRARY_PATH="$${LD_LIBRARY_PATH}:${LD_LIBRARY_PATH}" \ + LD_LIBRARY_PATH="$${DESTDIR_LIB}:${LD_LIBRARY_PATH}" \ $${DESTDIR}/$${TARGET} -generate-upgrade-test-recipe \ 2>/dev/null > $${PWD}/testdata/upgrade/recipe update_upgrade_test_recipe.CONFIG += phony diff --git a/tests/ut_settings/ut_settings_dependencies.pri b/tests/ut_settings/ut_settings_dependencies.pri new file mode 100644 index 0000000..5e56454 --- /dev/null +++ b/tests/ut_settings/ut_settings_dependencies.pri @@ -0,0 +1,2 @@ +include(../../libssu/libssu.pri) +include(../testutils/testutils.pri) diff --git a/tests/ut_ssuurlresolver/ut_ssuurlresolver.pro b/tests/ut_ssuurlresolver/ut_ssuurlresolver.pro index b57aeff..6f7391b 100644 --- a/tests/ut_ssuurlresolver/ut_ssuurlresolver.pro +++ b/tests/ut_ssuurlresolver/ut_ssuurlresolver.pro @@ -1,3 +1,10 @@ +TARGET = ut_ssuurlresolver +include(../testapplication.pri) +include(ut_ssuurlresolver_dependencies.pri) + +CONFIG += link_pkgconfig +PKGCONFIG += libzypp + HEADERS = \ ssuurlresolvertest.h \ @@ -5,33 +12,10 @@ SOURCES = \ main.cpp \ ssuurlresolvertest.cpp \ -TEMPLATE = app -TARGET = ut_ssuurlresolver - -LIBS += \ - -lssu \ - -lzypp \ - -CONFIG -= app_bundle -CONFIG += console qtestlib -QT -= gui -QT += network testlib - -!include( ../tests.pri ) { error("Unable to find tests include") } - -unix:target.path = $${PREFIX}/$$TESTS_PATH -INSTALLS += target - -test_data_etc.path = $${TESTS_DATA_PATH}/configroot/etc/ssu test_data_etc.files = \ - $${PWD}/testdata/ssu.ini \ + testdata/ssu.ini \ -test_data_usr_share.path = $${TESTS_DATA_PATH}/configroot/usr/share/ssu test_data_usr_share.files = \ - $${PWD}/testdata/ssu-defaults.ini \ - $${PWD}/testdata/repos.ini \ - $${PWD}/testdata/board-mappings.ini \ - -INSTALLS += test_data_etc test_data_usr_share - -!include( ../../buildpath.pri ) { error("Unable to find build path specification") } + testdata/ssu-defaults.ini \ + testdata/repos.ini \ + testdata/board-mappings.ini \ diff --git a/tests/ut_ssuurlresolver/ut_ssuurlresolver_dependencies.pri b/tests/ut_ssuurlresolver/ut_ssuurlresolver_dependencies.pri new file mode 100644 index 0000000..37c741f --- /dev/null +++ b/tests/ut_ssuurlresolver/ut_ssuurlresolver_dependencies.pri @@ -0,0 +1 @@ +include(../../libssu/libssu.pri) diff --git a/tests/ut_urlresolver/main.cpp b/tests/ut_urlresolver/main.cpp index 93a0479..6bd2257 100644 --- a/tests/ut_urlresolver/main.cpp +++ b/tests/ut_urlresolver/main.cpp @@ -7,7 +7,7 @@ #include -#include "../testutils/sandboxfileenginehandler.h" +#include "testutils/sandboxfileenginehandler.h" #include "urlresolvertest.cpp" int main(int argc, char **argv){ diff --git a/tests/ut_urlresolver/urlresolvertest.h b/tests/ut_urlresolver/urlresolvertest.h index 0474af2..158a410 100644 --- a/tests/ut_urlresolver/urlresolvertest.h +++ b/tests/ut_urlresolver/urlresolvertest.h @@ -12,7 +12,7 @@ #include #include -#include +#include "libssu/ssu.h" class UrlResolverTest: public QObject { Q_OBJECT diff --git a/tests/ut_urlresolver/ut_urlresolver.pro b/tests/ut_urlresolver/ut_urlresolver.pro index ef6bc43..a3e9ead 100644 --- a/tests/ut_urlresolver/ut_urlresolver.pro +++ b/tests/ut_urlresolver/ut_urlresolver.pro @@ -1,17 +1,7 @@ +TARGET = ut_urlresolver +include(../testapplication.pri) +include(ut_urlresolver_dependencies.pri) + HEADERS = urlresolvertest.h SOURCES = main.cpp \ urlresolvertest.cpp -TEMPLATE = app -TARGET = ut_urlresolver -LIBS += -lssu -ltestutils -CONFIG -= app_bundle -CONFIG += console qtestlib -QT -= gui -QT += network testlib - -!include( ../tests.pri ) { error("Unable to find tests include") } - -unix:target.path = $${PREFIX}/$$TESTS_PATH -INSTALLS += target - -!include( ../../buildpath.pri ) { error("Unable to find build path specification") } diff --git a/tests/ut_urlresolver/ut_urlresolver_dependencies.pri b/tests/ut_urlresolver/ut_urlresolver_dependencies.pri new file mode 100644 index 0000000..5e56454 --- /dev/null +++ b/tests/ut_urlresolver/ut_urlresolver_dependencies.pri @@ -0,0 +1,2 @@ +include(../../libssu/libssu.pri) +include(../testutils/testutils.pri) diff --git a/tests/ut_variables/ut_variables.pro b/tests/ut_variables/ut_variables.pro index 7779da7..b039c18 100644 --- a/tests/ut_variables/ut_variables.pro +++ b/tests/ut_variables/ut_variables.pro @@ -1,17 +1,7 @@ +TARGET = ut_variables +include(../testapplication.pri) +include(ut_variables_dependencies.pri) + HEADERS = variablestest.h SOURCES = main.cpp \ variablestest.cpp -TEMPLATE = app -TARGET = ut_variables -LIBS += -lssu -CONFIG -= app_bundle -CONFIG += console qtestlib -QT -= gui -QT += network testlib - -!include( ../tests.pri ) { error("Unable to find tests include") } - -unix:target.path = $${PREFIX}/$$TESTS_PATH -INSTALLS += target - -!include( ../../buildpath.pri ) { error("Unable to find build path specification") } diff --git a/tests/ut_variables/ut_variables_dependencies.pri b/tests/ut_variables/ut_variables_dependencies.pri new file mode 100644 index 0000000..37c741f --- /dev/null +++ b/tests/ut_variables/ut_variables_dependencies.pri @@ -0,0 +1 @@ +include(../../libssu/libssu.pri) diff --git a/tests/ut_variables/variablestest.h b/tests/ut_variables/variablestest.h index 4ece17d..5a21bd0 100644 --- a/tests/ut_variables/variablestest.h +++ b/tests/ut_variables/variablestest.h @@ -12,8 +12,8 @@ #include #include -#include -#include +#include "libssu/ssu.h" +#include "libssu/ssuvariables.h" class VariablesTest: public QObject { Q_OBJECT