From 7c5e810842c5910fe0e91bf6178b82262d3695b0 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Tue, 12 Mar 2024 22:58:33 +0100 Subject: [PATCH 1/3] Avoid processing toolnames with same name but different capitalization --- pr_testing/test_multiple_prs.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pr_testing/test_multiple_prs.sh b/pr_testing/test_multiple_prs.sh index ccd3c5ce790..c636ccf2b92 100755 --- a/pr_testing/test_multiple_prs.sh +++ b/pr_testing/test_multiple_prs.sh @@ -584,10 +584,12 @@ if ${BUILD_EXTERNAL} ; then chmod +x ${RMV_CMSSW_EXTERNAL} fi DEP_NAMES="" + ALL_NEW_TOOLS=$(ls ${CTOOLS}/ | tr '[A-Z]' '[a-z]') for xml in $(ls ${BTOOLS}/*.xml) ; do name=$(basename $xml) - tool=$(echo $name | sed 's|.xml$||') - if [ ! -e ${CTOOLS}/$name ] ; then + lcname=$(echo $name | tr '[A-Z]' '[a-z]') + if [ $(echo " ${ALL_NEW_TOOLS} " | grep " ${lcname} " |wc -l) -eq 0 ] ; then + tool=$(echo $name | sed 's|.xml$||') echo "Removed tool $name" DEP_NAMES="$DEP_NAMES echo_${tool}_USED_BY" fi From 4ee7080724a73e37447469a40acda6b06c3a60e1 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Tue, 12 Mar 2024 23:27:36 +0100 Subject: [PATCH 2/3] Update test_multiple_prs.sh --- pr_testing/test_multiple_prs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pr_testing/test_multiple_prs.sh b/pr_testing/test_multiple_prs.sh index c636ccf2b92..053edb5d082 100755 --- a/pr_testing/test_multiple_prs.sh +++ b/pr_testing/test_multiple_prs.sh @@ -584,7 +584,7 @@ if ${BUILD_EXTERNAL} ; then chmod +x ${RMV_CMSSW_EXTERNAL} fi DEP_NAMES="" - ALL_NEW_TOOLS=$(ls ${CTOOLS}/ | tr '[A-Z]' '[a-z]') + ALL_NEW_TOOLS=$(ls ${CTOOLS}/ | tr '[A-Z]\n' '[a-z] ') for xml in $(ls ${BTOOLS}/*.xml) ; do name=$(basename $xml) lcname=$(echo $name | tr '[A-Z]' '[a-z]') From ba0b311db1cb7389011933abc6f4f0720a813e32 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Tue, 12 Mar 2024 23:47:20 +0100 Subject: [PATCH 3/3] Update test_multiple_prs.sh --- pr_testing/test_multiple_prs.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pr_testing/test_multiple_prs.sh b/pr_testing/test_multiple_prs.sh index 053edb5d082..f132ca7b488 100755 --- a/pr_testing/test_multiple_prs.sh +++ b/pr_testing/test_multiple_prs.sh @@ -584,7 +584,10 @@ if ${BUILD_EXTERNAL} ; then chmod +x ${RMV_CMSSW_EXTERNAL} fi DEP_NAMES="" + #Fix for SCRAMV2 based releases were tools can have different capitalizations ALL_NEW_TOOLS=$(ls ${CTOOLS}/ | tr '[A-Z]\n' '[a-z] ') + #In some releases libjpeg-turbo tool exists via libjpg + [ $(echo " ${ALL_NEW_TOOLS} " | grep " libjpg.xml " | wc -l) -gt 0 ] && ALL_NEW_TOOLS="${ALL_NEW_TOOLS} libjpeg-turbo.xml" for xml in $(ls ${BTOOLS}/*.xml) ; do name=$(basename $xml) lcname=$(echo $name | tr '[A-Z]' '[a-z]')