summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilian Wolff <milian.wolff@kdab.com>2014-07-02 16:03:37 +0200
committerMilian Wolff <milian.wolff@kdab.com>2014-07-03 13:44:42 +0200
commit5418f5795e2fd657efa3ceede749228c1e10d25c (patch)
tree0d3109f25ab416befbaa44ba26f1380d64b30db6
parent3c1884f15ed1120bf36efb918cad0bcb461d5193 (diff)
downloadqtwebchannel-5418f5795e2fd657efa3ceede749228c1e10d25c.tar.gz
Add cmake test, adapt test directory layout and point to dev branches.
The auto tests are now located in tests/auto instead of directly in tests/. This is required to ensure the cmake test is found. Furthermore, the sync.profile is updated to point to refs/heads/dev, as we target Qt 5.4 with this new module. Change-Id: I1e6e99968b7081b5774eaf30319cac1fbaed35c2 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
-rw-r--r--sync.profile6
-rw-r--r--tests/auto/auto.pro7
-rw-r--r--tests/auto/cmake/CMakeLists.txt14
-rw-r--r--tests/auto/cmake/cmake.pro7
-rw-r--r--tests/auto/qml/TestWebView.qml (renamed from tests/qml/TestWebView.qml)0
-rw-r--r--tests/auto/qml/WebChannelTest.qml (renamed from tests/qml/WebChannelTest.qml)0
-rw-r--r--tests/auto/qml/data/bench_init.html (renamed from tests/qml/data/bench_init.html)0
-rw-r--r--tests/auto/qml/data/disconnect.html (renamed from tests/qml/data/disconnect.html)0
-rw-r--r--tests/auto/qml/data/grouping.html (renamed from tests/qml/data/grouping.html)0
-rw-r--r--tests/auto/qml/data/method.html (renamed from tests/qml/data/method.html)0
-rw-r--r--tests/auto/qml/data/multiclient.html (renamed from tests/qml/data/multiclient.html)0
-rw-r--r--tests/auto/qml/data/property.html (renamed from tests/qml/data/property.html)0
-rw-r--r--tests/auto/qml/data/receiveRaw.html (renamed from tests/qml/data/receiveRaw.html)0
-rw-r--r--tests/auto/qml/data/send.html (renamed from tests/qml/data/send.html)0
-rw-r--r--tests/auto/qml/data/signal.html (renamed from tests/qml/data/signal.html)0
-rw-r--r--tests/auto/qml/data/testsetup.js (renamed from tests/qml/data/testsetup.js)0
-rw-r--r--tests/auto/qml/data/wrapper.html (renamed from tests/qml/data/wrapper.html)0
-rw-r--r--tests/auto/qml/qml.cpp (renamed from tests/qml/qml.cpp)0
-rw-r--r--tests/auto/qml/qml.pro (renamed from tests/qml/qml.pro)2
-rw-r--r--tests/auto/qml/tst_bench.qml (renamed from tests/qml/tst_bench.qml)0
-rw-r--r--tests/auto/qml/tst_metaobjectpublisher.qml (renamed from tests/qml/tst_metaobjectpublisher.qml)0
-rw-r--r--tests/auto/qml/tst_multiclient.qml (renamed from tests/qml/tst_multiclient.qml)0
-rw-r--r--tests/auto/qml/tst_webchannel.qml (renamed from tests/qml/tst_webchannel.qml)0
-rw-r--r--tests/auto/webchannel/tst_webchannel.cpp (renamed from tests/webchannel/tst_webchannel.cpp)0
-rw-r--r--tests/auto/webchannel/tst_webchannel.h (renamed from tests/webchannel/tst_webchannel.h)0
-rw-r--r--tests/auto/webchannel/webchannel.pro (renamed from tests/webchannel/webchannel.pro)4
-rw-r--r--tests/tests.pro6
27 files changed, 35 insertions, 11 deletions
diff --git a/sync.profile b/sync.profile
index da8a563..5d7cd6b 100644
--- a/sync.profile
+++ b/sync.profile
@@ -11,10 +11,10 @@
# - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch)
#
%dependencies = (
- "qtbase" => "stable",
- "qtwebsockets" => "dev",
+ "qtbase" => "refs/heads/dev",
+ "qtwebsockets" => "refs/heads/dev",
# optional dependencies:
- "qtdeclarative" => "stable",
+ "qtdeclarative" => "refs/heads/dev",
# TODO: disabled for now as it breaks CI builds on OSX
# requires changes to qtqa scripts as discussed with sifalt, sahumada, tronical
# "qtwebkit" => "",
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
new file mode 100644
index 0000000..4c998e9
--- /dev/null
+++ b/tests/auto/auto.pro
@@ -0,0 +1,7 @@
+TEMPLATE = subdirs
+
+SUBDIRS += cmake webchannel
+
+qtHaveModule(webkit):qtHaveModule(quick) {
+ SUBDIRS += qml
+}
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
new file mode 100644
index 0000000..1d588ac
--- /dev/null
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -0,0 +1,14 @@
+
+cmake_minimum_required(VERSION 2.8)
+
+project(qmake_cmake_files)
+
+enable_testing()
+
+find_package(Qt5Core REQUIRED)
+
+include("${_Qt5CTestMacros}")
+
+test_module_includes(
+ WebChannel QWebChannel
+)
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
new file mode 100644
index 0000000..54d329c
--- /dev/null
+++ b/tests/auto/cmake/cmake.pro
@@ -0,0 +1,7 @@
+
+# Cause make to do nothing.
+TEMPLATE = subdirs
+
+CMAKE_QT_MODULES_UNDER_TEST = webchannel
+
+CONFIG += ctest_testcase
diff --git a/tests/qml/TestWebView.qml b/tests/auto/qml/TestWebView.qml
index 3b12f38..3b12f38 100644
--- a/tests/qml/TestWebView.qml
+++ b/tests/auto/qml/TestWebView.qml
diff --git a/tests/qml/WebChannelTest.qml b/tests/auto/qml/WebChannelTest.qml
index 9a0baa9..9a0baa9 100644
--- a/tests/qml/WebChannelTest.qml
+++ b/tests/auto/qml/WebChannelTest.qml
diff --git a/tests/qml/data/bench_init.html b/tests/auto/qml/data/bench_init.html
index 7d3af5b..7d3af5b 100644
--- a/tests/qml/data/bench_init.html
+++ b/tests/auto/qml/data/bench_init.html
diff --git a/tests/qml/data/disconnect.html b/tests/auto/qml/data/disconnect.html
index a9a479c..a9a479c 100644
--- a/tests/qml/data/disconnect.html
+++ b/tests/auto/qml/data/disconnect.html
diff --git a/tests/qml/data/grouping.html b/tests/auto/qml/data/grouping.html
index f2d7aec..f2d7aec 100644
--- a/tests/qml/data/grouping.html
+++ b/tests/auto/qml/data/grouping.html
diff --git a/tests/qml/data/method.html b/tests/auto/qml/data/method.html
index 6dbaa90..6dbaa90 100644
--- a/tests/qml/data/method.html
+++ b/tests/auto/qml/data/method.html
diff --git a/tests/qml/data/multiclient.html b/tests/auto/qml/data/multiclient.html
index 1573a1a..1573a1a 100644
--- a/tests/qml/data/multiclient.html
+++ b/tests/auto/qml/data/multiclient.html
diff --git a/tests/qml/data/property.html b/tests/auto/qml/data/property.html
index 9565aaa..9565aaa 100644
--- a/tests/qml/data/property.html
+++ b/tests/auto/qml/data/property.html
diff --git a/tests/qml/data/receiveRaw.html b/tests/auto/qml/data/receiveRaw.html
index 139b2b1..139b2b1 100644
--- a/tests/qml/data/receiveRaw.html
+++ b/tests/auto/qml/data/receiveRaw.html
diff --git a/tests/qml/data/send.html b/tests/auto/qml/data/send.html
index c60fbf4..c60fbf4 100644
--- a/tests/qml/data/send.html
+++ b/tests/auto/qml/data/send.html
diff --git a/tests/qml/data/signal.html b/tests/auto/qml/data/signal.html
index bdce0c7..bdce0c7 100644
--- a/tests/qml/data/signal.html
+++ b/tests/auto/qml/data/signal.html
diff --git a/tests/qml/data/testsetup.js b/tests/auto/qml/data/testsetup.js
index c0db83a..c0db83a 100644
--- a/tests/qml/data/testsetup.js
+++ b/tests/auto/qml/data/testsetup.js
diff --git a/tests/qml/data/wrapper.html b/tests/auto/qml/data/wrapper.html
index a556486..a556486 100644
--- a/tests/qml/data/wrapper.html
+++ b/tests/auto/qml/data/wrapper.html
diff --git a/tests/qml/qml.cpp b/tests/auto/qml/qml.cpp
index 7267842..7267842 100644
--- a/tests/qml/qml.cpp
+++ b/tests/auto/qml/qml.cpp
diff --git a/tests/qml/qml.pro b/tests/auto/qml/qml.pro
index 4a68cd1..f86dc90 100644
--- a/tests/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -5,7 +5,7 @@ TARGET = qml
CONFIG += warn_on qmltestcase
# TODO: running tests without requiring make install
-IMPORTPATH += $$OUT_PWD/../../qml $$PWD
+IMPORTPATH += $$OUT_PWD/../../../qml $$PWD
SOURCES += \
qml.cpp
diff --git a/tests/qml/tst_bench.qml b/tests/auto/qml/tst_bench.qml
index 056dda9..056dda9 100644
--- a/tests/qml/tst_bench.qml
+++ b/tests/auto/qml/tst_bench.qml
diff --git a/tests/qml/tst_metaobjectpublisher.qml b/tests/auto/qml/tst_metaobjectpublisher.qml
index e07f105..e07f105 100644
--- a/tests/qml/tst_metaobjectpublisher.qml
+++ b/tests/auto/qml/tst_metaobjectpublisher.qml
diff --git a/tests/qml/tst_multiclient.qml b/tests/auto/qml/tst_multiclient.qml
index 519a63c..519a63c 100644
--- a/tests/qml/tst_multiclient.qml
+++ b/tests/auto/qml/tst_multiclient.qml
diff --git a/tests/qml/tst_webchannel.qml b/tests/auto/qml/tst_webchannel.qml
index dddba71..dddba71 100644
--- a/tests/qml/tst_webchannel.qml
+++ b/tests/auto/qml/tst_webchannel.qml
diff --git a/tests/webchannel/tst_webchannel.cpp b/tests/auto/webchannel/tst_webchannel.cpp
index ece02a8..ece02a8 100644
--- a/tests/webchannel/tst_webchannel.cpp
+++ b/tests/auto/webchannel/tst_webchannel.cpp
diff --git a/tests/webchannel/tst_webchannel.h b/tests/auto/webchannel/tst_webchannel.h
index 314fe99..314fe99 100644
--- a/tests/webchannel/tst_webchannel.h
+++ b/tests/auto/webchannel/tst_webchannel.h
diff --git a/tests/webchannel/webchannel.pro b/tests/auto/webchannel/webchannel.pro
index 082725f..71036dd 100644
--- a/tests/webchannel/webchannel.pro
+++ b/tests/auto/webchannel/webchannel.pro
@@ -2,8 +2,8 @@ QT = core webchannel-private testlib
CONFIG += testcase strict_flags warn_on
-INCLUDEPATH += ../../src/webchannel
-VPATH += ../../src/webchannel
+INCLUDEPATH += ../../../src/webchannel
+VPATH += ../../../src/webchannel
TARGET = tst_webchannel
diff --git a/tests/tests.pro b/tests/tests.pro
index 685188a..f927700 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,7 +1,3 @@
TEMPLATE = subdirs
-SUBDIRS += webchannel
-
-qtHaveModule(webkit):qtHaveModule(quick) {
- SUBDIRS += qml
-}
+SUBDIRS += auto