diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-06-19 17:45:57 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-06-24 21:51:28 +0100 |
| commit | 8448855b8050e5682387d97585c7211b5cf8c7aa (patch) | |
| tree | d786e03b1f0a18ff9d2a8aa2487408d19944bd2b /tests | |
| parent | 8e84a1caee42da4b0613db17a9851240a96497aa (diff) | |
Add missing tests and benchmarks
Many got missed by script it seems. Cleaned all those in render to use
the shared cmake config script. Also added benchmark build, in release
only (not tried to run them).
Change-Id: I63bbdddedd50a51ea5ac585419527b461380d9cc
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests')
114 files changed, 401 insertions, 1546 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 82b277f3a..606d0c03a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -10,4 +10,7 @@ if(QT_FEATURE_qt3d_extras) qt_build_tests() add_subdirectory(manual) # add here since default seems to be to not build them + if(NOT QT_FEATURE_testcocoon AND CMAKE_BUILD_TYPE STREQUAL Release) + add_subdirectory(benchmarks) + endif() endif() diff --git a/tests/auto/animation/skeleton/CMakeLists.txt b/tests/auto/animation/skeleton/CMakeLists.txt index 29c7ab7e3..37bf11619 100644 --- a/tests/auto/animation/skeleton/CMakeLists.txt +++ b/tests/auto/animation/skeleton/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_skeleton Test: ##################################################################### -qt_add_test(tst_skeleton +qt_add_test(tst_skeleton_anim SOURCES tst_skeleton.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_skeleton ## Scopes: ##################################################################### -qt_extend_target(tst_skeleton CONDITION QT_FEATURE_private_tests +qt_extend_target(tst_skeleton_anim CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/render/CMakeLists.txt b/tests/auto/render/CMakeLists.txt index bc45852c4..b0aff2de0 100644 --- a/tests/auto/render/CMakeLists.txt +++ b/tests/auto/render/CMakeLists.txt @@ -1,42 +1,107 @@ # Generated from render.pro. if(QT_FEATURE_private_tests) + add_subdirectory(armature) add_subdirectory(aspect) + add_subdirectory(attribute) + add_subdirectory(blitframebuffer) + add_subdirectory(buffer) + add_subdirectory(computecommand) + add_subdirectory(coordinatereader) + add_subdirectory(ddstextures) + add_subdirectory(effect) add_subdirectory(entity) - add_subdirectory(renderpass) - add_subdirectory(shader) - add_subdirectory(shaderbuilder) - add_subdirectory(texture) + add_subdirectory(filterentitybycomponent) + add_subdirectory(filterkey) + add_subdirectory(framegraphnode) + add_subdirectory(framegraphvisitor) + add_subdirectory(genericlambdajob) + add_subdirectory(geometry) + add_subdirectory(geometryrenderer) + add_subdirectory(joint) + add_subdirectory(ktxtextures) + add_subdirectory(layerfiltering) + add_subdirectory(levelofdetail) + add_subdirectory(loadscenejob) add_subdirectory(material) - add_subdirectory(vsyncframeadvanceservice) -# add_subdirectory(meshfunctors) + add_subdirectory(memorybarrier) + add_subdirectory(meshfunctors) + add_subdirectory(objectpicker) + add_subdirectory(parameter) + add_subdirectory(proximityfilter) + add_subdirectory(proximityfiltering) + add_subdirectory(qabstractlight) + add_subdirectory(qabstracttexture) + add_subdirectory(qabstracttextureimage) add_subdirectory(qattribute) add_subdirectory(qbuffer) - add_subdirectory(qgeometry) - add_subdirectory(qgeometryrenderer) - add_subdirectory(qlevelofdetail) - add_subdirectory(levelofdetail) - add_subdirectory(buffer) - add_subdirectory(attribute) - add_subdirectory(geometry) - add_subdirectory(geometryrenderer) + add_subdirectory(qcamera) + add_subdirectory(qcameralens) add_subdirectory(qcameraselector) add_subdirectory(qclearbuffers) + add_subdirectory(qcomputecommand) + add_subdirectory(qdispatchcompute) + add_subdirectory(qeffect) + add_subdirectory(qenvironmentlight) + add_subdirectory(qfilterkey) add_subdirectory(qframegraphnode) + add_subdirectory(qgeometry) + add_subdirectory(qgeometryrenderer) + add_subdirectory(qgraphicsapifilter) add_subdirectory(qlayerfilter) - add_subdirectory(qabstractlight) - add_subdirectory(qenvironmentlight) + add_subdirectory(qlevelofdetail) + add_subdirectory(qmemorybarrier) + add_subdirectory(qmesh) + add_subdirectory(qobjectpicker) + add_subdirectory(qparameter) + add_subdirectory(qproximityfilter) + add_subdirectory(qraycaster) + add_subdirectory(qrendercapture) + add_subdirectory(qrenderpass) add_subdirectory(qrenderpassfilter) + add_subdirectory(qrendersettings) add_subdirectory(qrenderstate) + add_subdirectory(qrenderstateset) + add_subdirectory(qrendersurfaceselector) + add_subdirectory(qrendertarget) + add_subdirectory(qrendertargetoutput) add_subdirectory(qrendertargetselector) + add_subdirectory(qsceneloader) + add_subdirectory(qscreenraycaster) + add_subdirectory(qsetfence) + add_subdirectory(qshaderimage) + add_subdirectory(qshaderprogram) + add_subdirectory(qshaderprogrambuilder) + add_subdirectory(qsharedgltexture) add_subdirectory(qsortpolicy) - add_subdirectory(qrenderstateset) + add_subdirectory(qtechnique) add_subdirectory(qtechniquefilter) + add_subdirectory(qtexturedataupdate) + add_subdirectory(qtextureimage) add_subdirectory(qtextureimagedata) + add_subdirectory(qtextureloader) add_subdirectory(qviewport) - add_subdirectory(framegraphnode) - add_subdirectory(qobjectpicker) - add_subdirectory(objectpicker) + add_subdirectory(qwaitfence) + add_subdirectory(raycaster) + add_subdirectory(rendercapture) + add_subdirectory(renderpass) + add_subdirectory(rendertarget) + add_subdirectory(sceneloader) + add_subdirectory(segmentvisitor) + add_subdirectory(setfence) + add_subdirectory(shader) + add_subdirectory(shaderbuilder) + add_subdirectory(shadergraph) + add_subdirectory(shaderimage) + add_subdirectory(skeleton) + add_subdirectory(sortpolicy) + add_subdirectory(technique) + add_subdirectory(texture) + add_subdirectory(transform) + add_subdirectory(trianglevisitor) + add_subdirectory(uniform) + add_subdirectory(vsyncframeadvanceservice) + add_subdirectory(waitfence) endif() if(QT_FEATURE_private_tests AND NOT QT_FEATURE_qt3d_simd_avx2) add_subdirectory(qray3d) diff --git a/tests/auto/render/armature/CMakeLists.txt b/tests/auto/render/armature/CMakeLists.txt index b7a97cd02..82f573201 100644 --- a/tests/auto/render/armature/CMakeLists.txt +++ b/tests/auto/render/armature/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_armature SOURCES tst_armature.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_armature ## Scopes: ##################################################################### -qt_extend_target(tst_armature CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_armature) diff --git a/tests/auto/render/aspect/CMakeLists.txt b/tests/auto/render/aspect/CMakeLists.txt index 6ed1f2710..b5e544f97 100644 --- a/tests/auto/render/aspect/CMakeLists.txt +++ b/tests/auto/render/aspect/CMakeLists.txt @@ -19,5 +19,8 @@ qt_add_test(tst_aspect #### Keys ignored in scope 1:.:.:aspect.pro:<TRUE>: # TEMPLATE = "app" +## Scopes: +##################################################################### + include(../commons/commons.cmake) qt3d_setup_common_render_test(tst_aspect USE_TEST_ASPECT) diff --git a/tests/auto/render/attribute/CMakeLists.txt b/tests/auto/render/attribute/CMakeLists.txt index 09c679bae..9e87e0785 100644 --- a/tests/auto/render/attribute/CMakeLists.txt +++ b/tests/auto/render/attribute/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_attribute SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_attribute.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_attribute ## Scopes: ##################################################################### -qt_extend_target(tst_attribute CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_attribute CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_attribute) diff --git a/tests/auto/render/blitframebuffer/CMakeLists.txt b/tests/auto/render/blitframebuffer/CMakeLists.txt index 898b2ec48..d5107481c 100644 --- a/tests/auto/render/blitframebuffer/CMakeLists.txt +++ b/tests/auto/render/blitframebuffer/CMakeLists.txt @@ -26,13 +26,5 @@ qt_add_test(tst_blitframebuffer ## Scopes: ##################################################################### -qt_extend_target(tst_blitframebuffer CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_blitframebuffer CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_blitframebuffer USE_TEST_ASPECT) diff --git a/tests/auto/render/boundingsphere/CMakeLists.txt b/tests/auto/render/boundingsphere/CMakeLists.txt index 07e8dd1f6..df59b4551 100644 --- a/tests/auto/render/boundingsphere/CMakeLists.txt +++ b/tests/auto/render/boundingsphere/CMakeLists.txt @@ -6,12 +6,9 @@ qt_add_test(tst_boundingsphere SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h ../qmlscenereader/qmlscenereader.cpp ../qmlscenereader/qmlscenereader.h tst_boundingsphere.cpp INCLUDE_DIRECTORIES - ../../core/common - ../commons ../qmlscenereader PUBLIC_LIBRARIES Qt::3DCore @@ -48,13 +45,5 @@ qt_add_resource(tst_boundingsphere "boundingsphere" ## Scopes: ##################################################################### -qt_extend_target(tst_boundingsphere CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) - -qt_extend_target(tst_boundingsphere CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_boundingsphere) diff --git a/tests/auto/render/buffer/CMakeLists.txt b/tests/auto/render/buffer/CMakeLists.txt index c16a2a57f..54be229ca 100644 --- a/tests/auto/render/buffer/CMakeLists.txt +++ b/tests/auto/render/buffer/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_buffer SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_buffer.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_buffer ## Scopes: ##################################################################### -qt_extend_target(tst_buffer CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_buffer CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_buffer) diff --git a/tests/auto/render/computecommand/CMakeLists.txt b/tests/auto/render/computecommand/CMakeLists.txt index 672109a44..353ac7049 100644 --- a/tests/auto/render/computecommand/CMakeLists.txt +++ b/tests/auto/render/computecommand/CMakeLists.txt @@ -22,5 +22,5 @@ qt_add_test(tst_computecommand ## Scopes: ##################################################################### -include(../../commons/commons.cmake) +include(../commons/commons.cmake) qt3d_setup_common_render_test(tst_computecommand USE_TEST_ASPECT) diff --git a/tests/auto/render/coordinatereader/CMakeLists.txt b/tests/auto/render/coordinatereader/CMakeLists.txt index f0ce340c6..a871d2bd3 100644 --- a/tests/auto/render/coordinatereader/CMakeLists.txt +++ b/tests/auto/render/coordinatereader/CMakeLists.txt @@ -4,13 +4,9 @@ ## coordinatereader Test: ##################################################################### -qt_add_test(coordinatereader +qt_add_test(tst_coordinatereader SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_coordinatereader.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(coordinatereader ## Scopes: ##################################################################### -qt_extend_target(coordinatereader CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(coordinatereader CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_coordinatereader) diff --git a/tests/auto/render/effect/CMakeLists.txt b/tests/auto/render/effect/CMakeLists.txt index acee32cf3..c154021cd 100644 --- a/tests/auto/render/effect/CMakeLists.txt +++ b/tests/auto/render/effect/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_effect SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_effect.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_effect ## Scopes: ##################################################################### -qt_extend_target(tst_effect CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_effect CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_effect) diff --git a/tests/auto/render/entity/CMakeLists.txt b/tests/auto/render/entity/CMakeLists.txt index 7ea655cb2..3df6f6cc8 100644 --- a/tests/auto/render/entity/CMakeLists.txt +++ b/tests/auto/render/entity/CMakeLists.txt @@ -6,10 +6,7 @@ qt_add_test(tst_entity SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_entity.cpp - INCLUDE_DIRECTORIES - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -25,7 +22,5 @@ qt_add_test(tst_entity ## Scopes: ##################################################################### -qt_extend_target(tst_entity CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_entity) diff --git a/tests/auto/render/filterentitybycomponent/CMakeLists.txt b/tests/auto/render/filterentitybycomponent/CMakeLists.txt index d46b5f71e..d8661e366 100644 --- a/tests/auto/render/filterentitybycomponent/CMakeLists.txt +++ b/tests/auto/render/filterentitybycomponent/CMakeLists.txt @@ -6,10 +6,7 @@ qt_add_test(tst_filterentitybycomponent SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_filterentitybycomponent.cpp - INCLUDE_DIRECTORIES - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -25,7 +22,5 @@ qt_add_test(tst_filterentitybycomponent ## Scopes: ##################################################################### -qt_extend_target(tst_filterentitybycomponent CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_filterentitybycomponent USE_TEST_ASPECT ) diff --git a/tests/auto/render/filterkey/CMakeLists.txt b/tests/auto/render/filterkey/CMakeLists.txt index f274ab509..ba3d8836e 100644 --- a/tests/auto/render/filterkey/CMakeLists.txt +++ b/tests/auto/render/filterkey/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_filterkey SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_filterkey.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_filterkey ## Scopes: ##################################################################### -qt_extend_target(tst_filterkey CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_filterkey CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_filterkey) diff --git a/tests/auto/render/framegraphnode/CMakeLists.txt b/tests/auto/render/framegraphnode/CMakeLists.txt index 92ddd7fda..470368647 100644 --- a/tests/auto/render/framegraphnode/CMakeLists.txt +++ b/tests/auto/render/framegraphnode/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_framegraphnode SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_framegraphnode.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_framegraphnode ## Scopes: ##################################################################### -qt_extend_target(tst_framegraphnode CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) - -qt_extend_target(tst_framegraphnode CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_framegraphnode) diff --git a/tests/auto/render/framegraphvisitor/CMakeLists.txt b/tests/auto/render/framegraphvisitor/CMakeLists.txt index 0f23b49be..986944f43 100644 --- a/tests/auto/render/framegraphvisitor/CMakeLists.txt +++ b/tests/auto/render/framegraphvisitor/CMakeLists.txt @@ -6,10 +6,7 @@ qt_add_test(tst_framegraphvisitor SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_framegraphvisitor.cpp - INCLUDE_DIRECTORIES - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -25,7 +22,5 @@ qt_add_test(tst_framegraphvisitor ## Scopes: ##################################################################### -qt_extend_target(tst_framegraphvisitor CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_framegraphvisitor USE_TEST_ASPECT) diff --git a/tests/auto/render/genericlambdajob/CMakeLists.txt b/tests/auto/render/genericlambdajob/CMakeLists.txt index 382eae3fa..c15aee9a5 100644 --- a/tests/auto/render/genericlambdajob/CMakeLists.txt +++ b/tests/auto/render/genericlambdajob/CMakeLists.txt @@ -6,10 +6,7 @@ qt_add_test(tst_genericlambdajob SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_genericlambdajob.cpp - INCLUDE_DIRECTORIES - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -25,7 +22,5 @@ qt_add_test(tst_genericlambdajob ## Scopes: ##################################################################### -qt_extend_target(tst_genericlambdajob CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_genericlambdajob USE_TEST_ASPECT) diff --git a/tests/auto/render/geometry/CMakeLists.txt b/tests/auto/render/geometry/CMakeLists.txt index 2f653a16e..7047a7ace 100644 --- a/tests/auto/render/geometry/CMakeLists.txt +++ b/tests/auto/render/geometry/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_geometry SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_geometry.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_geometry ## Scopes: ##################################################################### -qt_extend_target(tst_geometry CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_geometry CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_geometry) diff --git a/tests/auto/render/geometryrenderer/CMakeLists.txt b/tests/auto/render/geometryrenderer/CMakeLists.txt index 9b9ac31d8..34af7f649 100644 --- a/tests/auto/render/geometryrenderer/CMakeLists.txt +++ b/tests/auto/render/geometryrenderer/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_geometryrenderer SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_geometryrenderer.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_geometryrenderer ## Scopes: ##################################################################### -qt_extend_target(tst_geometryrenderer CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_geometryrenderer CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_geometryrenderer) diff --git a/tests/auto/render/joint/CMakeLists.txt b/tests/auto/render/joint/CMakeLists.txt index c70af13df..b1185a539 100644 --- a/tests/auto/render/joint/CMakeLists.txt +++ b/tests/auto/render/joint/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_joint SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_joint.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_joint ## Scopes: ##################################################################### -qt_extend_target(tst_joint CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_joint CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_joint) diff --git a/tests/auto/render/layerfiltering/CMakeLists.txt b/tests/auto/render/layerfiltering/CMakeLists.txt index f7779eabc..25fbf28a7 100644 --- a/tests/auto/render/layerfiltering/CMakeLists.txt +++ b/tests/auto/render/layerfiltering/CMakeLists.txt @@ -6,10 +6,7 @@ qt_add_test(tst_layerfiltering SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_layerfiltering.cpp - INCLUDE_DIRECTORIES - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -25,7 +22,5 @@ qt_add_test(tst_layerfiltering ## Scopes: ##################################################################### -qt_extend_target(tst_layerfiltering CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_layerfiltering USE_TEST_ASPECT) diff --git a/tests/auto/render/levelofdetail/CMakeLists.txt b/tests/auto/render/levelofdetail/CMakeLists.txt index 362e001c3..a42aceb8e 100644 --- a/tests/auto/render/levelofdetail/CMakeLists.txt +++ b/tests/auto/render/levelofdetail/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_levelofdetail SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_levelofdetail.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_levelofdetail ## Scopes: ##################################################################### -qt_extend_target(tst_levelofdetail CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_levelofdetail CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_levelofdetail) diff --git a/tests/auto/render/loadscenejob/CMakeLists.txt b/tests/auto/render/loadscenejob/CMakeLists.txt index 69164b1a0..f881b15c1 100644 --- a/tests/auto/render/loadscenejob/CMakeLists.txt +++ b/tests/auto/render/loadscenejob/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_loadscenejob SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_loadscenejob.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_loadscenejob ## Scopes: ##################################################################### -qt_extend_target(tst_loadscenejob CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_loadscenejob CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_loadscenejob) diff --git a/tests/auto/render/material/CMakeLists.txt b/tests/auto/render/material/CMakeLists.txt index 25eea6211..7be7e6eb4 100644 --- a/tests/auto/render/material/CMakeLists.txt +++ b/tests/auto/render/material/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_material SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_material.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_material ## Scopes: ##################################################################### -qt_extend_target(tst_material CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_material CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_material) diff --git a/tests/auto/render/memorybarrier/CMakeLists.txt b/tests/auto/render/memorybarrier/CMakeLists.txt index 91b889a54..9efacc9df 100644 --- a/tests/auto/render/memorybarrier/CMakeLists.txt +++ b/tests/auto/render/memorybarrier/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_memorybarrier SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_memorybarrier.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_memorybarrier ## Scopes: ##################################################################### -qt_extend_target(tst_memorybarrier CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_memorybarrier CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_memorybarrier) diff --git a/tests/auto/render/meshfunctors/CMakeLists.txt b/tests/auto/render/meshfunctors/CMakeLists.txt index e3bb775ad..78f5b101e 100644 --- a/tests/auto/render/meshfunctors/CMakeLists.txt +++ b/tests/auto/render/meshfunctors/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_renderviews Test: ##################################################################### -qt_add_test(tst_renderviews +qt_add_test(tst_meshfunctors SOURCES tst_meshfunctors.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/meshfunctors/meshfunctors.pro b/tests/auto/render/meshfunctors/meshfunctors.pro index cdf7d5e9b..84d16a210 100644 --- a/tests/auto/render/meshfunctors/meshfunctors.pro +++ b/tests/auto/render/meshfunctors/meshfunctors.pro @@ -1,6 +1,6 @@ TEMPLATE = app -TARGET = tst_renderviews +TARGET = tst_meshfunctors QT += 3dcore 3dcore-private 3drender 3drender-private testlib diff --git a/tests/auto/render/objectpicker/CMakeLists.txt b/tests/auto/render/objectpicker/CMakeLists.txt index e4dca7dfa..ef10ba20d 100644 --- a/tests/auto/render/objectpicker/CMakeLists.txt +++ b/tests/auto/render/objectpicker/CMakeLists.txt @@ -4,13 +4,9 @@ ## objectpicker Test: ##################################################################### -qt_add_test(objectpicker +qt_add_test(tst_objectpicker SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_objectpicker.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(objectpicker ## Scopes: ##################################################################### -qt_extend_target(objectpicker CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(objectpicker CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_objectpicker) diff --git a/tests/auto/render/parameter/CMakeLists.txt b/tests/auto/render/parameter/CMakeLists.txt index 57fe863b6..e06a8f9de 100644 --- a/tests/auto/render/parameter/CMakeLists.txt +++ b/tests/auto/render/parameter/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_parameter SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_parameter.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_parameter ## Scopes: ##################################################################### -qt_extend_target(tst_parameter CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_parameter CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_parameter) diff --git a/tests/auto/render/pickboundingvolumejob/CMakeLists.txt b/tests/auto/render/pickboundingvolumejob/CMakeLists.txt index 2521850f7..45d143312 100644 --- a/tests/auto/render/pickboundingvolumejob/CMakeLists.txt +++ b/tests/auto/render/pickboundingvolumejob/CMakeLists.txt @@ -6,12 +6,9 @@ qt_add_test(tst_pickboundingvolumejob SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h ../qmlscenereader/qmlscenereader.cpp ../qmlscenereader/qmlscenereader.h tst_pickboundingvolumejob.cpp INCLUDE_DIRECTORIES - ../../core/common - ../commons ../qmlscenereader PUBLIC_LIBRARIES Qt::3DCore @@ -58,13 +55,5 @@ qt_add_resource(tst_pickboundingvolumejob "pickboundingvolumejob" ## Scopes: ##################################################################### -qt_extend_target(tst_pickboundingvolumejob CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) - -qt_extend_target(tst_pickboundingvolumejob CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_pickboundingvolumejob) diff --git a/tests/auto/render/proximityfilter/CMakeLists.txt b/tests/auto/render/proximityfilter/CMakeLists.txt index aab3248bc..5f09f7e36 100644 --- a/tests/auto/render/proximityfilter/CMakeLists.txt +++ b/tests/auto/render/proximityfilter/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_proximityfilter SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_proximityfilter.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_proximityfilter ## Scopes: ##################################################################### -qt_extend_target(tst_proximityfilter CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_proximityfilter CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_proximityfilter) diff --git a/tests/auto/render/proximityfiltering/CMakeLists.txt b/tests/auto/render/proximityfiltering/CMakeLists.txt index b4edb9705..28a57d532 100644 --- a/tests/auto/render/proximityfiltering/CMakeLists.txt +++ b/tests/auto/render/proximityfiltering/CMakeLists.txt @@ -6,10 +6,7 @@ qt_add_test(tst_proximityfiltering SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_proximityfiltering.cpp - INCLUDE_DIRECTORIES - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -25,7 +22,5 @@ qt_add_test(tst_proximityfiltering ## Scopes: ##################################################################### -qt_extend_target(tst_proximityfiltering CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_proximityfiltering USE_TEST_ASPECT) diff --git a/tests/auto/render/qabstractlight/CMakeLists.txt b/tests/auto/render/qabstractlight/CMakeLists.txt index d5e5f8f1b..073b28815 100644 --- a/tests/auto/render/qabstractlight/CMakeLists.txt +++ b/tests/auto/render/qabstractlight/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qabstractlight SOURCES tst_qabstractlight.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qabstractlight ## Scopes: ##################################################################### -qt_extend_target(tst_qabstractlight CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qabstractlight) diff --git a/tests/auto/render/qabstracttexture/CMakeLists.txt b/tests/auto/render/qabstracttexture/CMakeLists.txt index d49db3b7b..e2e5f74f8 100644 --- a/tests/auto/render/qabstracttexture/CMakeLists.txt +++ b/tests/auto/render/qabstracttexture/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qabstracttexture SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qabstracttexture.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qabstracttexture ## Scopes: ##################################################################### -qt_extend_target(tst_qabstracttexture CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qabstracttexture CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qabstracttexture) diff --git a/tests/auto/render/qabstracttextureimage/CMakeLists.txt b/tests/auto/render/qabstracttextureimage/CMakeLists.txt index 321968ea5..ca877629b 100644 --- a/tests/auto/render/qabstracttextureimage/CMakeLists.txt +++ b/tests/auto/render/qabstracttextureimage/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qabstracttextureimage SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qabstracttextureimage.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qabstracttextureimage ## Scopes: ##################################################################### -qt_extend_target(tst_qabstracttextureimage CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qabstracttextureimage CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qabstracttextureimage) diff --git a/tests/auto/render/qattribute/CMakeLists.txt b/tests/auto/render/qattribute/CMakeLists.txt index 433b14d6f..ba5c654c9 100644 --- a/tests/auto/render/qattribute/CMakeLists.txt +++ b/tests/auto/render/qattribute/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qattribute SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qattribute.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qattribute ## Scopes: ##################################################################### -qt_extend_target(tst_qattribute CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qattribute CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qattribute) diff --git a/tests/auto/render/qbuffer/CMakeLists.txt b/tests/auto/render/qbuffer/CMakeLists.txt index 1a9fc0d3a..97a843ede 100644 --- a/tests/auto/render/qbuffer/CMakeLists.txt +++ b/tests/auto/render/qbuffer/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qbuffer SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qbuffer.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qbuffer ## Scopes: ##################################################################### -qt_extend_target(tst_qbuffer CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qbuffer CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qbuffer) diff --git a/tests/auto/render/qcamera/CMakeLists.txt b/tests/auto/render/qcamera/CMakeLists.txt index b3fd30c6a..03ad8ea60 100644 --- a/tests/auto/render/qcamera/CMakeLists.txt +++ b/tests/auto/render/qcamera/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qcamera SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qcamera.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qcamera ## Scopes: ##################################################################### -qt_extend_target(tst_qcamera CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qcamera CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qcamera) diff --git a/tests/auto/render/qcameralens/CMakeLists.txt b/tests/auto/render/qcameralens/CMakeLists.txt index be3eea5f1..e3736c6ab 100644 --- a/tests/auto/render/qcameralens/CMakeLists.txt +++ b/tests/auto/render/qcameralens/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qcameralens SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qcameralens.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qcameralens ## Scopes: ##################################################################### -qt_extend_target(tst_qcameralens CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qcameralens CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qcameralens) diff --git a/tests/auto/render/qcameraselector/CMakeLists.txt b/tests/auto/render/qcameraselector/CMakeLists.txt index 8ab124bdd..d38004080 100644 --- a/tests/auto/render/qcameraselector/CMakeLists.txt +++ b/tests/auto/render/qcameraselector/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qcameraselector SOURCES tst_qcameraselector.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qcameraselector ## Scopes: ##################################################################### -qt_extend_target(tst_qcameraselector CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qcameraselector) diff --git a/tests/auto/render/qclearbuffers/CMakeLists.txt b/tests/auto/render/qclearbuffers/CMakeLists.txt index 035b15891..0c3dc8ba5 100644 --- a/tests/auto/render/qclearbuffers/CMakeLists.txt +++ b/tests/auto/render/qclearbuffers/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qclearbuffer SOURCES tst_qclearbuffers.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qclearbuffer ## Scopes: ##################################################################### -qt_extend_target(tst_qclearbuffer CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qclearbuffer) diff --git a/tests/auto/render/qcomputecommand/CMakeLists.txt b/tests/auto/render/qcomputecommand/CMakeLists.txt index b5db22c1c..4aacbfd41 100644 --- a/tests/auto/render/qcomputecommand/CMakeLists.txt +++ b/tests/auto/render/qcomputecommand/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qcomputecommand SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qcomputecommand.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qcomputecommand ## Scopes: ##################################################################### -qt_extend_target(tst_qcomputecommand CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qcomputecommand CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qcomputecommand) diff --git a/tests/auto/render/qdispatchcompute/CMakeLists.txt b/tests/auto/render/qdispatchcompute/CMakeLists.txt index 7ff7bd115..bb44f72fd 100644 --- a/tests/auto/render/qdispatchcompute/CMakeLists.txt +++ b/tests/auto/render/qdispatchcompute/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qdispatchcompute SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qdispatchcompute.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qdispatchcompute ## Scopes: ##################################################################### -qt_extend_target(tst_qdispatchcompute CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qdispatchcompute CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qdispatchcompute) diff --git a/tests/auto/render/qeffect/CMakeLists.txt b/tests/auto/render/qeffect/CMakeLists.txt index 129e2c00e..775d27d4f 100644 --- a/tests/auto/render/qeffect/CMakeLists.txt +++ b/tests/auto/render/qeffect/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qeffect SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qeffect.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qeffect ## Scopes: ##################################################################### -qt_extend_target(tst_qeffect CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qeffect CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qeffect) diff --git a/tests/auto/render/qenvironmentlight/CMakeLists.txt b/tests/auto/render/qenvironmentlight/CMakeLists.txt index dbcb9b335..4979e9441 100644 --- a/tests/auto/render/qenvironmentlight/CMakeLists.txt +++ b/tests/auto/render/qenvironmentlight/CMakeLists.txt @@ -4,11 +4,9 @@ ## tst_environmentlight Test: ##################################################################### -qt_add_test(tst_environmentlight +qt_add_test(tst_qenvironmentlight SOURCES tst_qenvironmentlight.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_environmentlight ## Scopes: ##################################################################### -qt_extend_target(tst_environmentlight CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qenvironmentlight) diff --git a/tests/auto/render/qfilterkey/CMakeLists.txt b/tests/auto/render/qfilterkey/CMakeLists.txt index 127df2198..037f5e610 100644 --- a/tests/auto/render/qfilterkey/CMakeLists.txt +++ b/tests/auto/render/qfilterkey/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qfilterkey SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qfilterkey.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qfilterkey ## Scopes: ##################################################################### -qt_extend_target(tst_qfilterkey CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qfilterkey CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qfilterkey) diff --git a/tests/auto/render/qframegraphnode/CMakeLists.txt b/tests/auto/render/qframegraphnode/CMakeLists.txt index 41648fccb..d4cf11de7 100644 --- a/tests/auto/render/qframegraphnode/CMakeLists.txt +++ b/tests/auto/render/qframegraphnode/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qframegraphnode SOURCES tst_qframegraphnode.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qframegraphnode ## Scopes: ##################################################################### -qt_extend_target(tst_qframegraphnode CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qframegraphnode) diff --git a/tests/auto/render/qgeometry/CMakeLists.txt b/tests/auto/render/qgeometry/CMakeLists.txt index 04aaa7844..367a34a15 100644 --- a/tests/auto/render/qgeometry/CMakeLists.txt +++ b/tests/auto/render/qgeometry/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qgeometry SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qgeometry.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qgeometry ## Scopes: ##################################################################### -qt_extend_target(tst_qgeometry CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qgeometry CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qgeometry) diff --git a/tests/auto/render/qgeometryrenderer/CMakeLists.txt b/tests/auto/render/qgeometryrenderer/CMakeLists.txt index 679077d36..fce74ff18 100644 --- a/tests/auto/render/qgeometryrenderer/CMakeLists.txt +++ b/tests/auto/render/qgeometryrenderer/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qgeometryrenderer SOURCES tst_qgeometryrenderer.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qgeometryrenderer ## Scopes: ##################################################################### -qt_extend_target(tst_qgeometryrenderer CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qgeometryrenderer) diff --git a/tests/auto/render/qgraphicsapifilter/CMakeLists.txt b/tests/auto/render/qgraphicsapifilter/CMakeLists.txt index 58df5f53a..6453b005a 100644 --- a/tests/auto/render/qgraphicsapifilter/CMakeLists.txt +++ b/tests/auto/render/qgraphicsapifilter/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qgraphicsapifilter SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qgraphicsapifilter.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qgraphicsapifilter ## Scopes: ##################################################################### -qt_extend_target(tst_qgraphicsapifilter CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qgraphicsapifilter CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qgraphicsapifilter) diff --git a/tests/auto/render/qlayerfilter/CMakeLists.txt b/tests/auto/render/qlayerfilter/CMakeLists.txt index b0261ba79..0083c5fb3 100644 --- a/tests/auto/render/qlayerfilter/CMakeLists.txt +++ b/tests/auto/render/qlayerfilter/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qlayerfilter SOURCES tst_qlayerfilter.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qlayerfilter ## Scopes: ##################################################################### -qt_extend_target(tst_qlayerfilter CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qlayerfilter) diff --git a/tests/auto/render/qlevelofdetail/CMakeLists.txt b/tests/auto/render/qlevelofdetail/CMakeLists.txt index 0ffe45bf6..a56e2d985 100644 --- a/tests/auto/render/qlevelofdetail/CMakeLists.txt +++ b/tests/auto/render/qlevelofdetail/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qlevelofdetail SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qlevelofdetail.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qlevelofdetail ## Scopes: ##################################################################### -qt_extend_target(tst_qlevelofdetail CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qlevelofdetail CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qlevelofdetail) diff --git a/tests/auto/render/qmaterial/CMakeLists.txt b/tests/auto/render/qmaterial/CMakeLists.txt index c9ee72ea8..77e21f455 100644 --- a/tests/auto/render/qmaterial/CMakeLists.txt +++ b/tests/auto/render/qmaterial/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qmaterial SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qmaterial.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -27,13 +23,5 @@ qt_add_test(tst_qmaterial ## Scopes: ##################################################################### -qt_extend_target(tst_qmaterial CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qmaterial CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qmaterial) diff --git a/tests/auto/render/qmemorybarrier/CMakeLists.txt b/tests/auto/render/qmemorybarrier/CMakeLists.txt index dccc01dc6..71c0f64e3 100644 --- a/tests/auto/render/qmemorybarrier/CMakeLists.txt +++ b/tests/auto/render/qmemorybarrier/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qmemorybarrier SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qmemorybarrier.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qmemorybarrier ## Scopes: ##################################################################### -qt_extend_target(tst_qmemorybarrier CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qmemorybarrier CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qmemorybarrier) diff --git a/tests/auto/render/qmesh/CMakeLists.txt b/tests/auto/render/qmesh/CMakeLists.txt index 7e652efa0..a31fdd31a 100644 --- a/tests/auto/render/qmesh/CMakeLists.txt +++ b/tests/auto/render/qmesh/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qmesh SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qmesh.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qmesh ## Scopes: ##################################################################### -qt_extend_target(tst_qmesh CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qmesh CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qmesh) diff --git a/tests/auto/render/qobjectpicker/CMakeLists.txt b/tests/auto/render/qobjectpicker/CMakeLists.txt index 22a7db7e9..dfce77ca7 100644 --- a/tests/auto/render/qobjectpicker/CMakeLists.txt +++ b/tests/auto/render/qobjectpicker/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qobjectpicker SOURCES tst_qobjectpicker.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qobjectpicker ## Scopes: ##################################################################### -qt_extend_target(tst_qobjectpicker CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qobjectpicker) diff --git a/tests/auto/render/qparameter/CMakeLists.txt b/tests/auto/render/qparameter/CMakeLists.txt index bae7324e8..2c1e86dbc 100644 --- a/tests/auto/render/qparameter/CMakeLists.txt +++ b/tests/auto/render/qparameter/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qparameter SOURCES tst_qparameter.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qparameter ## Scopes: ##################################################################### -qt_extend_target(tst_qparameter CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qparameter) diff --git a/tests/auto/render/qproximityfilter/CMakeLists.txt b/tests/auto/render/qproximityfilter/CMakeLists.txt index c477edf57..8e221c6bb 100644 --- a/tests/auto/render/qproximityfilter/CMakeLists.txt +++ b/tests/auto/render/qproximityfilter/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qproximityfilter SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qproximityfilter.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qproximityfilter ## Scopes: ##################################################################### -qt_extend_target(tst_qproximityfilter CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qproximityfilter CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qproximityfilter) diff --git a/tests/auto/render/qraycaster/CMakeLists.txt b/tests/auto/render/qraycaster/CMakeLists.txt index 70b4622b7..0c9a2c18a 100644 --- a/tests/auto/render/qraycaster/CMakeLists.txt +++ b/tests/auto/render/qraycaster/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qraycaster SOURCES tst_qraycaster.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qraycaster ## Scopes: ##################################################################### -qt_extend_target(tst_qraycaster CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qraycaster USE_TEST_ASPECT) diff --git a/tests/auto/render/qrendercapture/CMakeLists.txt b/tests/auto/render/qrendercapture/CMakeLists.txt index 86a0ae7b1..fa73f41cf 100644 --- a/tests/auto/render/qrendercapture/CMakeLists.txt +++ b/tests/auto/render/qrendercapture/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qrendercapture SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qrendercapture.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qrendercapture ## Scopes: ##################################################################### -qt_extend_target(tst_qrendercapture CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) - -qt_extend_target(tst_qrendercapture CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qrendercapture) diff --git a/tests/auto/render/qrenderpass/CMakeLists.txt b/tests/auto/render/qrenderpass/CMakeLists.txt index 84af1cdb4..c778f57c6 100644 --- a/tests/auto/render/qrenderpass/CMakeLists.txt +++ b/tests/auto/render/qrenderpass/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qrenderpass SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qrenderpass.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qrenderpass ## Scopes: ##################################################################### -qt_extend_target(tst_qrenderpass CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qrenderpass CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qrenderpass) diff --git a/tests/auto/render/qrenderpassfilter/CMakeLists.txt b/tests/auto/render/qrenderpassfilter/CMakeLists.txt index 2fe7a55b3..1709266bd 100644 --- a/tests/auto/render/qrenderpassfilter/CMakeLists.txt +++ b/tests/auto/render/qrenderpassfilter/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qrenderpassfilter SOURCES tst_qrenderpassfilter.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qrenderpassfilter ## Scopes: ##################################################################### -qt_extend_target(tst_qrenderpassfilter CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../../core/common/common.cmake) +qt3d_setup_common_test(tst_qrenderpassfilter) diff --git a/tests/auto/render/qrendersettings/CMakeLists.txt b/tests/auto/render/qrendersettings/CMakeLists.txt index 39883a70b..236eea355 100644 --- a/tests/auto/render/qrendersettings/CMakeLists.txt +++ b/tests/auto/render/qrendersettings/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qrendersettings SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qrendersettings.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qrendersettings ## Scopes: ##################################################################### -qt_extend_target(tst_qrendersettings CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qrendersettings CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qrendersettings) diff --git a/tests/auto/render/qrenderstate/CMakeLists.txt b/tests/auto/render/qrenderstate/CMakeLists.txt index 249a6a84f..0995ff958 100644 --- a/tests/auto/render/qrenderstate/CMakeLists.txt +++ b/tests/auto/render/qrenderstate/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qrenderstate SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qrenderstate.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qrenderstate ## Scopes: ##################################################################### -qt_extend_target(tst_qrenderstate CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qrenderstate CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qrenderstate) diff --git a/tests/auto/render/qrenderstateset/CMakeLists.txt b/tests/auto/render/qrenderstateset/CMakeLists.txt index f6572f404..9c3d759da 100644 --- a/tests/auto/render/qrenderstateset/CMakeLists.txt +++ b/tests/auto/render/qrenderstateset/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qrenderstateset SOURCES tst_qrenderstateset.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qrenderstateset ## Scopes: ##################################################################### -qt_extend_target(tst_qrenderstateset CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../../core/common/common.cmake) +qt3d_setup_common_test(tst_qrenderstateset) diff --git a/tests/auto/render/qrendersurfaceselector/CMakeLists.txt b/tests/auto/render/qrendersurfaceselector/CMakeLists.txt index 45e167be4..eb001f308 100644 --- a/tests/auto/render/qrendersurfaceselector/CMakeLists.txt +++ b/tests/auto/render/qrendersurfaceselector/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qrendersurfaceselector SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qrendersurfaceselector.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qrendersurfaceselector ## Scopes: ##################################################################### -qt_extend_target(tst_qrendersurfaceselector CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qrendersurfaceselector CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qrendersurfaceselector) diff --git a/tests/auto/render/qrendertarget/CMakeLists.txt b/tests/auto/render/qrendertarget/CMakeLists.txt index 0a482e3a4..393859ceb 100644 --- a/tests/auto/render/qrendertarget/CMakeLists.txt +++ b/tests/auto/render/qrendertarget/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qrendertarget SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qrendertarget.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qrendertarget ## Scopes: ##################################################################### -qt_extend_target(tst_qrendertarget CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qrendertarget CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qrendertarget) diff --git a/tests/auto/render/qrendertargetoutput/CMakeLists.txt b/tests/auto/render/qrendertargetoutput/CMakeLists.txt index 296edcd3c..bf7f10d1e 100644 --- a/tests/auto/render/qrendertargetoutput/CMakeLists.txt +++ b/tests/auto/render/qrendertargetoutput/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qrendertargetoutput SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qrendertargetoutput.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qrendertargetoutput ## Scopes: ##################################################################### -qt_extend_target(tst_qrendertargetoutput CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qrendertargetoutput CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qrendertargetoutput) diff --git a/tests/auto/render/qrendertargetselector/CMakeLists.txt b/tests/auto/render/qrendertargetselector/CMakeLists.txt index 1a444110c..3b2cc3af0 100644 --- a/tests/auto/render/qrendertargetselector/CMakeLists.txt +++ b/tests/auto/render/qrendertargetselector/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qrendertargetselector SOURCES tst_qrendertargetselector.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qrendertargetselector ## Scopes: ##################################################################### -qt_extend_target(tst_qrendertargetselector CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../../core/common/common.cmake) +qt3d_setup_common_test(tst_qrendertargetselector) diff --git a/tests/auto/render/qscene2d/CMakeLists.txt b/tests/auto/render/qscene2d/CMakeLists.txt index acb5fc9fc..76dc7b575 100644 --- a/tests/auto/render/qscene2d/CMakeLists.txt +++ b/tests/auto/render/qscene2d/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(qscene2d SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qscene2d.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -28,13 +24,5 @@ qt_add_test(qscene2d ## Scopes: ##################################################################### -qt_extend_target(qscene2d CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(qscene2d CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(qscene2d) diff --git a/tests/auto/render/qsceneloader/CMakeLists.txt b/tests/auto/render/qsceneloader/CMakeLists.txt index f5c01de44..b6010d201 100644 --- a/tests/auto/render/qsceneloader/CMakeLists.txt +++ b/tests/auto/render/qsceneloader/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qsceneloader SOURCES tst_qsceneloader.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qsceneloader ## Scopes: ##################################################################### -qt_extend_target(tst_qsceneloader CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../../core/common/common.cmake) +qt3d_setup_common_test(tst_qsceneloader) diff --git a/tests/auto/render/qscreenraycaster/CMakeLists.txt b/tests/auto/render/qscreenraycaster/CMakeLists.txt index e43686da3..a7baaf887 100644 --- a/tests/auto/render/qscreenraycaster/CMakeLists.txt +++ b/tests/auto/render/qscreenraycaster/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qscreenraycaster SOURCES tst_qscreenraycaster.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qscreenraycaster ## Scopes: ##################################################################### -qt_extend_target(tst_qscreenraycaster CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../../core/common/common.cmake) +qt3d_setup_common_test(tst_qscreenraycaster) diff --git a/tests/auto/render/qsetfence/CMakeLists.txt b/tests/auto/render/qsetfence/CMakeLists.txt index 37ed87cf2..cce3c7b9f 100644 --- a/tests/auto/render/qsetfence/CMakeLists.txt +++ b/tests/auto/render/qsetfence/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qsetfence SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qsetfence.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qsetfence ## Scopes: ##################################################################### -qt_extend_target(tst_qsetfence CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qsetfence CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qsetfence) diff --git a/tests/auto/render/qshaderimage/CMakeLists.txt b/tests/auto/render/qshaderimage/CMakeLists.txt index 5ec561e00..05a3aeee6 100644 --- a/tests/auto/render/qshaderimage/CMakeLists.txt +++ b/tests/auto/render/qshaderimage/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qshaderimage SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qshaderimage.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qshaderimage ## Scopes: ##################################################################### -qt_extend_target(tst_qshaderimage CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qshaderimage CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qshaderimage) diff --git a/tests/auto/render/qshaderprogram/CMakeLists.txt b/tests/auto/render/qshaderprogram/CMakeLists.txt index 86e95094e..8d869f81c 100644 --- a/tests/auto/render/qshaderprogram/CMakeLists.txt +++ b/tests/auto/render/qshaderprogram/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qshaderprogram SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qshaderprogram.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -41,13 +37,5 @@ qt_add_resource(tst_qshaderprogram "shaders" ## Scopes: ##################################################################### -qt_extend_target(tst_qshaderprogram CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qshaderprogram CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qshaderprogram) diff --git a/tests/auto/render/qshaderprogrambuilder/CMakeLists.txt b/tests/auto/render/qshaderprogrambuilder/CMakeLists.txt index 41388c687..6c5f0cb54 100644 --- a/tests/auto/render/qshaderprogrambuilder/CMakeLists.txt +++ b/tests/auto/render/qshaderprogrambuilder/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qshaderprogrambuilder SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qshaderprogrambuilder.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qshaderprogrambuilder ## Scopes: ##################################################################### -qt_extend_target(tst_qshaderprogrambuilder CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qshaderprogrambuilder CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qshaderprogrambuilder) diff --git a/tests/auto/render/qsharedgltexture/CMakeLists.txt b/tests/auto/render/qsharedgltexture/CMakeLists.txt index c87840e7f..0d917d6d7 100644 --- a/tests/auto/render/qsharedgltexture/CMakeLists.txt +++ b/tests/auto/render/qsharedgltexture/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qsharedgltexture SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qsharedgltexture.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qsharedgltexture ## Scopes: ##################################################################### -qt_extend_target(tst_qsharedgltexture CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qsharedgltexture CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qsharedgltexture) diff --git a/tests/auto/render/qsortpolicy/CMakeLists.txt b/tests/auto/render/qsortpolicy/CMakeLists.txt index a91e1642f..3cc1ee176 100644 --- a/tests/auto/render/qsortpolicy/CMakeLists.txt +++ b/tests/auto/render/qsortpolicy/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qsortmethod SOURCES tst_qsortpolicy.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qsortmethod ## Scopes: ##################################################################### -qt_extend_target(tst_qsortmethod CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../../core/common/common.cmake) +qt3d_setup_common_test(tst_qsortmethod) diff --git a/tests/auto/render/qtechnique/CMakeLists.txt b/tests/auto/render/qtechnique/CMakeLists.txt index 025c2524c..45060ea02 100644 --- a/tests/auto/render/qtechnique/CMakeLists.txt +++ b/tests/auto/render/qtechnique/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qtechnique SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qtechnique.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qtechnique ## Scopes: ##################################################################### -qt_extend_target(tst_qtechnique CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qtechnique CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qtechnique) diff --git a/tests/auto/render/qtechniquefilter/CMakeLists.txt b/tests/auto/render/qtechniquefilter/CMakeLists.txt index 2c0bc9841..2bcf4696b 100644 --- a/tests/auto/render/qtechniquefilter/CMakeLists.txt +++ b/tests/auto/render/qtechniquefilter/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qtechniquefilter SOURCES tst_qtechniquefilter.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qtechniquefilter ## Scopes: ##################################################################### -qt_extend_target(tst_qtechniquefilter CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../../core/common/common.cmake) +qt3d_setup_common_test(tst_qtechniquefilter) diff --git a/tests/auto/render/qtextureimage/CMakeLists.txt b/tests/auto/render/qtextureimage/CMakeLists.txt index 151ff61ed..4b7f68038 100644 --- a/tests/auto/render/qtextureimage/CMakeLists.txt +++ b/tests/auto/render/qtextureimage/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qtextureimage SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qtextureimage.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qtextureimage ## Scopes: ##################################################################### -qt_extend_target(tst_qtextureimage CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qtextureimage CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qtextureimage) diff --git a/tests/auto/render/qtextureimagedata/CMakeLists.txt b/tests/auto/render/qtextureimagedata/CMakeLists.txt index 97ae69fd4..6c15dd6de 100644 --- a/tests/auto/render/qtextureimagedata/CMakeLists.txt +++ b/tests/auto/render/qtextureimagedata/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qtextureimagedata SOURCES tst_qtextureimagedata.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qtextureimagedata ## Scopes: ##################################################################### -qt_extend_target(tst_qtextureimagedata CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../../core/common/common.cmake) +qt3d_setup_common_test(tst_qtextureimagedata) diff --git a/tests/auto/render/qtextureloader/CMakeLists.txt b/tests/auto/render/qtextureloader/CMakeLists.txt index c0ade791c..8bd4f68d1 100644 --- a/tests/auto/render/qtextureloader/CMakeLists.txt +++ b/tests/auto/render/qtextureloader/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qtextureloader SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qtextureloader.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qtextureloader ## Scopes: ##################################################################### -qt_extend_target(tst_qtextureloader CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qtextureloader CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qtextureloader) diff --git a/tests/auto/render/qviewport/CMakeLists.txt b/tests/auto/render/qviewport/CMakeLists.txt index 79456f6dc..924ec2c22 100644 --- a/tests/auto/render/qviewport/CMakeLists.txt +++ b/tests/auto/render/qviewport/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_test(tst_qviewport SOURCES tst_qviewport.cpp - INCLUDE_DIRECTORIES - ../../core/common PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -24,8 +22,5 @@ qt_add_test(tst_qviewport ## Scopes: ##################################################################### -qt_extend_target(tst_qviewport CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../../core/common/common.cmake) +qt3d_setup_common_test(tst_qviewport) diff --git a/tests/auto/render/qwaitfence/CMakeLists.txt b/tests/auto/render/qwaitfence/CMakeLists.txt index ec07022c0..6994577ca 100644 --- a/tests/auto/render/qwaitfence/CMakeLists.txt +++ b/tests/auto/render/qwaitfence/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_qwaitfence SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qwaitfence.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_qwaitfence ## Scopes: ##################################################################### -qt_extend_target(tst_qwaitfence CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_qwaitfence CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qwaitfence) diff --git a/tests/auto/render/raycaster/CMakeLists.txt b/tests/auto/render/raycaster/CMakeLists.txt index 2925f511a..5f728d9ed 100644 --- a/tests/auto/render/raycaster/CMakeLists.txt +++ b/tests/auto/render/raycaster/CMakeLists.txt @@ -4,13 +4,9 @@ ## raycaster Test: ##################################################################### -qt_add_test(raycaster +qt_add_test(tst_raycaster SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_raycaster.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(raycaster ## Scopes: ##################################################################### -qt_extend_target(raycaster CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(raycaster CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_raycaster USE_TEST_ASPECT) diff --git a/tests/auto/render/raycastingjob/CMakeLists.txt b/tests/auto/render/raycastingjob/CMakeLists.txt index f407cd8e9..c131d65a3 100644 --- a/tests/auto/render/raycastingjob/CMakeLists.txt +++ b/tests/auto/render/raycastingjob/CMakeLists.txt @@ -6,12 +6,9 @@ qt_add_test(tst_raycastingjob SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h ../qmlscenereader/qmlscenereader.cpp ../qmlscenereader/qmlscenereader.h tst_raycastingjob.cpp INCLUDE_DIRECTORIES - ../../core/common - ../commons ../qmlscenereader PUBLIC_LIBRARIES Qt::3DCore @@ -51,13 +48,5 @@ qt_add_resource(tst_raycastingjob "raycastingjob" ## Scopes: ##################################################################### -qt_extend_target(tst_raycastingjob CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) - -qt_extend_target(tst_raycastingjob CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_raycastingjob) diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro index 4582b7644..f610454d7 100644 --- a/tests/auto/render/render.pro +++ b/tests/auto/render/render.pro @@ -2,110 +2,108 @@ TEMPLATE = subdirs qtConfig(private_tests) { SUBDIRS += \ + armature \ aspect \ - entity \ - renderpass \ - shader \ - shaderbuilder \ - texture \ - material \ - vsyncframeadvanceservice \ - meshfunctors \ - qattribute \ - qbuffer \ - qgeometry \ - qgeometryrenderer \ - qlevelofdetail \ - levelofdetail \ - buffer \ attribute \ + blitframebuffer \ + buffer \ + computecommand \ + coordinatereader \ + ddstextures \ + effect \ + entity \ + filterentitybycomponent \ + filterkey \ + framegraphnode \ + framegraphvisitor \ + genericlambdajob \ geometry \ geometryrenderer \ - qcameraselector \ - qclearbuffers \ - qframegraphnode \ - qlayerfilter \ - qabstractlight \ - qenvironmentlight \ - qrenderpassfilter \ - qrenderstate \ - qrendertargetselector \ - qsortpolicy \ - qrenderstateset \ - qtechniquefilter \ - qtextureimagedata \ - qviewport \ - framegraphnode \ - qobjectpicker \ - objectpicker \ -# qboundingvolumedebug \ -# boundingvolumedebug \ - ddstextures \ + joint \ ktxtextures \ layerfiltering \ - filterentitybycomponent \ - genericlambdajob \ - qgraphicsapifilter \ - qrendersurfaceselector \ - sortpolicy \ - sceneloader \ - qsceneloader \ - qrendertargetoutput \ - qcameralens \ - qcomputecommand \ + levelofdetail \ loadscenejob \ - qrendercapture \ - uniform \ - qparameter \ + material \ + memorybarrier \ + meshfunctors \ + objectpicker \ parameter \ - qtextureloader \ - qsharedgltexture \ - qtextureimage \ + proximityfilter \ + proximityfiltering \ + qabstractlight \ qabstracttexture \ qabstracttextureimage \ - qrendersettings \ - rendertarget \ - transform \ - computecommand \ - qrendertarget \ + qattribute \ + qblitframebuffer \ + qbuffer \ + qcamera \ + qcameralens \ + qcameraselector \ + qclearbuffers \ + qcomputecommand \ qdispatchcompute \ - qtechnique \ qeffect \ - qrenderpass \ + qenvironmentlight \ qfilterkey \ - effect \ - filterkey \ - qmesh \ - technique \ - rendercapture \ - segmentvisitor \ - trianglevisitor \ + qframegraphnode \ + qgeometry \ + qgeometryrenderer \ + qgraphicsapifilter \ + qlayerfilter \ + qlevelofdetail \ qmemorybarrier \ - memorybarrier \ - qshaderprogram \ - qshaderprogrambuilder \ - coordinatereader \ - framegraphvisitor \ - armature \ - skeleton \ - joint \ + qmesh \ + qobjectpicker \ + qparameter \ qproximityfilter \ - proximityfilter \ - proximityfiltering \ - qblitframebuffer \ - blitframebuffer \ qraycaster \ - raycaster \ + qrendercapture \ + qrenderpass \ + qrenderpassfilter \ + qrendersettings \ + qrenderstate \ + qrenderstateset \ + qrendersurfaceselector \ + qrendertarget \ + qrendertargetoutput \ + qrendertargetselector \ + qsceneloader \ qscreenraycaster \ - qcamera \ qsetfence \ + qshaderimage \ + qshaderprogram \ + qshaderprogrambuilder \ + qsharedgltexture \ + qsortpolicy \ + qtechnique \ + qtechniquefilter \ + qtexturedataupdate \ + qtextureimage \ + qtextureimagedata \ + qtextureloader \ + qviewport \ qwaitfence \ + raycaster \ + rendercapture \ + renderpass \ + rendertarget \ + sceneloader \ + segmentvisitor \ setfence \ - waitfence \ - qtexturedataupdate \ - qshaderimage \ + shader \ + shaderbuilder \ + shadergraph \ shaderimage \ - shadergraph + skeleton \ + sortpolicy \ + technique \ + texture \ + transform \ + trianglevisitor \ + uniform \ + vsyncframeadvanceservice \ + waitfence QT_FOR_CONFIG = 3dcore-private # TO DO: These could be restored to be executed in all cases diff --git a/tests/auto/render/rendercapture/CMakeLists.txt b/tests/auto/render/rendercapture/CMakeLists.txt index 89c8f1d01..c5b7cf609 100644 --- a/tests/auto/render/rendercapture/CMakeLists.txt +++ b/tests/auto/render/rendercapture/CMakeLists.txt @@ -4,13 +4,9 @@ ## rendercapture Test: ##################################################################### -qt_add_test(rendercapture +qt_add_test(tst_rendercapture SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_rendercapture.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(rendercapture ## Scopes: ##################################################################### -qt_extend_target(rendercapture CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(rendercapture CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_rendercapture) diff --git a/tests/auto/render/renderpass/CMakeLists.txt b/tests/auto/render/renderpass/CMakeLists.txt index 1e5eddab6..b95f54fd9 100644 --- a/tests/auto/render/renderpass/CMakeLists.txt +++ b/tests/auto/render/renderpass/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_renderpass SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_renderpass.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_renderpass ## Scopes: ##################################################################### -qt_extend_target(tst_renderpass CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_renderpass CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_renderpass) diff --git a/tests/auto/render/rendertarget/CMakeLists.txt b/tests/auto/render/rendertarget/CMakeLists.txt index 83184fe81..1c017b1bd 100644 --- a/tests/auto/render/rendertarget/CMakeLists.txt +++ b/tests/auto/render/rendertarget/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_rendertarget SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_rendertarget.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_rendertarget ## Scopes: ##################################################################### -qt_extend_target(tst_rendertarget CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_rendertarget CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_rendertarget) diff --git a/tests/auto/render/scene2d/CMakeLists.txt b/tests/auto/render/scene2d/CMakeLists.txt index ad7d357d3..ee8df500b 100644 --- a/tests/auto/render/scene2d/CMakeLists.txt +++ b/tests/auto/render/scene2d/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_scene2d SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_scene2d.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -28,13 +24,5 @@ qt_add_test(tst_scene2d ## Scopes: ##################################################################### -qt_extend_target(tst_scene2d CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_scene2d CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_scene2d) diff --git a/tests/auto/render/sceneloader/CMakeLists.txt b/tests/auto/render/sceneloader/CMakeLists.txt index b49fb4d25..7cd5c7dd3 100644 --- a/tests/auto/render/sceneloader/CMakeLists.txt +++ b/tests/auto/render/sceneloader/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_sceneloader SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_sceneloader.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_sceneloader ## Scopes: ##################################################################### -qt_extend_target(tst_sceneloader CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_sceneloader CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_sceneloader) diff --git a/tests/auto/render/segmentvisitor/CMakeLists.txt b/tests/auto/render/segmentvisitor/CMakeLists.txt index 927321bbb..f5c5bec96 100644 --- a/tests/auto/render/segmentvisitor/CMakeLists.txt +++ b/tests/auto/render/segmentvisitor/CMakeLists.txt @@ -4,13 +4,9 @@ ## segmentvisitor Test: ##################################################################### -qt_add_test(segmentvisitor +qt_add_test(tst_segmentvisitor SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_segmentvisitor.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(segmentvisitor ## Scopes: ##################################################################### -qt_extend_target(segmentvisitor CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(segmentvisitor CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_segmentvisitor) diff --git a/tests/auto/render/setfence/CMakeLists.txt b/tests/auto/render/setfence/CMakeLists.txt index 021258f3b..f3cabaac6 100644 --- a/tests/auto/render/setfence/CMakeLists.txt +++ b/tests/auto/render/setfence/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_setfence SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_setfence.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_setfence ## Scopes: ##################################################################### -qt_extend_target(tst_setfence CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_setfence CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_setfence) diff --git a/tests/auto/render/shader/CMakeLists.txt b/tests/auto/render/shader/CMakeLists.txt index 6704991e5..3b9c5d8cd 100644 --- a/tests/auto/render/shader/CMakeLists.txt +++ b/tests/auto/render/shader/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_shader SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_shader.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_shader ## Scopes: ##################################################################### -qt_extend_target(tst_shader CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_shader CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_shader) diff --git a/tests/auto/render/shaderbuilder/CMakeLists.txt b/tests/auto/render/shaderbuilder/CMakeLists.txt index dbd77de2c..a24057205 100644 --- a/tests/auto/render/shaderbuilder/CMakeLists.txt +++ b/tests/auto/render/shaderbuilder/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_shaderbuilder SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_shaderbuilder.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -44,13 +40,5 @@ qt_add_resource(tst_shaderbuilder "shaderbuilder" ## Scopes: ##################################################################### -qt_extend_target(tst_shaderbuilder CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_shaderbuilder CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_shaderbuilder) diff --git a/tests/auto/render/shadergraph/qshadergraphloader/tst_qshadergraphloader.cpp b/tests/auto/render/shadergraph/qshadergraphloader/tst_qshadergraphloader.cpp index 25e71d50b..71f5130de 100644 --- a/tests/auto/render/shadergraph/qshadergraphloader/tst_qshadergraphloader.cpp +++ b/tests/auto/render/shadergraph/qshadergraphloader/tst_qshadergraphloader.cpp @@ -276,7 +276,7 @@ void tst_QShaderGraphLoader::shouldManipulateLoaderMembers() // WHEN - const auto prototypes = [this]{ + const auto prototypes = []{ auto res = QHash<QString, QShaderNode>(); res.insert("foo", createNode({})); return res; @@ -332,7 +332,7 @@ void tst_QShaderGraphLoader::shouldLoadFromJsonStream_data() " ]" "}"; - const auto smallProtos = [this]{ + const auto smallProtos = []{ auto protos = PrototypeHash(); auto input = createNode({ @@ -353,7 +353,7 @@ void tst_QShaderGraphLoader::shouldLoadFromJsonStream_data() return protos; }(); - const auto smallGraph = [this]{ + const auto smallGraph = []{ auto graph = QShaderGraph(); auto input = createNode({ @@ -485,7 +485,7 @@ void tst_QShaderGraphLoader::shouldLoadFromJsonStream_data() " ]" "}"; - const auto complexProtos = [this]{ + const auto complexProtos = []{ const auto openGLES2 = createFormat(QShaderFormat::OpenGLES, 2, 0); const auto openGL3 = createFormat(QShaderFormat::OpenGLCoreProfile, 3, 0); diff --git a/tests/auto/render/shadergraph/qshadernodesloader/tst_qshadernodesloader.cpp b/tests/auto/render/shadergraph/qshadernodesloader/tst_qshadernodesloader.cpp index efce243bd..84da03fdb 100644 --- a/tests/auto/render/shadergraph/qshadernodesloader/tst_qshadernodesloader.cpp +++ b/tests/auto/render/shadergraph/qshadernodesloader/tst_qshadernodesloader.cpp @@ -238,7 +238,7 @@ void tst_QShaderNodesLoader::shouldLoadFromJsonStream_data() " }" "}"; - const auto smallProtos = [this]{ + const auto smallProtos = []{ const auto openGLES2 = createFormat(QShaderFormat::OpenGLES, 2, 0); const auto openGLES2Extended = createFormat(QShaderFormat::OpenGLES, 2, 0, {"ext1", "ext2"}, "kdab"); const auto openGL2 = createFormat(QShaderFormat::OpenGLCompatibilityProfile, 2, 1); diff --git a/tests/auto/render/shaderimage/CMakeLists.txt b/tests/auto/render/shaderimage/CMakeLists.txt index b358810e4..a47a2f969 100644 --- a/tests/auto/render/shaderimage/CMakeLists.txt +++ b/tests/auto/render/shaderimage/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_shaderimage SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_shaderimage.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_shaderimage ## Scopes: ##################################################################### -qt_extend_target(tst_shaderimage CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_shaderimage CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_shaderimage) diff --git a/tests/auto/render/skeleton/CMakeLists.txt b/tests/auto/render/skeleton/CMakeLists.txt index e20757b92..21e9e01b7 100644 --- a/tests/auto/render/skeleton/CMakeLists.txt +++ b/tests/auto/render/skeleton/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_skeleton SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_skeleton.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_skeleton ## Scopes: ##################################################################### -qt_extend_target(tst_skeleton CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_skeleton CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_skeleton) diff --git a/tests/auto/render/sortpolicy/CMakeLists.txt b/tests/auto/render/sortpolicy/CMakeLists.txt index d7aa14161..cc4ab605d 100644 --- a/tests/auto/render/sortpolicy/CMakeLists.txt +++ b/tests/auto/render/sortpolicy/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_sortpolicy SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_sortpolicy.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_sortpolicy ## Scopes: ##################################################################### -qt_extend_target(tst_sortpolicy CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_sortpolicy CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_sortpolicy) diff --git a/tests/auto/render/technique/CMakeLists.txt b/tests/auto/render/technique/CMakeLists.txt index 7bc587113..a9a616e33 100644 --- a/tests/auto/render/technique/CMakeLists.txt +++ b/tests/auto/render/technique/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_technique SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_technique.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_technique ## Scopes: ##################################################################### -qt_extend_target(tst_technique CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_technique CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_technique) diff --git a/tests/auto/render/texture/CMakeLists.txt b/tests/auto/render/texture/CMakeLists.txt index 5188a847a..2c181e3f2 100644 --- a/tests/auto/render/texture/CMakeLists.txt +++ b/tests/auto/render/texture/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_texture SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_texture.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_texture ## Scopes: ##################################################################### -qt_extend_target(tst_texture CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_texture CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_texture) diff --git a/tests/auto/render/transform/CMakeLists.txt b/tests/auto/render/transform/CMakeLists.txt index c99820cb8..28f69971a 100644 --- a/tests/auto/render/transform/CMakeLists.txt +++ b/tests/auto/render/transform/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_transform SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_transform.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_transform ## Scopes: ##################################################################### -qt_extend_target(tst_transform CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_transform CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_transform) diff --git a/tests/auto/render/trianglevisitor/CMakeLists.txt b/tests/auto/render/trianglevisitor/CMakeLists.txt index b081e4a53..2d49ca1ab 100644 --- a/tests/auto/render/trianglevisitor/CMakeLists.txt +++ b/tests/auto/render/trianglevisitor/CMakeLists.txt @@ -4,13 +4,9 @@ ## trianglevisitor Test: ##################################################################### -qt_add_test(trianglevisitor +qt_add_test(tst_trianglevisitor SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_trianglevisitor.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(trianglevisitor ## Scopes: ##################################################################### -qt_extend_target(trianglevisitor CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(trianglevisitor CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_trianglevisitor) diff --git a/tests/auto/render/uniform/CMakeLists.txt b/tests/auto/render/uniform/CMakeLists.txt index fb7789605..8a4bb765f 100644 --- a/tests/auto/render/uniform/CMakeLists.txt +++ b/tests/auto/render/uniform/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_uniform SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_uniform.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_uniform ## Scopes: ##################################################################### -qt_extend_target(tst_uniform CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_uniform CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_uniform) diff --git a/tests/auto/render/updateshaderdatatransformjob/CMakeLists.txt b/tests/auto/render/updateshaderdatatransformjob/CMakeLists.txt index db702602c..94a3b24ee 100644 --- a/tests/auto/render/updateshaderdatatransformjob/CMakeLists.txt +++ b/tests/auto/render/updateshaderdatatransformjob/CMakeLists.txt @@ -6,12 +6,9 @@ qt_add_test(tst_updateshaderdatatransformjob SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h ../qmlscenereader/qmlscenereader.cpp ../qmlscenereader/qmlscenereader.h tst_updateshaderdatatransformjob.cpp INCLUDE_DIRECTORIES - ../../core/common - ../commons ../qmlscenereader PUBLIC_LIBRARIES Qt::3DCore @@ -48,13 +45,5 @@ qt_add_resource(tst_updateshaderdatatransformjob "updateshaderdatatransformjob" ## Scopes: ##################################################################### -qt_extend_target(tst_updateshaderdatatransformjob CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_updateshaderdatatransformjob CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_updateshaderdatatransformjob) diff --git a/tests/auto/render/waitfence/CMakeLists.txt b/tests/auto/render/waitfence/CMakeLists.txt index 4e191a6cd..61df44357 100644 --- a/tests/auto/render/waitfence/CMakeLists.txt +++ b/tests/auto/render/waitfence/CMakeLists.txt @@ -6,11 +6,7 @@ qt_add_test(tst_waitfence SOURCES - ../commons/testrenderer.cpp ../commons/testrenderer.h tst_waitfence.cpp - INCLUDE_DIRECTORIES - ../../core/common - ../commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -26,13 +22,5 @@ qt_add_test(tst_waitfence ## Scopes: ##################################################################### -qt_extend_target(tst_waitfence CONDITION QT_FEATURE_private_tests - SOURCES - ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h - ../../core/common/testarbiter.h -) - -qt_extend_target(tst_waitfence CONDITION useCommonTestAspect - SOURCES - ../commons/testaspect.cpp ../commons/testaspect.h -) +include(../commons/commons.cmake) +qt3d_setup_common_render_test(tst_waitfence) diff --git a/tests/benchmarks/render/jobs/CMakeLists.txt b/tests/benchmarks/render/jobs/CMakeLists.txt index e9a956327..78deeae4b 100644 --- a/tests/benchmarks/render/jobs/CMakeLists.txt +++ b/tests/benchmarks/render/jobs/CMakeLists.txt @@ -6,74 +6,13 @@ qt_add_benchmark(tst_bench_jobs SOURCES - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicscontext.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicscontext_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_2.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_2_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperinterface_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/qgraphicsutils_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/submissioncontext_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext_p.h - ../../../../src/plugins/renderers/opengl/io/glbuffer.cpp ../../../../src/plugins/renderers/opengl/io/glbuffer_p.h - ../../../../src/plugins/renderers/opengl/jobs/filtercompatibletechniquejob.cpp ../../../../src/plugins/renderers/opengl/jobs/filtercompatibletechniquejob_p.h - ../../../../src/plugins/renderers/opengl/jobs/materialparametergathererjob.cpp ../../../../src/plugins/renderers/opengl/jobs/materialparametergathererjob_p.h - ../../../../src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob.cpp ../../../../src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob_p.h - ../../../../src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob.cpp ../../../../src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob_p.h - ../../../../src/plugins/renderers/opengl/jobs/renderviewinitializerjob.cpp ../../../../src/plugins/renderers/opengl/jobs/renderviewinitializerjob_p.h - ../../../../src/plugins/renderers/opengl/jobs/renderviewjobutils.cpp ../../../../src/plugins/renderers/opengl/jobs/renderviewjobutils_p.h - ../../../../src/plugins/renderers/opengl/managers/gl_handle_types_p.h - ../../../../src/plugins/renderers/opengl/managers/glresourcemanagers.cpp ../../../../src/plugins/renderers/opengl/managers/glresourcemanagers_p.h - ../../../../src/plugins/renderers/opengl/renderer/commandexecuter.cpp ../../../../src/plugins/renderers/opengl/renderer/commandexecuter_p.h - ../../../../src/plugins/renderers/opengl/renderer/frameprofiler_p.h - ../../../../src/plugins/renderers/opengl/renderer/glfence_p.h - ../../../../src/plugins/renderers/opengl/renderer/gllights.cpp ../../../../src/plugins/renderers/opengl/renderer/gllights_p.h - ../../../../src/plugins/renderers/opengl/renderer/glshader.cpp ../../../../src/plugins/renderers/opengl/renderer/glshader_p.h - ../../../../src/plugins/renderers/opengl/renderer/logging.cpp ../../../../src/plugins/renderers/opengl/renderer/logging_p.h - ../../../../src/plugins/renderers/opengl/renderer/openglvertexarrayobject.cpp ../../../../src/plugins/renderers/opengl/renderer/openglvertexarrayobject_p.h - ../../../../src/plugins/renderers/opengl/renderer/rendercommand.cpp ../../../../src/plugins/renderers/opengl/renderer/rendercommand_p.h - ../../../../src/plugins/renderers/opengl/renderer/renderer.cpp ../../../../src/plugins/renderers/opengl/renderer/renderer_p.h - ../../../../src/plugins/renderers/opengl/renderer/renderercache_p.h - ../../../../src/plugins/renderers/opengl/renderer/renderqueue.cpp ../../../../src/plugins/renderers/opengl/renderer/renderqueue_p.h - ../../../../src/plugins/renderers/opengl/renderer/renderview.cpp ../../../../src/plugins/renderers/opengl/renderer/renderview_p.h - ../../../../src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp ../../../../src/plugins/renderers/opengl/renderer/renderviewbuilder_p.h - ../../../../src/plugins/renderers/opengl/renderer/shaderparameterpack.cpp ../../../../src/plugins/renderers/opengl/renderer/shaderparameterpack_p.h - ../../../../src/plugins/renderers/opengl/renderer/shadervariables_p.h - ../../../../src/plugins/renderers/opengl/textures/gltexture.cpp ../../../../src/plugins/renderers/opengl/textures/gltexture_p.h - ../../../../src/plugins/renderers/opengl/textures/renderbuffer.cpp ../../../../src/plugins/renderers/opengl/textures/renderbuffer_p.h tst_bench_jobs.cpp DEFINES - BUILD_QT3D_MODULE QT3D_RENDER_UNIT_TESTS - QT_BUILDING_QT - QT_BUILD_INTERNAL - QT_NO_FOREACH QT_NO_FOREACH - INCLUDE_DIRECTORIES - ../../../../src/plugins/renderers/opengl - ../../../../src/plugins/renderers/opengl/graphicshelpers - ../../../../src/plugins/renderers/opengl/io - ../../../../src/plugins/renderers/opengl/jobs - ../../../../src/plugins/renderers/opengl/managers - ../../../../src/plugins/renderers/opengl/renderer - ../../../../src/plugins/renderers/opengl/textures PUBLIC_LIBRARIES - Qt::3DCore - Qt::3DCorePrivate - Qt::3DExtras - Qt::3DQuick - Qt::3DRender - Qt::3DRenderPrivate - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::OpenGLPrivate Qt::Qml Qt::Test + Qt::3DExtras ) #### Keys ignored in scope 1:.:.:jobs.pro:<TRUE>: @@ -82,12 +21,10 @@ qt_add_benchmark(tst_bench_jobs ## Scopes: ##################################################################### -qt_extend_target(tst_bench_jobs CONDITION NOT INTEGRITY - SOURCES - ../../../../src/plugins/renderers/opengl/debug/imguirenderer.cpp ../../../../src/plugins/renderers/opengl/debug/imguirenderer_p.h - INCLUDE_DIRECTORIES - ../../../../src/plugins/renderers/opengl/debug -) +include(${PROJECT_SOURCE_DIR}/tests/auto/render/commons/commons.cmake) +qt3d_setup_common_render_test(tst_bench_jobs USE_TEST_ASPECT) +include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) +qt3d_setup_opengl_renderer_target(tst_bench_jobs) qt_extend_target(tst_bench_jobs CONDITION gcov COMPILE_OPTIONS diff --git a/tests/benchmarks/render/layerfiltering/CMakeLists.txt b/tests/benchmarks/render/layerfiltering/CMakeLists.txt index 25db8cada..b6190fa80 100644 --- a/tests/benchmarks/render/layerfiltering/CMakeLists.txt +++ b/tests/benchmarks/render/layerfiltering/CMakeLists.txt @@ -6,12 +6,7 @@ qt_add_test(tst_bench_layerfiltering SOURCES - ../../../auto/render/commons/testrenderer.cpp ../../../auto/render/commons/testrenderer.h tst_bench_layerfiltering.cpp - DEFINES - QT_BUILD_INTERNAL - INCLUDE_DIRECTORIES - ../../../auto/render/commons PUBLIC_LIBRARIES Qt::3DCore Qt::3DCorePrivate @@ -27,7 +22,5 @@ qt_add_test(tst_bench_layerfiltering ## Scopes: ##################################################################### -qt_extend_target(tst_bench_layerfiltering CONDITION useCommonTestAspect - SOURCES - ../../../auto/render/commons/testaspect.cpp ../../../auto/render/commons/testaspect.h -) +include(${PROJECT_SOURCE_DIR}/tests/auto/render/commons/commons.cmake) +qt3d_setup_common_render_test(tst_bench_layerfiltering) diff --git a/tests/benchmarks/render/materialparametergathering/CMakeLists.txt b/tests/benchmarks/render/materialparametergathering/CMakeLists.txt index a979ff392..78f46deba 100644 --- a/tests/benchmarks/render/materialparametergathering/CMakeLists.txt +++ b/tests/benchmarks/render/materialparametergathering/CMakeLists.txt @@ -6,72 +6,9 @@ qt_add_test(tst_bench_materialparametergathering SOURCES - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicscontext.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicscontext_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_2.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_2_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperinterface_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/qgraphicsutils_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/submissioncontext_p.h - ../../../../src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext.cpp ../../../../src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext_p.h - ../../../../src/plugins/renderers/opengl/io/glbuffer.cpp ../../../../src/plugins/renderers/opengl/io/glbuffer_p.h - ../../../../src/plugins/renderers/opengl/jobs/filtercompatibletechniquejob.cpp ../../../../src/plugins/renderers/opengl/jobs/filtercompatibletechniquejob_p.h - ../../../../src/plugins/renderers/opengl/jobs/materialparametergathererjob.cpp ../../../../src/plugins/renderers/opengl/jobs/materialparametergathererjob_p.h - ../../../../src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob.cpp ../../../../src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob_p.h - ../../../../src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob.cpp ../../../../src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob_p.h - ../../../../src/plugins/renderers/opengl/jobs/renderviewinitializerjob.cpp ../../../../src/plugins/renderers/opengl/jobs/renderviewinitializerjob_p.h - ../../../../src/plugins/renderers/opengl/jobs/renderviewjobutils.cpp ../../../../src/plugins/renderers/opengl/jobs/renderviewjobutils_p.h - ../../../../src/plugins/renderers/opengl/managers/gl_handle_types_p.h - ../../../../src/plugins/renderers/opengl/managers/glresourcemanagers.cpp ../../../../src/plugins/renderers/opengl/managers/glresourcemanagers_p.h - ../../../../src/plugins/renderers/opengl/renderer/commandexecuter.cpp ../../../../src/plugins/renderers/opengl/renderer/commandexecuter_p.h - ../../../../src/plugins/renderers/opengl/renderer/frameprofiler_p.h - ../../../../src/plugins/renderers/opengl/renderer/glfence_p.h - ../../../../src/plugins/renderers/opengl/renderer/gllights.cpp ../../../../src/plugins/renderers/opengl/renderer/gllights_p.h - ../../../../src/plugins/renderers/opengl/renderer/glshader.cpp ../../../../src/plugins/renderers/opengl/renderer/glshader_p.h - ../../../../src/plugins/renderers/opengl/renderer/logging.cpp ../../../../src/plugins/renderers/opengl/renderer/logging_p.h - ../../../../src/plugins/renderers/opengl/renderer/openglvertexarrayobject.cpp ../../../../src/plugins/renderers/opengl/renderer/openglvertexarrayobject_p.h - ../../../../src/plugins/renderers/opengl/renderer/rendercommand.cpp ../../../../src/plugins/renderers/opengl/renderer/rendercommand_p.h - ../../../../src/plugins/renderers/opengl/renderer/renderer.cpp ../../../../src/plugins/renderers/opengl/renderer/renderer_p.h - ../../../../src/plugins/renderers/opengl/renderer/renderercache_p.h - ../../../../src/plugins/renderers/opengl/renderer/renderqueue.cpp ../../../../src/plugins/renderers/opengl/renderer/renderqueue_p.h - ../../../../src/plugins/renderers/opengl/renderer/renderview.cpp ../../../../src/plugins/renderers/opengl/renderer/renderview_p.h - ../../../../src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp ../../../../src/plugins/renderers/opengl/renderer/renderviewbuilder_p.h - ../../../../src/plugins/renderers/opengl/renderer/shaderparameterpack.cpp ../../../../src/plugins/renderers/opengl/renderer/shaderparameterpack_p.h - ../../../../src/plugins/renderers/opengl/renderer/shadervariables_p.h - ../../../../src/plugins/renderers/opengl/textures/gltexture.cpp ../../../../src/plugins/renderers/opengl/textures/gltexture_p.h - ../../../../src/plugins/renderers/opengl/textures/renderbuffer.cpp ../../../../src/plugins/renderers/opengl/textures/renderbuffer_p.h - ../../../auto/render/commons/testrenderer.cpp ../../../auto/render/commons/testrenderer.h tst_bench_materialparametergathering.cpp - DEFINES - BUILD_QT3D_MODULE - QT_BUILDING_QT - QT_BUILD_INTERNAL - QT_NO_FOREACH QT_NO_FOREACH - INCLUDE_DIRECTORIES - ../../../../src/plugins/renderers/opengl - ../../../../src/plugins/renderers/opengl/graphicshelpers - ../../../../src/plugins/renderers/opengl/io - ../../../../src/plugins/renderers/opengl/jobs - ../../../../src/plugins/renderers/opengl/managers - ../../../../src/plugins/renderers/opengl/renderer - ../../../../src/plugins/renderers/opengl/textures - ../../../auto/render/commons PUBLIC_LIBRARIES - Qt::3DCore - Qt::3DCorePrivate Qt::3DExtras - Qt::3DRender - Qt::3DRenderPrivate - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::OpenGLPrivate ) #### Keys ignored in scope 1:.:.:materialparametergathering.pro:<TRUE>: @@ -80,17 +17,10 @@ qt_add_test(tst_bench_materialparametergathering ## Scopes: ##################################################################### -qt_extend_target(tst_bench_materialparametergathering CONDITION useCommonTestAspect - SOURCES - ../../../auto/render/commons/testaspect.cpp ../../../auto/render/commons/testaspect.h -) - -qt_extend_target(tst_bench_materialparametergathering CONDITION NOT INTEGRITY - SOURCES - ../../../../src/plugins/renderers/opengl/debug/imguirenderer.cpp ../../../../src/plugins/renderers/opengl/debug/imguirenderer_p.h - INCLUDE_DIRECTORIES - ../../../../src/plugins/renderers/opengl/debug -) +include(${PROJECT_SOURCE_DIR}/tests/auto/render/commons/commons.cmake) +qt3d_setup_common_render_test(tst_bench_materialparametergathering USE_TEST_ASPECT) +include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) +qt3d_setup_opengl_renderer_target(tst_bench_materialparametergathering) qt_extend_target(tst_bench_materialparametergathering CONDITION gcov COMPILE_OPTIONS diff --git a/tests/benchmarks/render/opengl/shaderparameterpack/CMakeLists.txt b/tests/benchmarks/render/opengl/shaderparameterpack/CMakeLists.txt index c1d144271..74b31539d 100644 --- a/tests/benchmarks/render/opengl/shaderparameterpack/CMakeLists.txt +++ b/tests/benchmarks/render/opengl/shaderparameterpack/CMakeLists.txt @@ -6,71 +6,7 @@ qt_add_test(tst_bench_shaderparameterpack SOURCES - ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicscontext.cpp ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicscontext_p.h - ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2.cpp ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2_p.h - ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3.cpp ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_p.h - ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1.cpp ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1_p.h - ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_2.cpp ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_2_p.h - ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2.cpp ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2_p.h - ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2.cpp ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2_p.h - ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3.cpp ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3_p.h - ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4.cpp ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4_p.h - ../../../../../src/plugins/renderers/opengl/graphicshelpers/graphicshelperinterface_p.h - ../../../../../src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp ../../../../../src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext_p.h - ../../../../../src/plugins/renderers/opengl/graphicshelpers/qgraphicsutils_p.h - ../../../../../src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp ../../../../../src/plugins/renderers/opengl/graphicshelpers/submissioncontext_p.h - ../../../../../src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext.cpp ../../../../../src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext_p.h - ../../../../../src/plugins/renderers/opengl/io/glbuffer.cpp ../../../../../src/plugins/renderers/opengl/io/glbuffer_p.h - ../../../../../src/plugins/renderers/opengl/jobs/filtercompatibletechniquejob.cpp ../../../../../src/plugins/renderers/opengl/jobs/filtercompatibletechniquejob_p.h - ../../../../../src/plugins/renderers/opengl/jobs/materialparametergathererjob.cpp ../../../../../src/plugins/renderers/opengl/jobs/materialparametergathererjob_p.h - ../../../../../src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob.cpp ../../../../../src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob_p.h - ../../../../../src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob.cpp ../../../../../src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob_p.h - ../../../../../src/plugins/renderers/opengl/jobs/renderviewinitializerjob.cpp ../../../../../src/plugins/renderers/opengl/jobs/renderviewinitializerjob_p.h - ../../../../../src/plugins/renderers/opengl/jobs/renderviewjobutils.cpp ../../../../../src/plugins/renderers/opengl/jobs/renderviewjobutils_p.h - ../../../../../src/plugins/renderers/opengl/managers/gl_handle_types_p.h - ../../../../../src/plugins/renderers/opengl/managers/glresourcemanagers.cpp ../../../../../src/plugins/renderers/opengl/managers/glresourcemanagers_p.h - ../../../../../src/plugins/renderers/opengl/renderer/commandexecuter.cpp ../../../../../src/plugins/renderers/opengl/renderer/commandexecuter_p.h - ../../../../../src/plugins/renderers/opengl/renderer/frameprofiler_p.h - ../../../../../src/plugins/renderers/opengl/renderer/glfence_p.h - ../../../../../src/plugins/renderers/opengl/renderer/gllights.cpp ../../../../../src/plugins/renderers/opengl/renderer/gllights_p.h - ../../../../../src/plugins/renderers/opengl/renderer/glshader.cpp ../../../../../src/plugins/renderers/opengl/renderer/glshader_p.h - ../../../../../src/plugins/renderers/opengl/renderer/logging.cpp ../../../../../src/plugins/renderers/opengl/renderer/logging_p.h - ../../../../../src/plugins/renderers/opengl/renderer/openglvertexarrayobject.cpp ../../../../../src/plugins/renderers/opengl/renderer/openglvertexarrayobject_p.h - ../../../../../src/plugins/renderers/opengl/renderer/rendercommand.cpp ../../../../../src/plugins/renderers/opengl/renderer/rendercommand_p.h - ../../../../../src/plugins/renderers/opengl/renderer/renderer.cpp ../../../../../src/plugins/renderers/opengl/renderer/renderer_p.h - ../../../../../src/plugins/renderers/opengl/renderer/renderercache_p.h - ../../../../../src/plugins/renderers/opengl/renderer/renderqueue.cpp ../../../../../src/plugins/renderers/opengl/renderer/renderqueue_p.h - ../../../../../src/plugins/renderers/opengl/renderer/renderview.cpp ../../../../../src/plugins/renderers/opengl/renderer/renderview_p.h - ../../../../../src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp ../../../../../src/plugins/renderers/opengl/renderer/renderviewbuilder_p.h - ../../../../../src/plugins/renderers/opengl/renderer/shaderparameterpack.cpp ../../../../../src/plugins/renderers/opengl/renderer/shaderparameterpack_p.h - ../../../../../src/plugins/renderers/opengl/renderer/shadervariables_p.h - ../../../../../src/plugins/renderers/opengl/textures/gltexture.cpp ../../../../../src/plugins/renderers/opengl/textures/gltexture_p.h - ../../../../../src/plugins/renderers/opengl/textures/renderbuffer.cpp ../../../../../src/plugins/renderers/opengl/textures/renderbuffer_p.h - ../../../../auto/render/commons/testrenderer.cpp ../../../../auto/render/commons/testrenderer.h tst_bench_shaderparameterpack.cpp - DEFINES - BUILD_QT3D_MODULE - QT_BUILDING_QT - QT_BUILD_INTERNAL - QT_NO_FOREACH QT_NO_FOREACH - INCLUDE_DIRECTORIES - ../../../../../src/plugins/renderers/opengl - ../../../../../src/plugins/renderers/opengl/graphicshelpers - ../../../../../src/plugins/renderers/opengl/io - ../../../../../src/plugins/renderers/opengl/jobs - ../../../../../src/plugins/renderers/opengl/managers - ../../../../../src/plugins/renderers/opengl/renderer - ../../../../../src/plugins/renderers/opengl/textures - ../../../../auto/render/commons - PUBLIC_LIBRARIES - Qt::3DCore - Qt::3DCorePrivate - Qt::3DRender - Qt::3DRenderPrivate - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::OpenGLPrivate ) #### Keys ignored in scope 1:.:.:shaderparameterpack.pro:<TRUE>: @@ -79,7 +15,7 @@ qt_add_test(tst_bench_shaderparameterpack ## Scopes: ##################################################################### -include(../../commons/commons.cmake) +include(${PROJECT_SOURCE_DIR}/tests/auto/render/commons/commons.cmake) qt3d_setup_common_render_test(tst_bench_shaderparameterpack USE_TEST_ASPECT) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_bench_shaderparameterpack) |