diff options
| author | tezeb <tezeb+github@outoftheblue.pl> | 2017-03-02 16:14:19 +0100 |
|---|---|---|
| committer | tezeb <tezeb+github@outoftheblue.pl> | 2017-03-10 20:27:07 +0100 |
| commit | 00683f2c47458756e396279a0efb66b86bb0c7b3 (patch) | |
| tree | 08e2e7d7b5cc3962a382b1e71afba0a83033dcc8 /tests | |
| parent | 896d8fb9f4e81b13d574d44c30ddf7b3f2949795 (diff) | |
Codecov working
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pri | 2 | ||||
| -rw-r--r-- | tests/auto/util/util.pro | 19 | ||||
| -rw-r--r-- | tests/tests.pri | 3 | ||||
| -rw-r--r-- | tests/tests.pro | 4 |
4 files changed, 16 insertions, 12 deletions
diff --git a/tests/auto/auto.pri b/tests/auto/auto.pri index e391d44f..2c2ed402 100644 --- a/tests/auto/auto.pri +++ b/tests/auto/auto.pri @@ -1,3 +1,5 @@ !include(../tests.pri) { error("Couldn't find the tests.pri file!") } +TEMPLATE = app + !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") diff --git a/tests/auto/util/util.pro b/tests/auto/util/util.pro index 1c8ba7cf..54d78b18 100644 --- a/tests/auto/util/util.pro +++ b/tests/auto/util/util.pro @@ -1,14 +1,15 @@ !include(../auto.pri) { error("Couldn't find the auto.pri file!") } SOURCES += tst_util.cpp \ - util.cpp \ - qtpasssettings.cpp \ - settingsconstants.cpp \ - pass.cpp \ - realpass.cpp \ - imitatepass.cpp \ - executor.cpp \ - simpletransaction.cpp + +OBJECTS += ../../../src/$$OBJECTS_DIR/util.o \ + ../../../src/$$OBJECTS_DIR/qtpasssettings.o \ + ../../../src/$$OBJECTS_DIR/settingsconstants.o \ + ../../../src/$$OBJECTS_DIR/pass.o \ + ../../../src/$$OBJECTS_DIR/realpass.o \ + ../../../src/$$OBJECTS_DIR/imitatepass.o \ + ../../../src/$$OBJECTS_DIR/executor.o \ + ../../../src/$$OBJECTS_DIR/simpletransaction.o HEADERS += util.h \ qtpasssettings.h \ @@ -19,6 +20,8 @@ HEADERS += util.h \ executor.h \ simpletransaction.h +OBJ_PATH += ../../../src/$$OBJECTS_DIR + VPATH += ../../../src INCLUDEPATH += ../../../src diff --git a/tests/tests.pri b/tests/tests.pri index 951bc957..ae8302b2 100644 --- a/tests/tests.pri +++ b/tests/tests.pri @@ -1,8 +1,7 @@ -TEMPLATE = app +!include(../qtpass.pri) { error("Couldn't find the qtpass.pri file!") } CONFIG += testcase qt warn_on depend_includepath testcase QT += testlib widgets target.path = $$[QT_INSTALL_TESTS]/qtpass/$$TARGET INSTALLS += target - diff --git a/tests/tests.pro b/tests/tests.pro index 65126941..da7ad3ec 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,5 +1,5 @@ -QT += widgets testlib +!include(tests.pri) { error("Couldn't find the tests.pri file!") } + CONFIG += no_docs_target -TEMPLATE = subdirs SUBDIRS += auto exists(manual): SUBDIRS += manual |