qmltests: working but by calling qmltestrunner explicitly
This commit is contained in:
@@ -42,11 +42,33 @@ if (NOT NO_TESTS)
|
|||||||
message(STATUS "Testing enabled; add dir tests")
|
message(STATUS "Testing enabled; add dir tests")
|
||||||
include(CTest)
|
include(CTest)
|
||||||
enable_testing()
|
enable_testing()
|
||||||
|
set(BUILD_TESTING ON)
|
||||||
add_subdirectory(tests)
|
add_subdirectory(tests)
|
||||||
else()
|
else()
|
||||||
message(STATUS "Tests disabled")
|
message(STATUS "Tests disabled")
|
||||||
endif()
|
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)
|
set(SRC_LIST main.cpp)
|
||||||
|
|
||||||
# add an executable based on the project name and source list
|
# add an executable based on the project name and source list
|
||||||
|
|||||||
@@ -2,5 +2,9 @@ cmake_minimum_required(VERSION 3.0)
|
|||||||
|
|
||||||
include(QmlTest)
|
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}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import QtQuick 2.3
|
|||||||
import QtTest 1.0
|
import QtTest 1.0
|
||||||
|
|
||||||
TestCase {
|
TestCase {
|
||||||
name: "MathTests Test"
|
name: "MathTests Test2"
|
||||||
|
|
||||||
function test_math() {
|
function test_math() {
|
||||||
compare(2 + 2, 4, "2 + 2 = 4")
|
compare(2 + 2, 4, "2 + 2 = 4")
|
||||||
Reference in New Issue
Block a user