From 62d42724ae6e568882e56110201adc068165e018 Mon Sep 17 00:00:00 2001
From: Tal Lancaster <tal.lancaster+gh@gmail.com>
Date: Tue, 17 Jan 2017 18:53:43 -0700
Subject: [PATCH] qmltests: working but by calling qmltestrunner explicitly

---
 CMakeLists.txt                                | 22 +++++++++++++++++++
 tests/qmltests/CMakeLists.txt                 |  6 ++++-
 .../qmltests/{test_math.qml => tst_math.qml}  |  2 +-
 3 files changed, 28 insertions(+), 2 deletions(-)
 rename tests/qmltests/{test_math.qml => tst_math.qml} (87%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f55322..af2d6fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,11 +42,33 @@ if (NOT NO_TESTS)
     message(STATUS "Testing enabled; add dir tests")
     include(CTest)
     enable_testing()
+    set(BUILD_TESTING ON)
     add_subdirectory(tests)
 else()
     message(STATUS "Tests disabled")
 endif()
 
+##
+### config for getting/building gtest
+# Download and unpack googletest at configure time
+configure_file(CMakeLists.txt.in
+googletest-download/CMakeLists.txt)
+execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
+WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download )
+execute_process(COMMAND ${CMAKE_COMMAND} --build .
+WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download )
+
+# Prevent GoogleTest from overriding our compiler/linker options
+# when building with Visual Studio
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+
+# Add googletest directly to our build. This adds
+# the following targets: gtest, gtest_main, gmock
+# and gmock_main
+add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src
+${CMAKE_BINARY_DIR}/googletest-build)
+
+
 set(SRC_LIST main.cpp)
 
 # add an executable based on the project name and source list
diff --git a/tests/qmltests/CMakeLists.txt b/tests/qmltests/CMakeLists.txt
index 7ef781e..9ad9c3c 100644
--- a/tests/qmltests/CMakeLists.txt
+++ b/tests/qmltests/CMakeLists.txt
@@ -2,5 +2,9 @@ cmake_minimum_required(VERSION 3.0)
 
 include(QmlTest)
 
-add_qml_test(. QmlTestTest)
+#add_qml_test(. QmlTestTest)
+add_test (NAME qmltestrunner
+          COMMAND qmltestrunner -import ${CMAKE_BINARY_DIR} -input ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 
diff --git a/tests/qmltests/test_math.qml b/tests/qmltests/tst_math.qml
similarity index 87%
rename from tests/qmltests/test_math.qml
rename to tests/qmltests/tst_math.qml
index 8936d3b..4058e45 100644
--- a/tests/qmltests/test_math.qml
+++ b/tests/qmltests/tst_math.qml
@@ -2,7 +2,7 @@ import QtQuick 2.3
 import QtTest 1.0
 
 TestCase {
-    name: "MathTests Test"
+    name: "MathTests Test2"
 
     function test_math() {
         compare(2 + 2, 4, "2 + 2 = 4")