From 84325968c39d35b1c3833394fef390c0bf58ca67 Mon Sep 17 00:00:00 2001
From: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
Date: Thu, 1 Nov 2012 16:02:37 +0100
Subject: Uses "QT_QPA_PLATFORM=minimal" to run qt tests.

---
 CMakeLists.txt              | 10 ----------
 debian/rules                |  2 +-
 tests/client/CMakeLists.txt |  3 +--
 3 files changed, 2 insertions(+), 13 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/debian/rules b/debian/rules
index 366a447..2364c9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 override_dh_auto_configure:
-	PATH=/opt/qt5/bin:${PATH} dh_auto_configure -- -DUSE_XVFB=On
+	PATH=/opt/qt5/bin:${PATH} dh_auto_configure
 
 override_dh_makeshlibs:
 	dh_makeshlibs -Xlibqmenumodel-qml.so
diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index 9209cc8..725289e 100644
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -9,14 +9,13 @@ 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
              --ignore-return)
     set_tests_properties(${testname} PROPERTIES
                          TIMEOUT ${CTEST_TESTING_TIMEOUT}
-                         ENVIRONMENT "PYTHONPATH=${TEST_PYTHONPATH}")
+                         ENVIRONMENT "PYTHONPATH=${TEST_PYTHONPATH};QT_QPA_PLATFORM=minimal")
 
 endmacro(declare_test testname)
 
-- 
cgit v1.2.3