summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Di Sera <luca.disera@qt.io>2023-04-21 10:43:32 +0200
committerLuca Di Sera <luca.disera@qt.io>2023-04-24 09:53:01 +0000
commit557d2344dd25010214ea67d9f8936cae1d4e3a16 (patch)
tree12ef461516b541dccc4bef391193ab985d2185a2
parent247f236440d0aa7e81a90150d9b8867e0de0a539 (diff)
Rename test targets
The qtgraphs and qtdatavis3d modules currently expose the same exact test code. When both are available, as it is by default, currently, when passing by `init-repository`, they will define the same test targets, which will prevent the correct setup of a superbuild at configuration time. To avoid the name collision with qtgraphs, rename all test targets by appending a "_datavis" suffix. Change-Id: Ibe4a4393737efad3cbefe39305452ba5a70ad9de Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--tests/auto/cpptest/q3daxis-category/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3daxis-logvalue/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3daxis-value/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dbars-modelproxy/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dbars-proxy/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dbars-series/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dbars/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dcustom-label/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dcustom-volume/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dcustom/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dinput-touch/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dinput/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dscatter-modelproxy/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dscatter-proxy/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dscatter-series/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dscatter/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dscene-camera/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dscene-light/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dscene/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dsurface-heightproxy/CMakeLists.txt4
-rw-r--r--tests/auto/cpptest/q3dsurface-modelproxy-nan/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dsurface-modelproxy/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dsurface-proxy/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dsurface-series/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dsurface/CMakeLists.txt2
-rw-r--r--tests/auto/cpptest/q3dtheme/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/CMakeLists.txt4
27 files changed, 29 insertions, 29 deletions
diff --git a/tests/auto/cpptest/q3daxis-category/CMakeLists.txt b/tests/auto/cpptest/q3daxis-category/CMakeLists.txt
index a8e3fb98..f148b184 100644
--- a/tests/auto/cpptest/q3daxis-category/CMakeLists.txt
+++ b/tests/auto/cpptest/q3daxis-category/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3daxis-category
+qt_internal_add_test(q3daxis-category_datavis
SOURCES
tst_axis.cpp
LIBRARIES
diff --git a/tests/auto/cpptest/q3daxis-logvalue/CMakeLists.txt b/tests/auto/cpptest/q3daxis-logvalue/CMakeLists.txt
index 46cb5048..0bba27a9 100644
--- a/tests/auto/cpptest/q3daxis-logvalue/CMakeLists.txt
+++ b/tests/auto/cpptest/q3daxis-logvalue/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3daxis-logvalue
+qt_internal_add_test(q3daxis-logvalue_datavis
SOURCES
tst_axis.cpp
LIBRARIES
diff --git a/tests/auto/cpptest/q3daxis-value/CMakeLists.txt b/tests/auto/cpptest/q3daxis-value/CMakeLists.txt
index b105991e..5c412106 100644
--- a/tests/auto/cpptest/q3daxis-value/CMakeLists.txt
+++ b/tests/auto/cpptest/q3daxis-value/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3daxis-value
+qt_internal_add_test(q3daxis-value_datavis
SOURCES
tst_axis.cpp
LIBRARIES
diff --git a/tests/auto/cpptest/q3dbars-modelproxy/CMakeLists.txt b/tests/auto/cpptest/q3dbars-modelproxy/CMakeLists.txt
index 63d4ba0b..f9b05902 100644
--- a/tests/auto/cpptest/q3dbars-modelproxy/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dbars-modelproxy/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dbars-modelproxy
+qt_internal_add_test(q3dbars-modelproxy_datavis
SOURCES
tst_proxy.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/cpptest/q3dbars-proxy/CMakeLists.txt b/tests/auto/cpptest/q3dbars-proxy/CMakeLists.txt
index f92844fe..23c6997d 100644
--- a/tests/auto/cpptest/q3dbars-proxy/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dbars-proxy/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dbars-proxy
+qt_internal_add_test(q3dbars-proxy_datavis
SOURCES
tst_proxy.cpp
LIBRARIES
diff --git a/tests/auto/cpptest/q3dbars-series/CMakeLists.txt b/tests/auto/cpptest/q3dbars-series/CMakeLists.txt
index 75c4d5b1..f160c81c 100644
--- a/tests/auto/cpptest/q3dbars-series/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dbars-series/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dbars-series
+qt_internal_add_test(q3dbars-series_datavis
SOURCES
tst_series.cpp
LIBRARIES
diff --git a/tests/auto/cpptest/q3dbars/CMakeLists.txt b/tests/auto/cpptest/q3dbars/CMakeLists.txt
index 804de8cc..c2f05908 100644
--- a/tests/auto/cpptest/q3dbars/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dbars/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dbars
+qt_internal_add_test(q3dbars_datavis
SOURCES
tst_bars.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/cpptest/q3dcustom-label/CMakeLists.txt b/tests/auto/cpptest/q3dcustom-label/CMakeLists.txt
index 5927b21c..3baea7fa 100644
--- a/tests/auto/cpptest/q3dcustom-label/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dcustom-label/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dcustom-label
+qt_internal_add_test(q3dcustom-label_datavis
SOURCES
tst_custom.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/cpptest/q3dcustom-volume/CMakeLists.txt b/tests/auto/cpptest/q3dcustom-volume/CMakeLists.txt
index 5efa94b7..858f2dfc 100644
--- a/tests/auto/cpptest/q3dcustom-volume/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dcustom-volume/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dcustom-volume
+qt_internal_add_test(q3dcustom-volume_datavis
SOURCES
tst_custom.cpp
LIBRARIES
diff --git a/tests/auto/cpptest/q3dcustom/CMakeLists.txt b/tests/auto/cpptest/q3dcustom/CMakeLists.txt
index 260cea9d..4126a884 100644
--- a/tests/auto/cpptest/q3dcustom/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dcustom/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dcustom
+qt_internal_add_test(q3dcustom_datavis
SOURCES
tst_custom.cpp
LIBRARIES
diff --git a/tests/auto/cpptest/q3dinput-touch/CMakeLists.txt b/tests/auto/cpptest/q3dinput-touch/CMakeLists.txt
index 2704803c..7550bf2b 100644
--- a/tests/auto/cpptest/q3dinput-touch/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dinput-touch/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dinput-touch
+qt_internal_add_test(q3dinput-touch_datavis
SOURCES
tst_input.cpp
LIBRARIES
diff --git a/tests/auto/cpptest/q3dinput/CMakeLists.txt b/tests/auto/cpptest/q3dinput/CMakeLists.txt
index 0f1ffd1b..ac0fe9a9 100644
--- a/tests/auto/cpptest/q3dinput/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dinput/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dinput
+qt_internal_add_test(q3dinput_datavis
SOURCES
tst_input.cpp
LIBRARIES
diff --git a/tests/auto/cpptest/q3dscatter-modelproxy/CMakeLists.txt b/tests/auto/cpptest/q3dscatter-modelproxy/CMakeLists.txt
index 37b71270..438c05f8 100644
--- a/tests/auto/cpptest/q3dscatter-modelproxy/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dscatter-modelproxy/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dscatter-modelproxy
+qt_internal_add_test(q3dscatter-modelproxy_datavis
SOURCES
tst_proxy.cpp
LIBRARIES
diff --git a/tests/auto/cpptest/q3dscatter-proxy/CMakeLists.txt b/tests/auto/cpptest/q3dscatter-proxy/CMakeLists.txt
index e76a3566..c813e9fb 100644
--- a/tests/auto/cpptest/q3dscatter-proxy/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dscatter-proxy/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dscatter-proxy
+qt_internal_add_test(q3dscatter-proxy_datavis
SOURCES
tst_proxy.cpp
LIBRARIES
diff --git a/tests/auto/cpptest/q3dscatter-series/CMakeLists.txt b/tests/auto/cpptest/q3dscatter-series/CMakeLists.txt
index d15def6e..c2eb2c4a 100644
--- a/tests/auto/cpptest/q3dscatter-series/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dscatter-series/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dscatter-series
+qt_internal_add_test(q3dscatter-series_datavis
SOURCES
tst_series.cpp
LIBRARIES
diff --git a/tests/auto/cpptest/q3dscatter/CMakeLists.txt b/tests/auto/cpptest/q3dscatter/CMakeLists.txt
index 34777ead..176fb66e 100644
--- a/tests/auto/cpptest/q3dscatter/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dscatter/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dscatter
+qt_internal_add_test(q3dscatter_datavis
SOURCES
tst_scatter.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/cpptest/q3dscene-camera/CMakeLists.txt b/tests/auto/cpptest/q3dscene-camera/CMakeLists.txt
index af5feab6..63cd964c 100644
--- a/tests/auto/cpptest/q3dscene-camera/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dscene-camera/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dscene-camera
+qt_internal_add_test(q3dscene-camera_datavis
SOURCES
tst_camera.cpp
LIBRARIES
diff --git a/tests/auto/cpptest/q3dscene-light/CMakeLists.txt b/tests/auto/cpptest/q3dscene-light/CMakeLists.txt
index 9c6ad4ec..fc70b804 100644
--- a/tests/auto/cpptest/q3dscene-light/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dscene-light/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dscene-light
+qt_internal_add_test(q3dscene-light_datavis
SOURCES
tst_light.cpp
LIBRARIES
diff --git a/tests/auto/cpptest/q3dscene/CMakeLists.txt b/tests/auto/cpptest/q3dscene/CMakeLists.txt
index 32b864be..a7c25ff2 100644
--- a/tests/auto/cpptest/q3dscene/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dscene/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dscene
+qt_internal_add_test(q3dscene_datavis
SOURCES
tst_scene.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/cpptest/q3dsurface-heightproxy/CMakeLists.txt b/tests/auto/cpptest/q3dsurface-heightproxy/CMakeLists.txt
index 70c96a5a..b7285b3a 100644
--- a/tests/auto/cpptest/q3dsurface-heightproxy/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dsurface-heightproxy/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dsurface-heightproxy
+qt_internal_add_test(q3dsurface-heightproxy_datavis
SOURCES
tst_proxy.cpp
LIBRARIES
@@ -13,7 +13,7 @@ set(q3dsurface-heightproxy_resource_files
"customtexture.jpg"
)
-qt_internal_add_resource(q3dsurface-heightproxy "q3dsurface-heightproxy"
+qt_internal_add_resource(q3dsurface-heightproxy_datavis "q3dsurface-heightproxy"
PREFIX
"/"
FILES
diff --git a/tests/auto/cpptest/q3dsurface-modelproxy-nan/CMakeLists.txt b/tests/auto/cpptest/q3dsurface-modelproxy-nan/CMakeLists.txt
index 85b1b76b..835a3bad 100644
--- a/tests/auto/cpptest/q3dsurface-modelproxy-nan/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dsurface-modelproxy-nan/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dsurface-modelproxy-nan
+qt_internal_add_test(q3dsurface-modelproxy-nan_datavis
SOURCES
tst_proxy.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/cpptest/q3dsurface-modelproxy/CMakeLists.txt b/tests/auto/cpptest/q3dsurface-modelproxy/CMakeLists.txt
index c9636b9e..4b42431a 100644
--- a/tests/auto/cpptest/q3dsurface-modelproxy/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dsurface-modelproxy/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dsurface-modelproxy
+qt_internal_add_test(q3dsurface-modelproxy_datavis
SOURCES
tst_proxy.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/cpptest/q3dsurface-proxy/CMakeLists.txt b/tests/auto/cpptest/q3dsurface-proxy/CMakeLists.txt
index c28fe62b..5553d635 100644
--- a/tests/auto/cpptest/q3dsurface-proxy/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dsurface-proxy/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dsurface-proxy
+qt_internal_add_test(q3dsurface-proxy_datavis
SOURCES
tst_proxy.cpp
LIBRARIES
diff --git a/tests/auto/cpptest/q3dsurface-series/CMakeLists.txt b/tests/auto/cpptest/q3dsurface-series/CMakeLists.txt
index 47336ea7..283829bd 100644
--- a/tests/auto/cpptest/q3dsurface-series/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dsurface-series/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dsurface-series
+qt_internal_add_test(q3dsurface-series_datavis
SOURCES
tst_series.cpp
LIBRARIES
diff --git a/tests/auto/cpptest/q3dsurface/CMakeLists.txt b/tests/auto/cpptest/q3dsurface/CMakeLists.txt
index c62803d3..71f78da8 100644
--- a/tests/auto/cpptest/q3dsurface/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dsurface/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dsurface
+qt_internal_add_test(q3dsurface_datavis
SOURCES
tst_surface.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/cpptest/q3dtheme/CMakeLists.txt b/tests/auto/cpptest/q3dtheme/CMakeLists.txt
index 0b55423d..0b59ed6e 100644
--- a/tests/auto/cpptest/q3dtheme/CMakeLists.txt
+++ b/tests/auto/cpptest/q3dtheme/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_test(q3dtheme
+qt_internal_add_test(q3dtheme_datavis
SOURCES
tst_theme.cpp
LIBRARIES
diff --git a/tests/auto/qmltest/CMakeLists.txt b/tests/auto/qmltest/CMakeLists.txt
index 7c62fa34..3f891438 100644
--- a/tests/auto/qmltest/CMakeLists.txt
+++ b/tests/auto/qmltest/CMakeLists.txt
@@ -6,7 +6,7 @@ file(GLOB_RECURSE test_data_glob
*)
list(APPEND test_data ${test_data_glob})
-qt_internal_add_test(tst_qmltest
+qt_internal_add_test(tst_qmltest_datavis
QMLTEST
SOURCES
tst_qmltest.cpp
@@ -20,7 +20,7 @@ set(qmltest_resource_files
"customtexture.jpg"
)
-qt_internal_add_resource(tst_qmltest "qmltest"
+qt_internal_add_resource(tst_qmltest_datavis "qmltest"
PREFIX
"/"
FILES