diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2016-09-30 16:30:19 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2016-10-06 13:21:26 +0000 |
| commit | 0f471b6a71038f86a7ae4c420c9caaa3713e575e (patch) | |
| tree | 90508076dd13c0a792839ec5a88a2004c72c2503 /tests | |
| parent | 3baa96f6b10fe412a4394b6a6e7c1c049b538756 (diff) | |
Make 'make check' run all of the autotests
Previously, only the qml-qtquicktest would be run when 'make check'
was executed, because the C++ tests were not identified as test cases.
Change-Id: Ic263bcc8f13bdf154d6e8a93c8126ce3cb3b005c
Reviewed-by: Mika Salmela <mika.salmela@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pri | 1 | ||||
| -rw-r--r-- | tests/auto/qml-qtquicktest/qml-qtquicktest.pro | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/auto.pri b/tests/auto/auto.pri index a04f5b23..946b0e4a 100644 --- a/tests/auto/auto.pri +++ b/tests/auto/auto.pri @@ -2,6 +2,7 @@ error( "Couldn't find the tests.pri file!" ) } +CONFIG += testcase QT += testlib widgets !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") diff --git a/tests/auto/qml-qtquicktest/qml-qtquicktest.pro b/tests/auto/qml-qtquicktest/qml-qtquicktest.pro index d9a1e74f..d4919c1d 100644 --- a/tests/auto/qml-qtquicktest/qml-qtquicktest.pro +++ b/tests/auto/qml-qtquicktest/qml-qtquicktest.pro @@ -4,6 +4,7 @@ TEMPLATE = app CONFIG += warn_on qmltestcase +CONFIG -= testcase SOURCES += main.cpp OTHER_FILES += tst_*.qml DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD\\\"\" |