diff options
| author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-10-31 13:48:39 +0100 |
|---|---|---|
| committer | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-10-31 13:48:39 +0100 |
| commit | 7f4ba1a247c5032fd200ca9aad0d939ce6c0e9a5 (patch) | |
| tree | 81b49cb45ab5d06d69898941907fb2ea8a6a23f1 | |
| parent | b4e04e384a61d508eb6209c8b3de7e778956ffad (diff) | |
| download | qmenumodel-7f4ba1a247c5032fd200ca9aad0d939ce6c0e9a5.tar.gz qmenumodel-7f4ba1a247c5032fd200ca9aad0d939ce6c0e9a5.tar.bz2 qmenumodel-7f4ba1a247c5032fd200ca9aad0d939ce6c0e9a5.zip | |
Reverted use of xvfb for tests. (Does not work with opengl)
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | tests/client/CMakeLists.txt | 1 |
2 files changed, 0 insertions, 11 deletions
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() diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt index 9209cc8..9bce370 100644 --- a/tests/client/CMakeLists.txt +++ b/tests/client/CMakeLists.txt @@ -9,7 +9,6 @@ macro(declare_test testname) )
add_test(${testname}
- ${XVFB_EXEC}
${DBUS_RUNNER}
--task ${CMAKE_CURRENT_BINARY_DIR}/${testname} --task-name Client
--task ${CMAKE_CURRENT_SOURCE_DIR}/script_${testname}.py --task-name Server
|