From ca09955e12cded08c3634cc36f99f3c5d829b48d Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Mon, 12 Aug 2024 22:14:46 +0200 Subject: [PATCH] build: disable tools test unless we have mkdwarfs, dwarfs{ck,extract} --- CMakeLists.txt | 18 ++++++++++-------- test/tools_test.cpp | 6 ++++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dd56ccce..3bf0e79f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -440,9 +440,16 @@ if(WITH_TESTS) endif() if(WITH_TOOLS OR WITH_FUSE_DRIVER) - list(APPEND DWARFS_TESTS - tools_test - ) + if(NOT WITH_TOOLS) + find_program(MKDWARFS_EXE mkdwarfs mkdwarfs.exe) + find_program(DWARFSCK_EXE dwarfsck dwarfsck.exe) + find_program(DWARFSEXTRACT_EXE dwarfsextract dwarfsextract.exe) + endif() + if(WITH_TOOLS OR (MKDWARFS_EXE AND DWARFSCK_EXE AND DWARFSEXTRACT_EXE)) + list(APPEND DWARFS_TESTS + tools_test + ) + endif() endif() if((WITH_TOOLS OR WITH_FUSE_DRIVER) AND WITH_MAN_OPTION) @@ -480,11 +487,6 @@ if(WITH_TESTS) endif() if(TARGET tools_test) - if(NOT WITH_TOOLS) - find_program(MKDWARFS_EXE mkdwarfs mkdwarfs.exe) - find_program(DWARFSCK_EXE dwarfsck dwarfsck.exe) - find_program(DWARFSEXTRACT_EXE dwarfsextract dwarfsextract.exe) - endif() target_compile_definitions(tools_test PRIVATE $<$,$>:DWARFS_HAVE_UNIVERSAL_BINARY> $<$:DWARFS_WITH_TOOLS> diff --git a/test/tools_test.cpp b/test/tools_test.cpp index b4069868..5318f9dc 100644 --- a/test/tools_test.cpp +++ b/test/tools_test.cpp @@ -1636,9 +1636,11 @@ class manpage_test : public ::testing::TestWithParam> {}; std::vector const manpage_test_tools{ -"mkdwarfs", "dwarfsck", "dwarfsextract", + "mkdwarfs", + "dwarfsck", + "dwarfsextract", #ifdef DWARFS_WITH_FUSE_DRIVER -"dwarfs", + "dwarfs", #endif };