From 49797fd4b489c31989d1e8a24e2b3bfa90b45825 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Wed, 31 Oct 2012 13:09:44 +0100 Subject: Added xvfb option on cmake to enable run tests without X running. --- CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 261335a..d22194c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,6 +32,16 @@ endif() add_subdirectory(libqmenumodel) # Tests Tools +set(XVFB_EXEC "") +option(USE_XVFB "Uses xvfb-run with the unit tests to avoid QtWidgets tests fails without X." FALSE) +if(USE_XVFB) + find_program(XVFB_RUN NAMES xvfb-run) + if (NOT ${XVFB_RUN} MATCHES "XVFB_RUN-NOTFOUND") + set(XVFB_EXEC ${XVFB_RUN} -a) + message(STATUS "Using xvfb-run to perform QtWidget tests.") + endif() +endif() + if(NOT DBUS_RUNNER) message(STATUS "dbus-test-runner not found tests disabled.") else() -- cgit v1.2.3 From 7f4ba1a247c5032fd200ca9aad0d939ce6c0e9a5 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Wed, 31 Oct 2012 13:48:39 +0100 Subject: Reverted use of xvfb for tests. (Does not work with opengl) --- CMakeLists.txt | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index d22194c..261335a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,16 +32,6 @@ endif() add_subdirectory(libqmenumodel) # Tests Tools -set(XVFB_EXEC "") -option(USE_XVFB "Uses xvfb-run with the unit tests to avoid QtWidgets tests fails without X." FALSE) -if(USE_XVFB) - find_program(XVFB_RUN NAMES xvfb-run) - if (NOT ${XVFB_RUN} MATCHES "XVFB_RUN-NOTFOUND") - set(XVFB_EXEC ${XVFB_RUN} -a) - message(STATUS "Using xvfb-run to perform QtWidget tests.") - endif() -endif() - if(NOT DBUS_RUNNER) message(STATUS "dbus-test-runner not found tests disabled.") else() -- cgit v1.2.3 From 4aee0f151e49148a6a51e996f42ec748ab58bbdb Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Wed, 31 Oct 2012 15:32:38 +0100 Subject: Revert last commit. --- CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 261335a..d22194c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,6 +32,16 @@ endif() add_subdirectory(libqmenumodel) # Tests Tools +set(XVFB_EXEC "") +option(USE_XVFB "Uses xvfb-run with the unit tests to avoid QtWidgets tests fails without X." FALSE) +if(USE_XVFB) + find_program(XVFB_RUN NAMES xvfb-run) + if (NOT ${XVFB_RUN} MATCHES "XVFB_RUN-NOTFOUND") + set(XVFB_EXEC ${XVFB_RUN} -a) + message(STATUS "Using xvfb-run to perform QtWidget tests.") + endif() +endif() + if(NOT DBUS_RUNNER) message(STATUS "dbus-test-runner not found tests disabled.") else() -- cgit v1.2.3 From 84325968c39d35b1c3833394fef390c0bf58ca67 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Thu, 1 Nov 2012 16:02:37 +0100 Subject: Uses "QT_QPA_PLATFORM=minimal" to run qt tests. --- CMakeLists.txt | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index d22194c..261335a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,16 +32,6 @@ endif() add_subdirectory(libqmenumodel) # Tests Tools -set(XVFB_EXEC "") -option(USE_XVFB "Uses xvfb-run with the unit tests to avoid QtWidgets tests fails without X." FALSE) -if(USE_XVFB) - find_program(XVFB_RUN NAMES xvfb-run) - if (NOT ${XVFB_RUN} MATCHES "XVFB_RUN-NOTFOUND") - set(XVFB_EXEC ${XVFB_RUN} -a) - message(STATUS "Using xvfb-run to perform QtWidget tests.") - endif() -endif() - if(NOT DBUS_RUNNER) message(STATUS "dbus-test-runner not found tests disabled.") else() -- cgit v1.2.3 From dd3e64c85d197858f5fb8838668386d623d25ef6 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Tue, 6 Nov 2012 11:21:48 -0300 Subject: Skip tests on qemu to avoid crashes. --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 261335a..eca9ed0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,8 +35,12 @@ add_subdirectory(libqmenumodel) if(NOT DBUS_RUNNER) message(STATUS "dbus-test-runner not found tests disabled.") else() - enable_testing() - add_subdirectory(tests) + if(CMAKE_SYSTEM_PROCESSOR EQUAL "armv7l") + message(STATUS "Current version of qemu crashes during the tests. We will skip it for now.") + else() + enable_testing() + add_subdirectory(tests) + endif() endif() # Doc -- cgit v1.2.3 From 21a895254bc08f111b5173f8b6b85f8271935020 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Tue, 6 Nov 2012 12:57:58 -0300 Subject: Fixed string comparation on cmake files. --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index eca9ed0..3cd501b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,9 +35,10 @@ add_subdirectory(libqmenumodel) if(NOT DBUS_RUNNER) message(STATUS "dbus-test-runner not found tests disabled.") else() - if(CMAKE_SYSTEM_PROCESSOR EQUAL "armv7l") + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l") message(STATUS "Current version of qemu crashes during the tests. We will skip it for now.") else() + message(STATUS "Enable tests for: ${CMAKE_SYSTEM_PROCESSOR}") enable_testing() add_subdirectory(tests) endif() -- cgit v1.2.3