Merge lp:~pete-woods/hud/cmake-extras-compatibility into lp:hud

[Pete Woods]

Compatibility with unversioned cmake-extras modules. Remove inactive and broken valgrind / memcheck support.

Compatibility with unversioned cmake-extras modules. Remove inactive and broken valgrind / memcheck support.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-20 13:44:43 +0000
+++ CMakeLists.txt	2016-12-12 13:51:51 +0000
@@ -19,11 +19,10 @@
 include(GNUInstallDirs)
 include(CheckIncludeFile)
 include(CheckFunctionExists)
-include(Coverage)
 include(UseGlibGeneration)
 include(UseGdbusCodegen)
 include(UseConstantBuilder)
-include(UseGSettings)
+find_package(GSettings)
 include(UseVala)
 
 # Workaround for libexecdir on debian
@@ -160,6 +159,66 @@
 		${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure
 	)
 	add_subdirectory(tests)
+
+	find_package(CoverageReport)
+	enable_coverage_report(
+		TARGETS
+			hud-generated
+			hud
+			hud-cli
+			hud-cli-appstack
+			hud-cli-param
+			hud-cli-toolbar
+			hud-client-generated
+			hud-client
+			hud-common
+			hud-gtk
+			hud-service
+			hud-service-exec
+			qtgmenu
+			window-stack-bridge
+			window-stack-bridge-bin
+			dbusmenu-json-loader
+			hud-test-interface
+			qtgmenu-test-app
+			test-integration-tests
+			test-libhud-application
+			test-libhud-client-unit-tests
+			test-libhud-unit-tests
+			test-menu-input-model-deep
+			test-menu-input-model-shortcuts
+			test-menu-input-model-simple
+			test-menu-input-model-toolbar-all
+			test-menu-input-model-toolbar-dynamic
+			test-menu-input-model-toolbar-undo
+			test-menu-input-model-toolbar-unknown
+			test-qtgmenu-unit-tests
+			test-service-unit-tests
+			test-utils
+			test-window-stack-bridge-unit-tests
+		FILTER
+			${CMAKE_SOURCE_DIR}/tests/*
+			${CMAKE_BINARY_DIR}/*
+		TESTS
+			dbusmenu-json-loader
+			hud-test-interface
+			qtgmenu-test-app
+			test-integration-tests
+			test-libhud-application
+			test-libhud-client-unit-tests
+			test-libhud-unit-tests
+			test-menu-input-model-deep
+			test-menu-input-model-shortcuts
+			test-menu-input-model-simple
+			test-menu-input-model-toolbar-all
+			test-menu-input-model-toolbar-dynamic
+			test-menu-input-model-toolbar-undo
+			test-menu-input-model-toolbar-unknown
+			test-qtgmenu-unit-tests
+			test-service-unit-tests
+			test-utils
+			test-window-stack-bridge-unit-tests
+	)
 endif()
 
 

=== removed file 'cmake/Coverage.cmake'
--- cmake/Coverage.cmake	2013-10-30 08:38:05 +0000
+++ cmake/Coverage.cmake	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-if (CMAKE_BUILD_TYPE MATCHES coverage)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage")
-  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} --coverage")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --coverage")
-
-  find_program(GCOVR_EXECUTABLE gcovr HINTS ${GCOVR_ROOT} "${GCOVR_ROOT}/bin")
-  if (NOT GCOVR_EXECUTABLE)
-    message(STATUS "Gcovr binary was not found, can not generate XML coverage info.")
-  else ()
-    message(STATUS "Gcovr found, can generate XML coverage info.")
-    add_custom_target (coverage-xml
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      COMMAND "${GCOVR_EXECUTABLE}" --exclude="test.*" --exclude="obj.*" -x -r "${CMAKE_SOURCE_DIR}" 
-      --object-directory=${CMAKE_BINARY_DIR} -o coverage.xml)
-  endif()
-
-  find_program(LCOV_EXECUTABLE lcov HINTS ${LCOV_ROOT} "${GCOVR_ROOT}/bin")
-  find_program(GENHTML_EXECUTABLE genhtml HINTS ${GENHTML_ROOT})
-  if (NOT LCOV_EXECUTABLE)
-    message(STATUS "Lcov binary was not found, can not generate HTML coverage info.")
-  else ()
-    if(NOT GENHTML_EXECUTABLE)
-      message(STATUS "Genthml binary not found, can not generate HTML coverage info.")
-    else()
-      message(STATUS "Lcov and genhtml found, can generate HTML coverage info.")
-      add_custom_target (coverage-html
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        COMMAND "${LCOV_EXECUTABLE}" --capture --output-file "${CMAKE_BINARY_DIR}/coverage.info" --no-checksum --directory "${CMAKE_BINARY_DIR}"
-        COMMAND "${LCOV_EXECUTABLE}" --remove "${CMAKE_BINARY_DIR}/coverage.info" '/usr/*' --output-file "${CMAKE_BINARY_DIR}/coverage.info" 
-        COMMAND "${LCOV_EXECUTABLE}" --remove "${CMAKE_BINARY_DIR}/coverage.info" '${CMAKE_BINARY_DIR}/*' --output-file "${CMAKE_BINARY_DIR}/coverage.info" 
-        COMMAND "${LCOV_EXECUTABLE}" --remove "${CMAKE_BINARY_DIR}/coverage.info" '${CMAKE_SOURCE_DIR}/tests/*' --output-file "${CMAKE_BINARY_DIR}/coverage.info" 
-        COMMAND "${GENHTML_EXECUTABLE}" --prefix "${CMAKE_BINARY_DIR}" --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
-        )
-    endif()
-  endif()
-endif()

=== removed file 'cmake/FindValgrind.cmake'
--- cmake/FindValgrind.cmake	2015-08-19 16:04:55 +0000
+++ cmake/FindValgrind.cmake	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-
-option(
-  ENABLE_MEMCHECK_OPTION
-  "If set to ON, enables automatic creation of memcheck targets"
-  OFF
-)
-
-find_program(
-	VALGRIND_PROGRAM
-	NAMES valgrind
-)
-
-if(VALGRIND_PROGRAM)
-	set(VALGRIND_PROGRAM_OPTIONS
-		"--suppressions=${CMAKE_SOURCE_DIR}/tests/data/valgrind.suppression"
-		"--error-exitcode=1"
-		"--leak-check=full"
-		"--gen-suppressions=all"
-		"--quiet"
-	)
-endif()
-
-find_package_handle_standard_args(
-	VALGRIND DEFAULT_MSG
-	VALGRIND_PROGRAM
-)
-
-function(add_valgrind_test)
-	foreach(_arg ${ARGN})
-		if ("VALGRIND" STREQUAL ${_arg})
-			if(ENABLE_MEMCHECK_OPTION AND VALGRIND_PROGRAM)
-				list(APPEND _vgargs ${VALGRIND_PROGRAM} ${VALGRIND_PROGRAM_OPTIONS})
-			endif()
-		else()
-			list(APPEND _vgargs ${_arg})
-		endif()
-	endforeach()
-
-	add_test(${_vgargs})
-endfunction()

=== removed file 'cmake/UseGSettings.cmake'
--- cmake/UseGSettings.cmake	2013-04-02 08:34:53 +0000
+++ cmake/UseGSettings.cmake	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them.
-
-option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" ${LOCAL_INSTALL})
-
-option (GSETTINGS_COMPILE "Compile GSettings Schemas after installation" ${GSETTINGS_LOCALINSTALL})
-
-if(GSETTINGS_LOCALINSTALL)
-    message(STATUS "GSettings schemas will be installed locally.")
-endif()
-
-if(GSETTINGS_COMPILE)
-    message(STATUS "GSettings shemas will be compiled.")
-endif()
-
-macro(add_schema SCHEMA_NAME)
-
-    set(PKG_CONFIG_EXECUTABLE pkg-config)
-    # Have an option to not install the schema into where GLib is
-    if (GSETTINGS_LOCALINSTALL)
-        SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
-    else (GSETTINGS_LOCALINSTALL)
-        execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE)
-        SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/")
-    endif (GSETTINGS_LOCALINSTALL)
-
-    # Run the validator and error if it fails
-    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
-    execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    if (_schemas_invalid)
-      message (SEND_ERROR "Schema validation error: ${_schemas_invalid}")
-    endif (_schemas_invalid)
-
-    # Actually install and recomple schemas
-    message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}")
-    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
-
-    if (GSETTINGS_COMPILE)
-        install (CODE "message (STATUS \"Compiling GSettings schemas\")")
-        install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})")
-    endif ()
-endmacro()

=== modified file 'debian/control'
--- debian/control	2016-12-02 12:25:16 +0000
+++ debian/control	2016-12-12 13:51:51 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake (>= 3.4),
-               cmake-extras,
+               cmake-extras (>= 0.10),
                debhelper (>= 9),
                gnome-common,
                gobject-introspection,

=== modified file 'debian/rules'
--- debian/rules	2014-09-11 14:20:19 +0000
+++ debian/rules	2016-12-12 13:51:51 +0000
@@ -6,17 +6,15 @@
 
 ifneq (,$(filter $(DEB_HOST_ARCH),ppc64el armhf arm64))
 	ENABLE_BAMF = OFF
-	ENABLE_MEMCHECK_OPTION = OFF
 else
 	ENABLE_BAMF = ON
-	ENABLE_MEMCHECK_OPTION = ON
 endif
 
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DDEBIAN_TARGET_DIR="${DEBIAN_TARGET_DIR}" -DENABLE_DOCUMENTATION=ON -DENABLE_MEMCHECK_OPTION=$(ENABLE_MEMCHECK_OPTION) -DENABLE_BAMF=$(ENABLE_BAMF)
+	dh_auto_configure -- -DDEBIAN_TARGET_DIR="${DEBIAN_TARGET_DIR}" -DENABLE_DOCUMENTATION=ON -DENABLE_BAMF=$(ENABLE_BAMF)
 
 override_dh_install:
 	dh_install --fail-missing

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-12-02 12:25:16 +0000
+++ tests/CMakeLists.txt	2016-12-12 13:51:51 +0000
@@ -2,8 +2,6 @@
 find_package(GMock REQUIRED)
 set(CMAKE_AUTOMOC ON)
 
-find_package("Valgrind" REQUIRED)
-
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${GMOCK_INCLUDE_DIRS})
 include_directories(${GTEST_INCLUDE_DIRS})
@@ -52,9 +50,9 @@
 set(TEST_RUNNER "${CMAKE_CURRENT_SOURCE_DIR}/run-under-xvfb.sh")
 
 function(add_hud_test NAME)
-	add_valgrind_test(
+	add_test(
 		${NAME}
-		${TEST_RUNNER} qdbus-simple-test-runner VALGRIND "${CMAKE_CURRENT_BINARY_DIR}/${NAME}"
+		${TEST_RUNNER} qdbus-simple-test-runner "${CMAKE_CURRENT_BINARY_DIR}/${NAME}"
 	)
 	
 	set_tests_properties(

=== modified file 'tests/integration/TestHud.cpp'
--- tests/integration/TestHud.cpp	2014-03-18 18:02:27 +0000
+++ tests/integration/TestHud.cpp	2016-12-12 13:51:51 +0000
@@ -145,6 +145,10 @@
 		EXPECT_EQ(icon,
 				toolbarModel.data(index, Qt::DecorationRole).toString());
 		EXPECT_EQ(item, toolbarModel.data(index, Qt::UserRole).toInt());
+		if ((toolbarModel.data(index, Qt::UserRole + 1).toBool()) != enabled) {
+			QSignalSpy spy(&toolbarModel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &, const QVector<int> &)));
+			ASSERT_TRUE(spy.wait());
+		}
 		EXPECT_EQ(enabled, toolbarModel.data(index, Qt::UserRole + 1).toBool());
 	}