summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Nichols <andy.nichols@theqtcompany.com>2015-10-13 10:39:55 +0200
committerAndy Nichols <andy.nichols@theqtcompany.com>2015-10-13 11:44:15 +0300
commit4bce183390c6a4633dd46d0b0cd4c1c24877fe87 (patch)
tree1bfa14d7712ad6ca3ec534868731744d063b9209
parentd7de74d6e608fbbd36fc9abad27fa82d095cb692 (diff)
Add tests directory to enable coin integration
There are no actual tests yet though, but now we don't fail the build in coin because there is no tests folder. Change-Id: I7843fb78d1bd0986db69f2706d8738061762e6cb Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
-rw-r--r--tests/auto/auto.pro4
-rw-r--r--tests/auto/cmake/CMakeLists.txt7
-rw-r--r--tests/auto/cmake/cmake.pro6
-rw-r--r--tests/tests.pro3
4 files changed, 20 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
new file mode 100644
index 0000000000..330bccf166
--- /dev/null
+++ b/tests/auto/auto.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+ cmake \
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
new file mode 100644
index 0000000000..cac7528503
--- /dev/null
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(qmake_cmake_files)
+
+enable_testing()
+
+add_test(dummy ${CMAKE_COMMAND} -E echo)
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
new file mode 100644
index 0000000000..baaef7de30
--- /dev/null
+++ b/tests/auto/cmake/cmake.pro
@@ -0,0 +1,6 @@
+# Cause make to do nothing.
+TEMPLATE = subdirs
+
+CMAKE_QT_MODULES_UNDER_TEST = scenegraph-raster
+
+CONFIG += ctest_testcase
diff --git a/tests/tests.pro b/tests/tests.pro
new file mode 100644
index 0000000000..15dd97bdd6
--- /dev/null
+++ b/tests/tests.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+CONFIG += no_docs_target
+SUBDIRS = auto