diff --git a/FWCore/Integration/test/BuildFile.xml b/FWCore/Integration/test/BuildFile.xml
index 9b420db88563b..b1082508dbdda 100644
--- a/FWCore/Integration/test/BuildFile.xml
+++ b/FWCore/Integration/test/BuildFile.xml
@@ -77,11 +77,6 @@
-
-
-
-
-
@@ -434,7 +429,7 @@
-
+
@@ -450,4 +445,89 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FWCore/Integration/test/run_TestProcessBlock.sh b/FWCore/Integration/test/run_TestProcessBlock.sh
index 6254d24fb8cd0..18fae01ba0fd3 100755
--- a/FWCore/Integration/test/run_TestProcessBlock.sh
+++ b/FWCore/Integration/test/run_TestProcessBlock.sh
@@ -1,11 +1,30 @@
#!/bin/bash
+set -x
+LOCAL_TEST_DIR=${CMSSW_BASE}/src/FWCore/Integration/test
+LOCAL_TMP_DIR=${CMSSW_BASE}/tmp/${SCRAM_ARCH}
function die { echo Failure $1: status $2 ; exit $2 ; }
pushd ${LOCAL_TMP_DIR}
+# The tests executed by this bash script are all related and
+# it seemed clearest to include them all in the same file.
+# These tests are divided into distinct groups. Each time
+# the script runs, it will execute only one group of tests.
+# The script requires that its first command line argument
+# specifies the group to be run. The "if" conditional statements
+# below implement this. The BuildFile directs scram to run
+# this script once for each group when unit tests are run.
+# The BuildFile also specifies the dependencies between the
+# groups. In some cases, one group cannot run until another
+# group of tests has finished. The purpose of this is to
+# allow maximum concurrency while running the tests so the
+# tests can run faster.
+
+if [ $1 -eq 1 ]
+then
echo "testProcessBlock1"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlock1_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlock1_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlock1_cfg.py &> testProcessBlock1.log || die "cmsRun testProcessBlock1_cfg.py" $?
# The MetaData ProcessBlock branch and the TTree should exist to hold the ProcessBlock
# data. The Events branch should not exist because there were not any ProcessBlock branches
@@ -15,18 +34,30 @@ pushd ${LOCAL_TMP_DIR}
grep "TTree.*ProcessBlocksPROD1" testProcessBlock1ContentsM.txt || die "Check for existence of ProcessBlocksPROD1 TTree" $?
edmFileUtil -t Events -P file:testProcessBlock1.root > testProcessBlock1ContentsE.txt
grep "Branch.* EventToProcessBlockIndexes " testProcessBlock1ContentsE.txt && die "Check for non-existence of eventToProcessBlockIndexes branch" 1
+fi
+if [ $1 -eq 2 ]
+then
echo "testProcessBlock2"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlock2_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlock2_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlock2_cfg.py &> testProcessBlock2.log || die "cmsRun testProcessBlock2_cfg.py" $?
+fi
+if [ $1 -eq 3 ]
+then
echo "testProcessBlock3"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlock3_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlock3_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlock3_cfg.py &> testProcessBlock3.log || die "cmsRun testProcessBlock3_cfg.py" $?
+fi
+if [ $1 -eq 4 ]
+then
echo "testProcessBlock4"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlock4_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlock4_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlock4_cfg.py &> testProcessBlock4.log || die "cmsRun testProcessBlock4_cfg.py" $?
+fi
+if [ $1 -eq 5 ]
+then
echo "testProcessBlockMerge"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockMerge_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockMerge_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockMerge_cfg.py &> testProcessBlockMerge.log || die "cmsRun testProcessBlockMerge_cfg.py" $?
# The ProcessBlock Branches and TTrees should exist in this case. Test that here:
edmFileUtil -l -t MetaData -P file:testProcessBlockMerge.root > testProcessBlockMContentsM.txt
@@ -35,18 +66,24 @@ pushd ${LOCAL_TMP_DIR}
grep "TTree.*ProcessBlocksMERGE" testProcessBlockMContentsM.txt || die "Check for existence of ProcessBlocksMERGE TTree" $?
edmFileUtil -t Events -P file:testProcessBlockMerge.root > testProcessBlockMContentsE.txt
grep "Branch.* EventToProcessBlockIndexes " testProcessBlockMContentsE.txt || die "Check for existence of eventToProcessBlockIndexes branch" $?
+fi
+if [ $1 -eq 6 ]
+then
echo "testProcessBlockTEST"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockTEST_cfg.py || die "cmsRun testProcessBlockTEST_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockTEST_cfg.py &> testProcessBlockTEST.log || die "cmsRun testProcessBlockTEST_cfg.py" $?
echo "testProcessBlockRead"
cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockRead_cfg.py &> testProcessBlockRead.log || die "cmsRun testProcessBlockRead_cfg.py" $?
grep "InputProcessBlockIntAnalyzer::accessInputProcessBlock" testProcessBlockRead.log || die "Check that InputProcessBlockIntAnalyzer::accessInputProcessBlock was called" $?
grep "InputProcessBlockIntFilter::accessInputProcessBlock" testProcessBlockRead.log || die "Check that InputProcessBlockIntFilter::accessInputProcessBlock was called" $?
grep "InputProcessBlockIntProducer::accessInputProcessBlock" testProcessBlockRead.log || die "Check that InputProcessBlockIntProducer::accessInputProcessBlock was called" $?
+fi
+if [ $1 -eq 7 ]
+then
echo "testProcessBlock2Dropped"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlock2Dropped_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlock2Dropped_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlock2Dropped_cfg.py &> testProcessBlock2Dropped.log || die "cmsRun testProcessBlock2Dropped_cfg.py" $?
# The ProcessBlock Branches and TTrees should not exist in this case because
# all the ProcessBlock products are dropped. Test that here:
@@ -55,95 +92,183 @@ pushd ${LOCAL_TMP_DIR}
grep "TTree.*ProcessBlocksPROD1" testProcessBlock2DroppedContentsM.txt && die "Check for non-existence of ProcessBlocksPROD1 TTree" 1
edmFileUtil -t Events -P file:testProcessBlock2Dropped.root > testProcessBlock2DroppedContentsE.txt
grep "Branch.* EventToProcessBlockIndexes " testProcessBlock2DroppedContentsE.txt && die "Check for non-existence of eventToProcessBlockIndexes branch" 1
+fi
+if [ $1 -eq 8 ]
+then
# This one intentionally fails because the product content of the
# files does not match (strict merging requirements for ProcessBlocks)
echo "testProcessBlockFailMerge"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockFailMerge_cfg.py > /dev/null 2>&1 && die "cmsRun testProcessBlockFailMerge_cfg.py" 1
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockFailMerge_cfg.py &> testProcessBlockFailMerge.log && die "cmsRun testProcessBlockFailMerge_cfg.py" 1
+fi
+if [ $1 -eq 9 ]
+then
echo "testProcessBlockMerge2"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockMerge2_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockMerge2_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockMerge2_cfg.py &> testProcessBlockMerge2.log || die "cmsRun testProcessBlockMerge2_cfg.py" $?
+fi
+if [ $1 -eq 10 ]
+then
echo "testProcessBlockMergeOfMergedFiles"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockMergeOfMergedFiles_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockMergeOfMergedFiles_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockMergeOfMergedFiles_cfg.py &> testProcessBlockMergeOfMergedFiles.log || die "cmsRun testProcessBlockMergeOfMergedFiles_cfg.py" $?
+fi
+if [ $1 -eq 11 ]
+then
echo "testProcessBlockNOMergeOfMergedFiles"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockNOMergeOfMergedFiles_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockNOMergeOfMergedFiles_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockNOMergeOfMergedFiles_cfg.py &> testProcessBlockNOMergeOfMergedFiles.log || die "cmsRun testProcessBlockNOMergeOfMergedFiles_cfg.py" $?
+fi
+if [ $1 -eq 12 ]
+then
echo "testProcessBlockRead2"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockRead2_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockRead2_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockRead2_cfg.py &> testProcessBlockRead2.log || die "cmsRun testProcessBlockRead2_cfg.py" $?
+fi
+if [ $1 -eq 14 ]
+then
echo "testProcessBlockSubProcess"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockSubProcess_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockSubProcess_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockSubProcess_cfg.py &> testProcessBlockSubProcess.log || die "cmsRun testProcessBlockSubProcess_cfg.py" $?
+fi
+if [ $1 -eq 15 ]
+then
echo "testProcessBlockSubProcessRead1"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockSubProcessRead1_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockSubProcessRead1_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockSubProcessRead1_cfg.py &> testProcessBlockSubProcessRead1.log || die "cmsRun testProcessBlockSubProcessRead1_cfg.py" $?
+fi
+if [ $1 -eq 16 ]
+then
echo "testProcessBlockSubProcessRead2"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockSubProcessRead2_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockSubProcessRead2_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockSubProcessRead2_cfg.py &> testProcessBlockSubProcessRead2.log || die "cmsRun testProcessBlockSubProcessRead2_cfg.py" $?
+fi
+if [ $1 -eq 17 ]
+then
echo "testProcessBlockSubProcessLooper"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockSubProcessLooper_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockSubProcessLooper_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockSubProcessLooper_cfg.py &> testProcessBlockSubProcessLooper.log || die "cmsRun testProcessBlockSubProcessLooper_cfg.py" $?
+fi
+if [ $1 -eq 18 ]
+then
echo "testProcessBlock5"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlock5_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlock5_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlock5_cfg.py &> testProcessBlock5.log || die "cmsRun testProcessBlock5_cfg.py" $?
echo "testProcessBlockMerge3"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockMerge3_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockMerge3_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockMerge3_cfg.py &> testProcessBlockMerge3.log || die "cmsRun testProcessBlockMerge3_cfg.py" $?
echo "testProcessBlockMergeOfMergedFiles2"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockMergeOfMergedFiles2_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockMergeOfMergedFiles2_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockMergeOfMergedFiles2_cfg.py &> testProcessBlockMergeOfMergedFiles2.log || die "cmsRun testProcessBlockMergeOfMergedFiles2_cfg.py" $?
+fi
+if [ $1 -eq 19 ]
+then
echo "testProcessBlockDropOnInput"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockDropOnInput_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockDropOnInput_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockDropOnInput_cfg.py &> testProcessBlockDropOnInput.log || die "cmsRun testProcessBlockDropOnInput_cfg.py" $?
+fi
+if [ $1 -eq 20 ]
+then
echo "testProcessBlockThreeFileInput"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockThreeFileInput_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockThreeFileInput_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockThreeFileInput_cfg.py &> testProcessBlockThreeFileInput.log || die "cmsRun testProcessBlockThreeFileInput_cfg.py" $?
echo "testProcessBlockReadThreeFileInput"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockReadThreeFileInput_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockReadThreeFileInput_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockReadThreeFileInput_cfg.py &> testProcessBlockReadThreeFileInput.log || die "cmsRun testProcessBlockReadThreeFileInput_cfg.py" $?
+fi
+if [ $1 -eq 21 ]
+then
echo "testLooperEventNavigation2"
- cmsRun -p ${LOCAL_TEST_DIR}/testLooperEventNavigation2_cfg.py < ${LOCAL_TEST_DIR}/testLooperEventNavigation2.txt > /dev/null 2>&1 || die "cmsRun testLooperEventNavigation2_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testLooperEventNavigation2_cfg.py < ${LOCAL_TEST_DIR}/testLooperEventNavigation2.txt &> testLooperEventNavigation2.log || die "cmsRun testLooperEventNavigation2_cfg.py" $?
+fi
+if [ $1 -eq 22 ]
+then
echo "testLooperEventNavigation3"
- cmsRun -p ${LOCAL_TEST_DIR}/testLooperEventNavigation3_cfg.py < ${LOCAL_TEST_DIR}/testLooperEventNavigation3.txt > /dev/null 2>&1 || die "cmsRun testLooperEventNavigation3_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testLooperEventNavigation3_cfg.py < ${LOCAL_TEST_DIR}/testLooperEventNavigation3.txt &> testLooperEventNavigation3.log || die "cmsRun testLooperEventNavigation3_cfg.py" $?
+fi
+if [ $1 -eq 23 ]
+then
echo "testProcessBlockDropOnOutput"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockDropOnOutput_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockDropOnOutput_cfg.py" $?
-
- echo "testProcessBlockDropOnOutput2"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockDropOnOutput2_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockDropOnOutput2_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockDropOnOutput_cfg.py &> testProcessBlockDropOnOutput.log || die "cmsRun testProcessBlockDropOnOutput_cfg.py" $?
echo "testProcessBlockReadDropOnOutput"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockReadDropOnOutput_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockReadDropOnOutput_cfg.py" $?
-
- echo "testProcessBlockReadDropOnOutput2"
- cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockReadDropOnOutput2_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockReadDropOnOutput2_cfg.py" $?
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockReadDropOnOutput_cfg.py &> testProcessBlockReadDropOnOutput.log || die "cmsRun testProcessBlockReadDropOnOutput_cfg.py" $?
+fi
- # The next three tests would be relevant if we disabled the strict merging requirement
- # in ProductRegistry.cc for ProcessBlock products (a one line code change). As long
- # as we always enforce the strict merging requirement these tests will fail, but they
- # would be useful if we decide to allow that requirement to be disabled in the future.
- # I ran them manually with the ProductRegistry.cc modified to disable the requirement
- # and in May 2021 these tests passed.
-
- #echo "testProcessBlockNonStrict"
- #cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockNonStrict_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockNonStrict_cfg.py" $?
-
- #echo "testProcessBlockNonStrict2"
- #cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockNonStrict2_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockNonStrict2_cfg.py" $?
-
- #echo "testProcessBlockNonStrict3"
- #cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockNonStrict3_cfg.py > /dev/null 2>&1 || die "cmsRun testProcessBlockNonStrict3_cfg.py" $?
+if [ $1 -eq 24 ]
+then
+ echo "testProcessBlockDropOnOutput2"
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockDropOnOutput2_cfg.py &> testProcessBlockDropOnOutput2.log || die "cmsRun testProcessBlockDropOnOutput2_cfg.py" $?
+ echo "testProcessBlockReadDropOnOutput2"
+ cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockReadDropOnOutput2_cfg.py &> testProcessBlockReadDropOnOutput2.log || die "cmsRun testProcessBlockReadDropOnOutput2_cfg.py" $?
+fi
+
+# The next three tests would be relevant if we disabled the strict merging requirement
+# in ProductRegistry.cc for ProcessBlock products (a one line code change). As long
+# as we always enforce the strict merging requirement these tests will fail, but they
+# would be useful if we decide to allow that requirement to be disabled in the future.
+# I ran them manually with the ProductRegistry.cc modified to disable the requirement
+# and in May 2021 these tests passed. In addition to uncommenting the tests here, they
+# would also need to be added in the BuildFile with the proper dependency (both 25
+# and 26 depend on 19 at the moment)
+
+#if [ $1 -eq 25 ]
+#then
+# echo "testProcessBlockNonStrict"
+# cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockNonStrict_cfg.py &> testProcessBlockNonStrict.log || die "cmsRun testProcessBlockNonStrict_cfg.py" $?
+#
+# echo "testProcessBlockNonStrict2"
+# cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockNonStrict2_cfg.py &> testProcessBlockNonStrict2.log || die "cmsRun testProcessBlockNonStrict2_cfg.py" $?
+#fi
+
+#if [ $1 -eq 26 ]
+#then
+# echo "testProcessBlockNonStrict3"
+# cmsRun -p ${LOCAL_TEST_DIR}/testProcessBlockNonStrict3_cfg.py &> testProcessBlockNonStrict3.log || die "cmsRun testProcessBlockNonStrict3_cfg.py" $?
+#fi
+
+if [ $1 -eq 100 ]
+then
rm testProcessBlock1ContentsM.txt
rm testProcessBlock1ContentsE.txt
- rm testProcessBlock2DroppedContentsM.txt
- rm testProcessBlock2DroppedContentsE.txt
rm testProcessBlockMContentsM.txt
rm testProcessBlockMContentsE.txt
+ rm testProcessBlock2DroppedContentsM.txt
+ rm testProcessBlock2DroppedContentsE.txt
+
+ rm testProcessBlock1.log
+ rm testProcessBlock2.log
+ rm testProcessBlock3.log
+ rm testProcessBlock4.log
+ rm testProcessBlockMerge.log
+ rm testProcessBlockTEST.log
rm testProcessBlockRead.log
+ rm testProcessBlock2Dropped.log
+ rm testProcessBlockFailMerge.log
+ rm testProcessBlockMerge2.log
+ rm testProcessBlockMergeOfMergedFiles.log
+ rm testProcessBlockNOMergeOfMergedFiles.log
+ rm testProcessBlockRead2.log
+ rm testProcessBlockSubProcess.log
+ rm testProcessBlockSubProcessRead1.log
+ rm testProcessBlockSubProcessRead2.log
+ rm testProcessBlockSubProcessLooper.log
+ rm testProcessBlock5.log
+ rm testProcessBlockMerge3.log
+ rm testProcessBlockMergeOfMergedFiles2.log
+ rm testProcessBlockDropOnInput.log
+ rm testProcessBlockThreeFileInput.log
+ rm testProcessBlockReadThreeFileInput.log
+ rm testLooperEventNavigation2.log
+ rm testLooperEventNavigation3.log
+ rm testProcessBlockDropOnOutput.log
+ rm testProcessBlockReadDropOnOutput.log
+ rm testProcessBlockDropOnOutput2.log
+ rm testProcessBlockReadDropOnOutput2.log
rm testProcessBlock1.root
rm testProcessBlock2.root
@@ -177,6 +302,23 @@ pushd ${LOCAL_TMP_DIR}
rm testProcessBlockDropOnOutput2_2.root
rm testProcessBlockReadDropOnOutput.root
rm testProcessBlockReadDropOnOutput2.root
+ rm testProcessBlockNOMergeOfMergedFiles001.root
+ rm testProcessBlockSubProcessLooperRead001.root
+ rm testProcessBlockSubProcessLooperRead002.root
+ rm testProcessBlockSubProcessLooperReadAgain001.root
+ rm testProcessBlockSubProcessLooperReadAgain002.root
+ rm testProcessBlockSubProcessLooperTest001.root
+ rm testProcessBlockSubProcessLooperTest002.root
+
+ #rm testProcessBlockNonStrict.log
+ #rm testProcessBlockNonStrict2.log
+ #rm testProcessBlockNonStrict3.log
+ #rm testProcessBlockNonStrict.root
+ #rm testProcessBlockNonStrict2.root
+ #rm testProcessBlockNonStrict3.root
+
+fi
+
popd
exit 0
diff --git a/FWCore/Integration/test/testProcessBlockNonStrict3_cfg.py b/FWCore/Integration/test/testProcessBlockNonStrict3_cfg.py
index 75f07da947fb2..7e9a26e209e8d 100644
--- a/FWCore/Integration/test/testProcessBlockNonStrict3_cfg.py
+++ b/FWCore/Integration/test/testProcessBlockNonStrict3_cfg.py
@@ -56,7 +56,7 @@
)
process.out = cms.OutputModule("PoolOutputModule",
- fileName = cms.untracked.string('testProcessBlockNonStrict.root')
+ fileName = cms.untracked.string('testProcessBlockNonStrict3.root')
)
process.testOneOutput = cms.OutputModule("TestOneOutput",