Fix DataFormats/Scouting tests on PowerPC

Redo of #41189
cms-sw · Mar 30, 2023 · a777727 · a777727
1 parent a6cafc9
commit a777727
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/DataFormats/Scouting/test/testDataFormatsScoutingRun2.sh b/DataFormats/Scouting/test/testDataFormatsScoutingRun2.sh
@@ -14,15 +14,16 @@ function die {
 # read Scouting collections from existing EDM file, and write them to disk
 cmsRun "${SCRAM_TEST_PATH}"/scoutingCollectionsIO_cfg.py -- \
   -i /store/mc/RunIISummer20UL18RECO/DoubleElectron_Pt-1To300-gun/AODSIM/FlatPU0to70EdalIdealGT_EdalIdealGT_106X_upgrade2018_realistic_v11_L1v1_EcalIdealIC-v2/270000/4CDD9457-E14C-D84A-9BD4-3140CB6AEEB6.root \
-  -n 150 --skip 900 -o testDataFormatsScoutingRun2_step1.root &> testDataFormatsScoutingRun2_step1.log \
-  || die "Failure running scoutingCollectionsIO_cfg.py" $? testDataFormatsScoutingRun2_step1.log
+  -n 150 --skip 900 -o testDataFormatsScoutingRun2_step1.root \
+  > testDataFormatsScoutingRun2_step1.log 2> testDataFormatsScoutingRun2_step1_stderr.log \
+  || die "Failure running scoutingCollectionsIO_cfg.py" $? testDataFormatsScoutingRun2_step1_stderr.log
 
 cat testDataFormatsScoutingRun2_step1.log
 
 # validate content of Scouting collections
 "${SCRAM_TEST_PATH}"/scoutingCollectionsDumper.py -v 1 -n 1 --skip 81 -i testDataFormatsScoutingRun2_step1.root -k Scouting \
-  &> testDataFormatsScoutingRun2_step2.log \
-  || die "Failure running scoutingCollectionsDumper.py" $? testDataFormatsScoutingRun2_step2.log
+  > testDataFormatsScoutingRun2_step2.log 2> testDataFormatsScoutingRun2_step2_stderr.log \
+  || die "Failure running scoutingCollectionsDumper.py" $? testDataFormatsScoutingRun2_step2_stderr.log
 
 diff -q "${SCRAM_TEST_PATH}"/testDataFormatsScoutingRun2_expected.log testDataFormatsScoutingRun2_step2.log \
   || die "Unexpected differences in outputs of testDataFormatsScoutingRun2 (step 2)" $?
diff --git a/DataFormats/Scouting/test/testDataFormatsScoutingRun3.sh b/DataFormats/Scouting/test/testDataFormatsScoutingRun3.sh
@@ -14,15 +14,16 @@ function die {
 # read Scouting collections from existing EDM file, and write them to disk
 cmsRun "${SCRAM_TEST_PATH}"/scoutingCollectionsIO_cfg.py -- \
   -i /store/mc/Run3Summer22DR/GluGlutoHHto2B2Tau_kl-5p00_kt-1p00_c2-0p00_TuneCP5_13p6TeV_powheg-pythia8/GEN-SIM-RAW/124X_mcRun3_2022_realistic_v12-v2/2550000/bbfb86f3-4073-47e3-967b-059aa6b904ad.root \
-  -n 150 --skip 0 -o testDataFormatsScoutingRun3_step1.root &> testDataFormatsScoutingRun3_step1.log \
-  || die "Failure running scoutingCollectionsIO_cfg.py" $? testDataFormatsScoutingRun3_step1.log
+  -n 150 --skip 0 -o testDataFormatsScoutingRun3_step1.root \
+  >testDataFormatsScoutingRun3_step1.log 2>testDataFormatsScoutingRun3_step1_stderr.log \
+  || die "Failure running scoutingCollectionsIO_cfg.py" $? testDataFormatsScoutingRun3_step1_stderr.log
 
 cat testDataFormatsScoutingRun3_step1.log
 
 # validate content of Scouting collections
 "${SCRAM_TEST_PATH}"/scoutingCollectionsDumper.py -v 1 -n 1 --skip 137 -i testDataFormatsScoutingRun3_step1.root -k Run3Scouting \
-  &> testDataFormatsScoutingRun3_step2.log \
-  || die "Failure running scoutingCollectionsDumper.py" $? testDataFormatsScoutingRun3_step2.log
+  > testDataFormatsScoutingRun3_step2.log 2>testDataFormatsScoutingRun3_step2_stderr.log \
+  || die "Failure running scoutingCollectionsDumper.py" $? testDataFormatsScoutingRun3_step2_stderr.log
 
 diff -q "${SCRAM_TEST_PATH}"/testDataFormatsScoutingRun3_expected.log testDataFormatsScoutingRun3_step2.log \
   || die "Unexpected differences in outputs of testDataFormatsScoutingRun3 (step 2)" $?