From fb7b8eea7d91772f989d5b060c86df20f2ebdb66 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Wed, 14 Oct 2015 12:10:31 +0100 Subject: Fix ECMInstallIconsTest. ECMInstallIcons now updates the theme cache if gtk-update-icon-cache is available, producing files the test hadn't been expecting.. Updating the test revealed that the old-style ecm_install_icons call only updated the hicolor cache, and not any of the other themes. REVIEW: 125631 --- tests/ECMInstallIconsTest/CMakeLists.txt | 7 +++++++ tests/ECMInstallIconsTest/check_tree.cmake.in | 7 +++++++ .../badly-named-files-test/hicolor/icon-theme.cache | Bin 0 -> 124 bytes .../expected-tree/lang-test/hicolor/icon-theme.cache | Bin 0 -> 548 bytes .../multi-file-test/hicolor/icon-theme.cache | Bin 0 -> 472 bytes .../single-file-test/hicolor/icon-theme.cache | Bin 0 -> 120 bytes .../themed-lang-test/oxygen/icon-theme.cache | Bin 0 -> 548 bytes .../themed-test/theme-name-2/icon-theme.cache | Bin 0 -> 472 bytes .../expected-tree/v1-icons/crystalsvg/icon-theme.cache | Bin 0 -> 164 bytes .../expected-tree/v1-icons/hicolor/icon-theme.cache | Bin 0 -> 452 bytes 10 files changed, 14 insertions(+) create mode 100644 tests/ECMInstallIconsTest/expected-tree/badly-named-files-test/hicolor/icon-theme.cache create mode 100644 tests/ECMInstallIconsTest/expected-tree/lang-test/hicolor/icon-theme.cache create mode 100644 tests/ECMInstallIconsTest/expected-tree/multi-file-test/hicolor/icon-theme.cache create mode 100644 tests/ECMInstallIconsTest/expected-tree/single-file-test/hicolor/icon-theme.cache create mode 100644 tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/icon-theme.cache create mode 100644 tests/ECMInstallIconsTest/expected-tree/themed-test/theme-name-2/icon-theme.cache create mode 100644 tests/ECMInstallIconsTest/expected-tree/v1-icons/crystalsvg/icon-theme.cache create mode 100644 tests/ECMInstallIconsTest/expected-tree/v1-icons/hicolor/icon-theme.cache (limited to 'tests/ECMInstallIconsTest') diff --git a/tests/ECMInstallIconsTest/CMakeLists.txt b/tests/ECMInstallIconsTest/CMakeLists.txt index 7fe4ca35..738cba91 100644 --- a/tests/ECMInstallIconsTest/CMakeLists.txt +++ b/tests/ECMInstallIconsTest/CMakeLists.txt @@ -94,5 +94,12 @@ ecm_install_icons( DESTINATION badly-named-files-test ) +find_program(icon_cache_generator NAMES gtk-update-icon-cache) +if (icon_cache_generator) + set(GENERATE_ICON_CACHE TRUE) +else() + set(GENERATE_ICON_CACHE FALSE) +endif() + # this will be run by CTest configure_file(check_tree.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/check_tree.cmake" @ONLY) diff --git a/tests/ECMInstallIconsTest/check_tree.cmake.in b/tests/ECMInstallIconsTest/check_tree.cmake.in index 6d14246b..b9da1715 100644 --- a/tests/ECMInstallIconsTest/check_tree.cmake.in +++ b/tests/ECMInstallIconsTest/check_tree.cmake.in @@ -1,8 +1,15 @@ set(EXP_TREE "@CMAKE_CURRENT_SOURCE_DIR@/expected-tree") set(ACTUAL_TREE "@CMAKE_INSTALL_PREFIX@") +set(GENERATE_ICON_CACHE "@GENERATE_ICON_CACHE@") file(GLOB_RECURSE exp_files RELATIVE "${EXP_TREE}" "${EXP_TREE}/*") file(GLOB_RECURSE actual_files RELATIVE "${ACTUAL_TREE}" "${ACTUAL_TREE}/*") +if (NOT GENERATE_ICON_CACHE) + file(GLOB_RECURSE cache_files RELATIVE "${EXP_TREE}" "${EXP_TREE}/*.cache") + foreach(f ${cache_files}) + list(REMOVE_ITEM exp_files "${f}") + endforeach() +endif() list(SORT exp_files) list(SORT actual_files) diff --git a/tests/ECMInstallIconsTest/expected-tree/badly-named-files-test/hicolor/icon-theme.cache b/tests/ECMInstallIconsTest/expected-tree/badly-named-files-test/hicolor/icon-theme.cache new file mode 100644 index 00000000..50d52976 Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/badly-named-files-test/hicolor/icon-theme.cache differ diff --git a/tests/ECMInstallIconsTest/expected-tree/lang-test/hicolor/icon-theme.cache b/tests/ECMInstallIconsTest/expected-tree/lang-test/hicolor/icon-theme.cache new file mode 100644 index 00000000..babadff0 Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/lang-test/hicolor/icon-theme.cache differ diff --git a/tests/ECMInstallIconsTest/expected-tree/multi-file-test/hicolor/icon-theme.cache b/tests/ECMInstallIconsTest/expected-tree/multi-file-test/hicolor/icon-theme.cache new file mode 100644 index 00000000..60ac05d6 Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/multi-file-test/hicolor/icon-theme.cache differ diff --git a/tests/ECMInstallIconsTest/expected-tree/single-file-test/hicolor/icon-theme.cache b/tests/ECMInstallIconsTest/expected-tree/single-file-test/hicolor/icon-theme.cache new file mode 100644 index 00000000..f385659f Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/single-file-test/hicolor/icon-theme.cache differ diff --git a/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/icon-theme.cache b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/icon-theme.cache new file mode 100644 index 00000000..babadff0 Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/icon-theme.cache differ diff --git a/tests/ECMInstallIconsTest/expected-tree/themed-test/theme-name-2/icon-theme.cache b/tests/ECMInstallIconsTest/expected-tree/themed-test/theme-name-2/icon-theme.cache new file mode 100644 index 00000000..60ac05d6 Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/themed-test/theme-name-2/icon-theme.cache differ diff --git a/tests/ECMInstallIconsTest/expected-tree/v1-icons/crystalsvg/icon-theme.cache b/tests/ECMInstallIconsTest/expected-tree/v1-icons/crystalsvg/icon-theme.cache new file mode 100644 index 00000000..8b9c8d0c Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/v1-icons/crystalsvg/icon-theme.cache differ diff --git a/tests/ECMInstallIconsTest/expected-tree/v1-icons/hicolor/icon-theme.cache b/tests/ECMInstallIconsTest/expected-tree/v1-icons/hicolor/icon-theme.cache new file mode 100644 index 00000000..ab56337b Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/v1-icons/hicolor/icon-theme.cache differ -- cgit v1.2.1