Custom number of events in generator test

Author: jackal1-66

test/run_generator_tests.sh

@@ -76,6 +76,16 @@ get_test_script_path_for_ini()
     echo ${path_to_test_script}
 }
 
+get_nevents_from_ini()
+{
+    # function to force the number of events to be simulated from the ini file (default = 100)
+    # Syntax: #NEV> 10 (space between #NEV> and the number is mandatory)
+    # To be used only if external generator takes too long to run causing timeouts in CI
+    local ini_path=${1}
+    local nev=$(grep "#NEV>" ${ini_path} | tail -n 1 | awk '{print $2}' | tr -d ' ')
+    [[ "${nev}" == "" ]] && nev=100
+    echo ${nev}
+}
 
 exec_test()
 {
@@ -89,12 +99,14 @@ exec_test()
     local RET=0
     # this is how our test script is expected to be called
     local test_script=$(get_test_script_path_for_ini ${ini_path})
+    # get the number of events to be simulated from the ini file
+    local nev=$(get_nevents_from_ini ${ini_path})
     # prepare the header of the log files
     echo "### Testing ${ini_path} with generator ${generator} ###" > ${LOG_FILE_KINE}
     echo "### Testing ${ini_path} with generator ${generator} ###" > ${LOG_FILE_GENERIC_KINE}
     echo "### Testing ${ini_path} with generator ${generator} ###" > ${LOG_FILE_SIM}
     # run the simulation, fail if not successful
-    o2-sim -g ${generator_lower} ${trigger} --noGeant -n 100 -j 4 --configFile ${ini_path} --configKeyValues "GeneratorPythia8.includePartonEvent=true" >> ${LOG_FILE_SIM} 2>&1
+    o2-sim -g ${generator_lower} ${trigger} --noGeant -n ${nev} -j 4 --configFile ${ini_path} --configKeyValues "GeneratorPythia8.includePartonEvent=true" >> ${LOG_FILE_SIM} 2>&1
     RET=${?}
     [[ "${RET}" != "0" ]] && { remove_artifacts ; return ${RET} ; }
 
@@ -161,11 +173,8 @@ add_ini_files_from_macros()
     # given a list of macros, collect all INI files which contain at least one of them
     local macro_files=$@
     for mf in ${macro_files} ; do
-        # Strip anything before MC/config/, if any, to get the macro relative path
-        if [[ "${mf}" == *"MC/config"* ]] ; then
-            mf=${mf#*MC/config/}
-            mf="MC/config/${mf}"
-        fi
+        # if any, strip the leading O2DPG_ROOT path to only grep for the relative trailing path
+        mf=${mf##${O2DPG_ROOT}/}
         local other_ini_files=$(grep -r -l ${mf} | grep ".ini$")
         # so this macro is not included in any of the INI file,
         # maybe it is included by another macro which is then included in an INI file