From bca5a1757e7f83babf94c3d45212ecdf6f8cedb7 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Thu, 15 Jun 2023 15:23:55 +0200 Subject: [PATCH 1/3] Fix crash without arguments --- k4FWCore/scripts/k4run | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/k4FWCore/scripts/k4run b/k4FWCore/scripts/k4run index 9e5a09c6..ec706de0 100755 --- a/k4FWCore/scripts/k4run +++ b/k4FWCore/scripts/k4run @@ -27,6 +27,10 @@ option_db = {} class LoadFromFile(argparse.Action): def __call__(self, parser, namespace, values, option_string=None): + if not values: + print('Error: missing gaudi options file.\n' + 'Usage: k4run , use --help to get a complete list of arguments') + sys.exit(1) for wrapper in values: if wrapper.name in seen_files: return From 12105a1e501703ea1768bce1fe2198c2e0ecd905 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Thu, 15 Jun 2023 19:43:29 +0200 Subject: [PATCH 2/3] Add test for k4run without arguments --- test/k4FWCoreTest/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/k4FWCoreTest/CMakeLists.txt b/test/k4FWCoreTest/CMakeLists.txt index aba85474..6dd004bd 100644 --- a/test/k4FWCoreTest/CMakeLists.txt +++ b/test/k4FWCoreTest/CMakeLists.txt @@ -108,3 +108,8 @@ add_test(NAME TestUniqueIDGenSvc WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} COMMAND ${K4RUN} options/TestUniqueIDGenSvc.py) set_test_env(TestUniqueIDGenSvc) + +add_test(NAME Testk4runNoArguments + WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} + COMMAND ${K4RUN}) +set_test_env(Testk4runNoArguments) From b7a5df7cd3619ff34202996f5b3dcfbbe1993673 Mon Sep 17 00:00:00 2001 From: Thomas Madlener Date: Thu, 15 Jun 2023 21:36:42 +0200 Subject: [PATCH 3/3] Add success regular expression for catching non-zero exit code --- test/k4FWCoreTest/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/k4FWCoreTest/CMakeLists.txt b/test/k4FWCoreTest/CMakeLists.txt index 6dd004bd..ebcebfad 100644 --- a/test/k4FWCoreTest/CMakeLists.txt +++ b/test/k4FWCoreTest/CMakeLists.txt @@ -113,3 +113,5 @@ add_test(NAME Testk4runNoArguments WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} COMMAND ${K4RUN}) set_test_env(Testk4runNoArguments) +set_tests_properties(Testk4runNoArguments + PROPERTIES PASS_REGULAR_EXPRESSION "Usage: k4run , use --help to get a complete list of arguments")