diff options
Diffstat (limited to 'tests')
9 files changed, 64 insertions, 19 deletions
diff --git a/tests/manual/qface/autotest.sh b/tests/manual/qface/autotest.sh index 959a413..ba1dfcb 100755 --- a/tests/manual/qface/autotest.sh +++ b/tests/manual/qface/autotest.sh @@ -62,13 +62,16 @@ for idlfile in org.example.echo org.example.echo.noprivate do echo "Testing '$idlfile' ================" idldir=$(echo $idlfile | tr . -) - /bin/rm -rf projects/${idldir}/*.{h,cpp,pri} - ${GENERATOR} --format=frontend ${WORKDIR}/${idlfile}.qface ${WORKDIR}/projects || die "Generator failed" 1 + out_dir=${WORKDIR}/projects/${idldir} + /bin/rm -rf ${out_dir}/*.{h,cpp,pri} + ${GENERATOR} --format=frontend ${WORKDIR}/${idlfile}.qface ${out_dir}/frontend || die "Generator failed" 1 + ${GENERATOR} --format=backend_simulator ${WORKDIR}/${idlfile}.qface ${out_dir}/backend_simulator || die "Generator for backend failed" 1 test -d build/${idldir} && /bin/rm -rf build/${idldir} test -d build/${idldir} && die "Cannot remove existing build folder" 1 mkdir -p build/${idldir} || die "Cannot create build folder" 1 pushd build/${idldir} - qmake ${WORKDIR}/projects/${idldir}/${idldir}.pro || die "Failed to run qmake" 1 + project_dir=../../projects/${idldir} + qmake ${project_dir}/${idldir}-project.pro || die "Failed to run qmake" 1 make || die "Failed to build" 1 popd echo "Done '$idlfile' ================" @@ -76,17 +79,17 @@ done for idlfile in org.example.echo org.example.echo.noprivate do - echo "Testing '$idlfile' backend-simulator ================" + echo "Testing '$idlfile' backend_simulator ================" idldir=$(echo $idlfile | tr . -) - bdir=${WORKDIR}/projects/${idldir}/backend-simulator - /bin/rm -rf ${bdir} + bdir=${WORKDIR}/projects/${idldir}/backend_simulator + /bin/rm -rf ${bdir}/*.{h,cpp,pri} mkdir -p ${bdir} ${GENERATOR} --format=backend_simulator ${WORKDIR}/${idlfile}.qface ${bdir} || die "Generator failed" 1 pushd ${bdir} checkFileCount "Total files" 8 - checkFileCount "Plugins" 1 "*plugin.*" + checkFileCount "Plugins" 2 "*plugin.*" checkFileCount "Backends" 4 "*backend.*" popd diff --git a/tests/manual/qface/projects/org-example-echo-noprivate/backend_simulator/backend_simulator.pro b/tests/manual/qface/projects/org-example-echo-noprivate/backend_simulator/backend_simulator.pro new file mode 100644 index 0000000..80a687b --- /dev/null +++ b/tests/manual/qface/projects/org-example-echo-noprivate/backend_simulator/backend_simulator.pro @@ -0,0 +1,13 @@ +TEMPLATE=lib +TARGET = echo_noprivate_simulator +LIBS += -L../frontend -lecho_noprivate_frontend + +CONFIG += warn_off +INCLUDEPATH += ../frontend/org-example-echo +PLUGIN_TYPE = qtivi +PLUGIN_EXTENDS = qtivi +PLUGIN_CLASS_NAME = QIviServiceInterface + +QT += core ivicore + +include(org-example-echo/org-example-echo.pri) diff --git a/tests/manual/qface/projects/org-example-echo-noprivate/frontend/frontend.pro b/tests/manual/qface/projects/org-example-echo-noprivate/frontend/frontend.pro new file mode 100644 index 0000000..ec87c1c --- /dev/null +++ b/tests/manual/qface/projects/org-example-echo-noprivate/frontend/frontend.pro @@ -0,0 +1,7 @@ +TEMPLATE=lib +TARGET=echo_noprivate_frontend + +QT += ivicore ivicore-private qml quick + +include(org-example-echo/org-example-echo.pri) + diff --git a/tests/manual/qface/projects/org-example-echo-noprivate/org-example-echo-noprivate-project.pro b/tests/manual/qface/projects/org-example-echo-noprivate/org-example-echo-noprivate-project.pro new file mode 100644 index 0000000..2a58441 --- /dev/null +++ b/tests/manual/qface/projects/org-example-echo-noprivate/org-example-echo-noprivate-project.pro @@ -0,0 +1,7 @@ +TEMPLATE = subdirs + +SUBDIRS = frontend \ + backend_simulator \ + + +CONFIG += ordered diff --git a/tests/manual/qface/projects/org-example-echo-noprivate/org-example-echo-noprivate.pro b/tests/manual/qface/projects/org-example-echo-noprivate/org-example-echo-noprivate.pro deleted file mode 100644 index 85d9c4c..0000000 --- a/tests/manual/qface/projects/org-example-echo-noprivate/org-example-echo-noprivate.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE=lib -TARGET=demo - -QT += ivicore qml quick - -include(org-example-echo-noprivate.pri) diff --git a/tests/manual/qface/projects/org-example-echo/backend_simulator/backend_simulator.pro b/tests/manual/qface/projects/org-example-echo/backend_simulator/backend_simulator.pro new file mode 100644 index 0000000..c1af7a1 --- /dev/null +++ b/tests/manual/qface/projects/org-example-echo/backend_simulator/backend_simulator.pro @@ -0,0 +1,13 @@ +TEMPLATE=lib +TARGET = echo_simulator +LIBS += -L../frontend -lecho_frontend + +CONFIG += warn_off +INCLUDEPATH += ../frontend/org-example-echo +PLUGIN_TYPE = qtivi +PLUGIN_EXTENDS = qtivi +PLUGIN_CLASS_NAME = QIviServiceInterface + +QT += core ivicore + +include(org-example-echo/org-example-echo.pri) diff --git a/tests/manual/qface/projects/org-example-echo/frontend/frontend.pro b/tests/manual/qface/projects/org-example-echo/frontend/frontend.pro new file mode 100644 index 0000000..e2ce08d --- /dev/null +++ b/tests/manual/qface/projects/org-example-echo/frontend/frontend.pro @@ -0,0 +1,7 @@ +TEMPLATE=lib +TARGET=echo_frontend + +QT += ivicore ivicore-private qml quick + +include(org-example-echo/org-example-echo.pri) + diff --git a/tests/manual/qface/projects/org-example-echo/org-example-echo-project.pro b/tests/manual/qface/projects/org-example-echo/org-example-echo-project.pro new file mode 100644 index 0000000..2a58441 --- /dev/null +++ b/tests/manual/qface/projects/org-example-echo/org-example-echo-project.pro @@ -0,0 +1,7 @@ +TEMPLATE = subdirs + +SUBDIRS = frontend \ + backend_simulator \ + + +CONFIG += ordered diff --git a/tests/manual/qface/projects/org-example-echo/org-example-echo.pro b/tests/manual/qface/projects/org-example-echo/org-example-echo.pro deleted file mode 100644 index 231f4a1..0000000 --- a/tests/manual/qface/projects/org-example-echo/org-example-echo.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE=lib -TARGET=demo - -QT += ivicore ivicore-private qml quick - -include(org-example-echo.pri) |