From 50cfb26fb83febb2fa9a5e9d4f90982052ed02e3 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 16 Jan 2024 13:33:04 +0800 Subject: [PATCH] ccmlib/common: check for scylla built with CMake as well cmake generates scylla at paths like `build/Debug/scylla` instead of `build/debug/scylla`, so check for them as well. Signed-off-by: Kefu Chai --- ccmlib/common.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ccmlib/common.py b/ccmlib/common.py index 67dee249..4edd4def 100644 --- a/ccmlib/common.py +++ b/ccmlib/common.py @@ -595,7 +595,8 @@ def isScylla(install_dir): return True scylla_build_modes = ['debug', 'dev', 'release'] - for mode in scylla_build_modes: + cmake_build_types = ['Debug', 'Dev', 'RelWithDebInfo'] + for mode in scylla_build_modes + cmake_build_types: if os.path.exists(os.path.join(install_dir, 'build', mode, 'scylla')): return True