Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions pr_testing/test_multiple_prs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,6 @@ CMSSW_ORG='cms-sw'
BUILD_EXTERNAL=false
CMSDIST_ONLY=true # asume cmsdist only
CHECK_HEADER_TESTS=false
CMSSW_DATA_PKGS=""
for U_REPO in ${UNIQ_REPOS}; do
PKG_REPO=$(echo ${U_REPO} | sed 's/#.*//')
PKG_NAME=$(echo ${U_REPO} | sed 's|.*/||')
Expand Down Expand Up @@ -481,9 +480,6 @@ for U_REPO in ${UNIQ_REPOS}; do
exit 0
fi
done
if [ "${PKG_ORG}" = "cms-data" ] ; then
CMSSW_DATA_PKGS="${CMSSW_DATA_PKGS} $(echo ${PKG_NAME} | tr - /)"
fi
;;
esac
done
Expand Down Expand Up @@ -803,7 +799,10 @@ if ${BUILD_EXTERNAL} ; then
CMSSW_DEPx=$(scram build ${DEP_NAMES} | tr ' ' '\n' | grep '^cmssw/\|^self/' | cut -d"/" -f 2,3 | sort | uniq)
CMSSW_DEP=$(echo ${CMSSW_DEP} ${CMSSW_DEPx} | tr ' ' '\n' | sort | uniq)
fi
if [ "${CMSSW_DATA_PKGS}" != "" ] ; then CMSSW_DEP="${CMSSW_DEP} ${CMSSW_DATA_PKGS}"; fi
if [ -e ${BTOOLS}/cmsswdata.xml ] ; then
CMSSW_DATA_PKGS=$(diff -u ${CTOOLS}/cmsswdata.xml ${BTOOLS}/cmsswdata.xml | grep 'CMSSW_DATA_PACKAGE=' | grep -E '^[-+]' | sed 's|.*CMSSW_DATA_PACKAGE="||;s|=.*||' | sort | uniq)
if [ "${CMSSW_DATA_PKGS}" != "" ] ; then CMSSW_DEP="${CMSSW_DEP} ${CMSSW_DATA_PKGS}"; fi
fi
echo "Final CMSSW_DEP=${CMSSW_DEP}"
if [ "$CMSSW_DEP" = "" ] ; then CMSSW_DEP="FWCore/Version" ; fi
fi
Expand Down