Skip to content

Commit 21bef5d

Browse files
committed
Fix macros changes detection
1 parent 5c65381 commit 21bef5d

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

MC/config/PWGGAJE/external/generator/generator_pythia8_powheg.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,4 +239,4 @@ FairGenerator *getGeneratorJEPythia8POWHEG(std::string powhegconf = "pwgpath", s
239239
myGen->setConfig(pythia8conf);
240240
}
241241
return myGen;
242-
}
242+
}

test/run_generator_tests.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,12 @@ add_ini_files_from_macros()
161161
# given a list of macros, collect all INI files which contain at least one of them
162162
local macro_files=$@
163163
for mf in ${macro_files} ; do
164-
# if any, strip the leading O2DPG_ROOT path to only grep for the relative trailing path
165-
mf=${mf##${O2DPG_ROOT}/}
164+
# if any, strip the leading O2DPG_ROOT or REPO_DIR path to only grep for the relative trailing path
165+
if [[ "${mf}" == ${O2DPG_ROOT}* ]]; then
166+
mf=${mf##${O2DPG_ROOT}/}
167+
elif [[ "${mf}" == ${REPO_DIR}* ]]; then
168+
mf=${mf##${REPO_DIR}/}
169+
fi
166170
local other_ini_files=$(grep -r -l ${mf} | grep ".ini$")
167171
# so this macro is not included in any of the INI file,
168172
# maybe it is included by another macro which is then included in an INI file

0 commit comments

Comments
 (0)