From d7ae33e913f04471d24f01baacb13b04e7eeb4f0 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Wed, 31 Oct 2012 09:30:37 +0100 Subject: Updated debian package to use debhelper instead of cdbs. --- debian/rules | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 7e8093d..1ba4415 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,12 @@ #!/usr/bin/make -f # -*- makefile -*- -DEB_CMAKE_EXTRA_FLAGS = -DCMAKE_PREFIX_PATH=/opt/qt5/lib/cmake -DEB_DH_MAKESHLIBS_ARGS_qmenumodel-qml = -Xlibqmenumodel-qml.so +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/utils.mk -include /usr/share/cdbs/1/class/cmake.mk +override_dh_auto_configure: + PATH=/opt/qt5/bin:${PATH} dh_auto_configure + +%: + dh $@ --parallel -- cgit v1.2.3 From bed4cab5b4b9e1c49968f88ca0f02252ee44c1ec Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Wed, 31 Oct 2012 10:23:54 +0100 Subject: Updated rules to avoid warnings during the package build. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 1ba4415..2364c9f 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,9 @@ override_dh_auto_configure: PATH=/opt/qt5/bin:${PATH} dh_auto_configure +override_dh_makeshlibs: + dh_makeshlibs -Xlibqmenumodel-qml.so + %: dh $@ --parallel -- cgit v1.2.3 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 ++++++++++ debian/control | 1 + debian/rules | 2 +- tests/client/CMakeLists.txt | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) (limited to 'debian/rules') 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() diff --git a/debian/control b/debian/control index 2a2e8d9..e4e9d1c 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 9.0.0), dbus-test-runner, libgles2-mesa-dev, libgl-dev, + xvfb, Standards-Version: 3.9.3 Package: libqmenumodel0 diff --git a/debian/rules b/debian/rules index 2364c9f..366a447 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 + PATH=/opt/qt5/bin:${PATH} dh_auto_configure -- -DUSE_XVFB=On override_dh_makeshlibs: dh_makeshlibs -Xlibqmenumodel-qml.so diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt index 9bce370..9209cc8 100644 --- a/tests/client/CMakeLists.txt +++ b/tests/client/CMakeLists.txt @@ -9,6 +9,7 @@ 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 -- 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 ---------- debian/rules | 2 +- tests/client/CMakeLists.txt | 3 +-- 3 files changed, 2 insertions(+), 13 deletions(-) (limited to 'debian/rules') 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