Skip to content

python2 cleanup: fastHadd test #34426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 1 commit into from
Jul 12, 2021
Merged

python2 cleanup: fastHadd test #34426

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions DQMServices/Components/test/run_fastHadd_tests.sh
View file
Open in desktop
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