Skip to content

Commit

Permalink
Merge pull request #34426 from jfernan2/patch-8
Browse files Browse the repository at this point in the history
python2 cleanup: fastHadd test
  • Loading branch information
cmsbuild authored Jul 12, 2021
2 parents e07f151 + a2986f3 commit 17ee171
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions DQMServices/Components/test/run_fastHadd_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ set_up() {
generate() {
echo "Generating files"

python ${LOCAL_TEST_DIR}/test_fastHaddMerge.py -a produce -n $numFiles 2>&1 > /dev/null
python3 ${LOCAL_TEST_DIR}/test_fastHaddMerge.py -a produce -n $numFiles 2>&1 > /dev/null

if [ $? -ne 0 ]; then
exit $?
Expand Down Expand Up @@ -65,7 +65,7 @@ hadd_merge() {
check_hadd() {
echo "Checking ROOT result..."

python ${LOCAL_TEST_DIR}/test_fastHaddMerge.py -a check -n $numFiles -c $cumRootFile 2>&1 > /dev/null
python3 ${LOCAL_TEST_DIR}/test_fastHaddMerge.py -a check -n $numFiles -c $cumRootFile 2>&1 > /dev/null

if [ $? -ne 0 ]; then
exit $?
Expand Down Expand Up @@ -101,7 +101,7 @@ convertPB2ROOT() {
check_fasthadd() {
echo "Checking PB result... on ${cumPBFile_inROOT}"

python ${LOCAL_TEST_DIR}/test_fastHaddMerge.py -a check -n $numFiles -c $cumPBFile_inROOT 2>&1 > /dev/null
python3 ${LOCAL_TEST_DIR}/test_fastHaddMerge.py -a check -n $numFiles -c $cumPBFile_inROOT 2>&1 > /dev/null

if [ $? -ne 0 ]; then
exit $?
Expand Down Expand Up @@ -135,7 +135,7 @@ convert() {
check_fasthadd_parallel() {
echo "Checking PB result... on ${cumPBFileThreaded_inROOT}"

python ${LOCAL_TEST_DIR}/test_fastHaddMerge.py -a check -n $numFiles -c $cumPBFileThreaded_inROOT 2>&1 > /dev/null
python3 ${LOCAL_TEST_DIR}/test_fastHaddMerge.py -a check -n $numFiles -c $cumPBFileThreaded_inROOT 2>&1 > /dev/null

if [ $? -ne 0 ]; then
exit $?
Expand Down

0 comments on commit 17ee171

Please sign in to comment.