diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2019-05-10 16:33:57 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2019-05-14 16:35:01 +0000 |
| commit | 25b419862107a0c7d282b10dbb85e688a3f45d80 (patch) | |
| tree | 9fbf79be8ac7d690ae0bc267fa84a41546ef4385 /tests | |
| parent | 14885cb642c7ac09b09ab9fd70d09d46273a3691 (diff) | |
| download | qtivi-25b419862107a0c7d282b10dbb85e688a3f45d80.tar.gz | |
ivigenerator: Improve the ivigenerator test coverage
Also use the 'backend_qtro' and 'simulation_server_qtro' in the autotest
to make sure they generate buildabe code, with and without annotations.
Change-Id: I028a52ea42812d827e23a43292b6f0f9c162b02a
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'tests')
5 files changed, 58 insertions, 0 deletions
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/backend_qtro.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/backend_qtro.pro new file mode 100644 index 0000000..4f13551 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/backend_qtro.pro @@ -0,0 +1,15 @@ +TEMPLATE=lib +TARGET = $$qtLibraryTarget(echo_noannotation_qtro) +LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noannotation_frontend) +DESTDIR = ../qtivi + +CONFIG += warn_off ivigenerator plugin + +INCLUDEPATH += $$OUT_PWD/../frontend +PLUGIN_TYPE = qtivi +PLUGIN_CLASS_NAME = EchoPlugin + +QT += core ivicore + +QFACE_FORMAT = backend_qtro +QFACE_SOURCES = ../../../org.example.echo.noannotation.qface diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/org-example-echo-noannotation.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/org-example-echo-noannotation.pro index 2446d17..ebadb50 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/org-example-echo-noannotation.pro +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/org-example-echo-noannotation.pro @@ -8,3 +8,12 @@ SUBDIRS = frontend \ backend_simulator.depends = frontend validator.depends = frontend test.depends = frontend + +QT_FOR_CONFIG += ivicore +qtConfig(remoteobjects): { + SUBDIRS += backend_qtro \ + simulation_server_qtro \ + + backend_qtro.depends = frontend + simulation_server_qtro.depends = frontend +} diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/simulation_server_qtro.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/simulation_server_qtro.pro new file mode 100644 index 0000000..fece593 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/simulation_server_qtro.pro @@ -0,0 +1,16 @@ +TEMPLATE = app +TARGET = org-example-echo-noannotation-simulation-server +QMAKE_PROJECT_NAME = $$TARGET +LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noannotation_frontend) + +DESTDIR = .. + +CONFIG += c++11 ivigenerator +CONFIG -= app_bundle + +INCLUDEPATH += $$OUT_PWD/../frontend + +QT += qml quick core ivicore + +QFACE_FORMAT = server_qtro_simulator +QFACE_SOURCES = ../../../org.example.echo.noannotation.qface diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/org-example-echo-qtro.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/org-example-echo-qtro.pro index 0940541..9d56fcb 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/org-example-echo-qtro.pro +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/org-example-echo-qtro.pro @@ -2,7 +2,9 @@ TEMPLATE = subdirs SUBDIRS = frontend \ backend_qtro \ + simulation_server_qtro \ server_qtro_test backend_qtro.depends = frontend server_qtro_test.depends = backend_qtro +simulation_server_qtro.depends = frontend diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/simulation_server_qtro/simulation_server_qtro.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/simulation_server_qtro/simulation_server_qtro.pro new file mode 100644 index 0000000..75be13e --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/simulation_server_qtro/simulation_server_qtro.pro @@ -0,0 +1,16 @@ +TEMPLATE = app +TARGET = org-example-echo-qtro-simulation-server +QMAKE_PROJECT_NAME = $$TARGET +LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_frontend) + +DESTDIR = .. + +CONFIG += c++11 ivigenerator +CONFIG -= app_bundle + +INCLUDEPATH += $$OUT_PWD/../frontend + +QT += qml quick core ivicore + +QFACE_FORMAT = server_qtro_simulator +QFACE_SOURCES = ../../../org.example.echo.qface |