From fab07589b6d785a4594b26061405a10afcc80d3c Mon Sep 17 00:00:00 2001 From: Steve Goldhaber Date: Thu, 21 Nov 2024 22:11:40 +0100 Subject: [PATCH] Fix CMakeLists.txt so that multiple --verbose options work. Modify run_test so that verbose is set to level 2 by default. Tested with verbose level 0, 1, and 2. --- test/ddthost_test/CMakeLists.txt | 2 +- test/ddthost_test/run_test | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/ddthost_test/CMakeLists.txt b/test/ddthost_test/CMakeLists.txt index 38dcee79..5bbe196d 100644 --- a/test/ddthost_test/CMakeLists.txt +++ b/test/ddthost_test/CMakeLists.txt @@ -145,7 +145,7 @@ list(APPEND CAPGEN_CMD "--host-name") list(APPEND CAPGEN_CMD "test_host") list(APPEND CAPGEN_CMD "--output-root") list(APPEND CAPGEN_CMD "${CCPP_CAP_FILES}") -string(REPEAT "--verbose" ${VERBOSITY} VERBOSE_REPEATED) +string(REPEAT "--verbose;" ${VERBOSITY} VERBOSE_REPEATED) list(APPEND CAPGEN_CMD ${VERBOSE_REPEATED}) list(APPEND CAPGEN_CMD "--debug") string(REPLACE ";" " " CAPGEN_STRING "${CAPGEN_CMD}") diff --git a/test/ddthost_test/run_test b/test/ddthost_test/run_test index e5cd89c0..e7b5d09d 100755 --- a/test/ddthost_test/run_test +++ b/test/ddthost_test/run_test @@ -9,7 +9,7 @@ scriptdir="$( cd $( dirname $0 ); pwd -P )" defdir="ddt_build" build_dir="${currdir}/${defdir}" cleanup="PASS" # Other supported options are ALWAYS and NEVER -verbosity=0 +verbosity=2 ## ## General syntax help function @@ -26,7 +26,7 @@ help () { echo "${hprefix} default is /${defdir}" echo "${hprefix} : Cleanup option is ALWAYS, NEVER, or PASS" echo "${hprefix} default is PASS" - echo "${hprefix} verbosity: 0, 1, or 2" + echo "${hprefix} verbosity: 0, 1, or 2 (default=${verbosity})" echo "${hprefix} default is 0" exit $1 }