Skip to content

Commit eaf1fdc

Browse files
committed
rename get_changed_files --> git_get_changed_files for better clarity
1 parent ea7ddc7 commit eaf1fdc

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

test/common/utils/utils.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ remove_artifacts()
3737
}
3838

3939

40-
get_changed_files()
40+
git_get_changed_files()
4141
{
4242
# in the Github CIs, there are env variables that give us the base and head hashes,
4343
# so use them if they are there

test/run_generator_tests.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ find_including_macros()
192192
# figure out the macros that INCLUDE macros that have changed, so that in turn we can check
193193
# if these including macros are contained in some INI files
194194
local repo_dir_head=${REPO_DIR}
195-
local changed_files=$(get_changed_files)
195+
local changed_files=$(git_get_changed_files)
196196
local potentially_included=${MACRO_FILES_POTENTIALLY_INCLUDED}
197197
# we reset it here but we could fill it again to be able to do it fully recursively
198198
MACRO_FILES_POTENTIALLY_INCLUDED=""
@@ -256,15 +256,15 @@ add_ini_files_from_tests()
256256
collect_ini_files()
257257
{
258258
# Collect all INI files which have changed
259-
local changed_files=$(get_changed_files)
259+
local changed_files=$(git_get_changed_files)
260260
for ini in ${changed_files} ; do
261261
[[ "${ini}" != *"MC/config"*".ini" ]] && continue
262262
[[ "${INI_FILES}" == *"${ini}"* ]] && continue || INI_FILES+=" ${ini} "
263263
done
264264

265265
# this relies on INI_FILES and MACRO_FILES_POTENTIALLY_INCLUDED
266266
# collect all INI files that might include some changed macros
267-
changed_files=$(get_changed_files)
267+
changed_files=$(git_get_changed_files)
268268
local macros=
269269
for m in ${changed_files} ; do
270270
[[ "${m}" != *"MC/config"*".C" ]] && continue
@@ -279,7 +279,7 @@ collect_ini_files()
279279
add_ini_files_from_macros $(find_including_macros)
280280

281281
# also tests might have changed in which case we run them
282-
changed_files=$(get_changed_files)
282+
changed_files=$(git_get_changed_files)
283283
local macros=
284284
for m in ${changed_files} ; do
285285
[[ "${m}" != *"MC/"*"ini/tests"*".C" ]] && continue

test/run_relval_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ source ${REPO_DIR}/test/common/utils/utils.sh
133133
pushd ${REPO_DIR} > /dev/null
134134

135135
# flag if anything changed for RelVal
136-
need_testing=$(get_changed_files | grep "RelVal/")
136+
need_testing=$(git_get_changed_files | grep "RelVal/")
137137

138138
# go back to where we came from
139139
popd > /dev/null

test/run_workflow_tests.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,11 @@ echo "##############################"
211211
pushd ${REPO_DIR} > /dev/null
212212

213213
# flag if anything changed in the sim workflow bin dir
214-
changed_sim_bin=$(get_changed_files | grep -E "MC/bin")
214+
changed_sim_bin=$(git_get_changed_files | grep -E "MC/bin")
215215
# collect if anything has changed related to AnalysisQC
216-
changed_analysis_qc=$(get_changed_files | grep -E "MC/analysis_testing|MC/config/analysis_testing/json|MC/config/QC/json")
216+
changed_analysis_qc=$(git_get_changed_files | grep -E "MC/analysis_testing|MC/config/analysis_testing/json|MC/config/QC/json")
217217
# check if anything has changed concerning anchoring
218-
changed_anchored=$(get_changed_files | grep -E "MC/bin|MC/run/ANCHOR/anchorMC.sh|MC/run/ANCHOR/tests|MC/bin|UTILS/parse-async-WorkflowConfig.py|DATA/production/configurations/asyncReco/setenv_extra.sh|DATA/production/configurations/asyncReco/async_pass.sh|DATA/common/setenv.sh|DATA/production/workflow-multiplicities.sh")
218+
changed_anchored=$(git_get_changed_files | grep -E "MC/bin|MC/run/ANCHOR/anchorMC.sh|MC/run/ANCHOR/tests|MC/bin|UTILS/parse-async-WorkflowConfig.py|DATA/production/configurations/asyncReco/setenv_extra.sh|DATA/production/configurations/asyncReco/async_pass.sh|DATA/common/setenv.sh|DATA/production/workflow-multiplicities.sh")
219219
# collect changed workflow scripts
220220
changed_workflows=
221221
# workflows to be executed
@@ -233,7 +233,7 @@ if [[ "${changed_sim_bin}" != "" ]] ; then
233233
else
234234
# otherwise, only take the changed shell scripts
235235
changed_workflows=
236-
changed_files=$(get_changed_files)
236+
changed_files=$(git_get_changed_files)
237237
for cf in ${changed_files} ; do
238238
[[ "${cf}" != *"MC/run"*".sh" ]] && continue
239239
changed_workflows+="${cf} "

0 commit comments

Comments
 (0)