diff --git a/FWCore/Concurrency/test/BuildFile.xml b/FWCore/Concurrency/test/BuildFile.xml index 4aa991aadc6d6..96b583058e288 100644 --- a/FWCore/Concurrency/test/BuildFile.xml +++ b/FWCore/Concurrency/test/BuildFile.xml @@ -5,19 +5,16 @@ - + - - - - + - + diff --git a/FWCore/Concurrency/test/TestFWCoreConcurrencyDriver.cpp b/FWCore/Concurrency/test/TestFWCoreConcurrencyDriver.cpp deleted file mode 100644 index fec9875dcae99..0000000000000 --- a/FWCore/Concurrency/test/TestFWCoreConcurrencyDriver.cpp +++ /dev/null @@ -1,8 +0,0 @@ -//------------------------------------------------------------ -// -// Driver for shell scripts. -// -//------------------------------------------------------------ - -#include "FWCore/Utilities/interface/TestHelper.h" -RUNTEST() diff --git a/FWCore/Concurrency/test/run_streamGrapher_test.sh b/FWCore/Concurrency/test/run_streamGrapher_test.sh index 33a83016494ad..e6aa6eff2d199 100755 --- a/FWCore/Concurrency/test/run_streamGrapher_test.sh +++ b/FWCore/Concurrency/test/run_streamGrapher_test.sh @@ -2,6 +2,7 @@ function die { echo Failure $1: status $2 ; exit $2 ; } +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} cmsRun ${LOCAL_TEST_DIR}/streamGrapher_make_file_to_read_cfg.py || die "cmsRun streamGrapher_make_file_to_read_cfg.py" $? cmsRun ${LOCAL_TEST_DIR}/streamGrapher_stallMonitor_cfg.py > raw_output.log 2>&1 || die "cmsRun streamGrapher_stallMonitor_cfg.py" $? grep '+' raw_output.log > output_from_tracer.log diff --git a/FWCore/Concurrency/test/run_threadSafeOutputFileStream_test.sh b/FWCore/Concurrency/test/run_threadSafeOutputFileStream_test.sh index 6ab43ad6a009a..a2407187e9c3f 100755 --- a/FWCore/Concurrency/test/run_threadSafeOutputFileStream_test.sh +++ b/FWCore/Concurrency/test/run_threadSafeOutputFileStream_test.sh @@ -27,8 +27,6 @@ # linebreaks, I replaced the line breaks with semicolons, and compare # accordingly. -pushd ${LOCAL_TMP_DIR} - function die { echo Failure $1: status $2 ; exit $2 ; } test_threadSafeOutputFileStream || die "test_ThreadSafeOutputFileStream" $? @@ -37,5 +35,3 @@ do comparison="Thread index: ${thindex} Entry: 0;Thread index: ${thindex} Entry: 1;Thread index: ${thindex} Entry: 2;Thread index: ${thindex} Entry: 3;" [[ "$( grep "Thread index: ${thindex}" thread_safe_ofstream_test.txt | tr \\n \; )" == "${comparison}" ]] || die "test_ThreadSafeOutputFileStream_output" $? done - -popd diff --git a/FWCore/Integration/test/BuildFile.xml b/FWCore/Integration/test/BuildFile.xml index a12a42a7bc643..3d7dc427d8f8e 100644 --- a/FWCore/Integration/test/BuildFile.xml +++ b/FWCore/Integration/test/BuildFile.xml @@ -1,4 +1,5 @@ + @@ -7,158 +8,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + @@ -210,7 +92,6 @@ - @@ -222,24 +103,12 @@ - - - - - - - - - - - - - + diff --git a/FWCore/Integration/test/CatchCmsExceptiontest.sh b/FWCore/Integration/test/CatchCmsExceptiontest.sh index 89416c90ed664..cd09bace0de44 100755 --- a/FWCore/Integration/test/CatchCmsExceptiontest.sh +++ b/FWCore/Integration/test/CatchCmsExceptiontest.sh @@ -1,13 +1,9 @@ #!/bin/sh set -x -LOCAL_TEST_DIR=${CMSSW_BASE}/src/FWCore/Integration/test -LOCAL_TMP_DIR=${CMSSW_BASE}/tmp/${SCRAM_ARCH} - +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} # Pass in name and status function die { echo $1: status $2 ; exit $2; } -pushd ${LOCAL_TMP_DIR} - cmsRun ${LOCAL_TEST_DIR}/CatchCmsExceptiontest_cfg.py &> CatchCmsException.log && die 'Failed in using CatchCmsException_cfg.py' 1 grep -q WhatsItESProducer CatchCmsException.log || die 'Failed to find Producers name' $? @@ -26,6 +22,4 @@ grep -q WhatsItESProducer CatchCmsException.log || die 'Failed to find Producers cmsRun ${LOCAL_TEST_DIR}/testMissingDictionaryChecking_cfg.py &> testMissingDictionaryChecking.log && die 'Failed to get exception running testMissingDictionaryChecking_cfg.py' 1 grep -q MissingDictionaryTestF testMissingDictionaryChecking.log || die 'Failed to print out exception message with missing dictionary listed' $? -popd - #grep -w ESProducer CatcheStdException.log diff --git a/FWCore/Integration/test/CatchStdExceptiontest.sh b/FWCore/Integration/test/CatchStdExceptiontest.sh index 84ece9261cce4..86e956c0d57ab 100755 --- a/FWCore/Integration/test/CatchStdExceptiontest.sh +++ b/FWCore/Integration/test/CatchStdExceptiontest.sh @@ -1,17 +1,12 @@ #!/bin/sh set -x -LOCAL_TEST_DIR=${CMSSW_BASE}/src/FWCore/Integration/test -LOCAL_TMP_DIR=${CMSSW_BASE}/tmp/${SCRAM_ARCH} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} # Pass in name and status function die { echo $1: status $2 ; echo === Test log === ; cat ${3:-/dev/null} ; echo === End test log === ; exit $2; } -pushd ${LOCAL_TMP_DIR} - cmsRun ${LOCAL_TEST_DIR}/CatchStdExceptiontest_cfg.py &> CatchStdException.log && die 'Failed in using CatchStdException_cfg.py' 1 CatchStdException.log grep -q WhatsItESProducer CatchStdException.log || die 'Failed to find Producers name' $? CatchStdException.log #grep -w ESProducer CatcheStdException.log -popd - diff --git a/FWCore/Integration/test/TestIntegration.cpp b/FWCore/Integration/test/TestIntegration.cpp deleted file mode 100644 index b2991bd18ae57..0000000000000 --- a/FWCore/Integration/test/TestIntegration.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include "FWCore/Utilities/interface/TestHelper.h" - -RUNTEST() diff --git a/FWCore/Integration/test/ViewTest.sh b/FWCore/Integration/test/ViewTest.sh index 39fde1a2465ba..4d68b9d6a8648 100755 --- a/FWCore/Integration/test/ViewTest.sh +++ b/FWCore/Integration/test/ViewTest.sh @@ -2,4 +2,4 @@ function die { echo $1: status $2 ; exit $2; } -cmsRun --parameter-set ${LOCAL_TEST_DIR}/ViewTest_cfg.py || die 'Failed in ViewTest_cfg.py' $? +cmsRun --parameter-set ${SCRAM_TEST_PATH}/ViewTest_cfg.py || die 'Failed in ViewTest_cfg.py' $? diff --git a/FWCore/Integration/test/delayedreader_throw_test.sh b/FWCore/Integration/test/delayedreader_throw_test.sh index cc46276a43ca7..e7dc7cd82105c 100755 --- a/FWCore/Integration/test/delayedreader_throw_test.sh +++ b/FWCore/Integration/test/delayedreader_throw_test.sh @@ -1,13 +1,8 @@ #!/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} +cmsRun ${SCRAM_TEST_PATH}/delayedreader_throw_cfg.py && die "cmsRun delayedreader_throw_cfg.py did not fail" 1 -cmsRun ${LOCAL_TEST_DIR}/delayedreader_throw_cfg.py && die "cmsRun ${test}delayedreader_throw_cfg.py did not fail" 1 - -popd -exit 0 \ No newline at end of file +exit 0 diff --git a/FWCore/Integration/test/detsetvector_t.sh b/FWCore/Integration/test/detsetvector_t.sh index 1e3ca2c337e41..3b95f2c678e83 100755 --- a/FWCore/Integration/test/detsetvector_t.sh +++ b/FWCore/Integration/test/detsetvector_t.sh @@ -2,5 +2,5 @@ function die { echo $1: status $2 ; exit $2; } -cmsRun --parameter-set ${LOCAL_TEST_DIR}/detsetvector_t_cfg.py || die 'Failed in detsetvector_t_cfg.py' $? +cmsRun --parameter-set ${SCRAM_TEST_PATH}/detsetvector_t_cfg.py || die 'Failed in detsetvector_t_cfg.py' $? diff --git a/FWCore/Integration/test/eventHistoryTest.sh b/FWCore/Integration/test/eventHistoryTest.sh index 6305180ea7588..5457ca779ce9c 100755 --- a/FWCore/Integration/test/eventHistoryTest.sh +++ b/FWCore/Integration/test/eventHistoryTest.sh @@ -3,7 +3,7 @@ # Pass in name and status function die { echo $1: status $2 ; exit $2; } -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} # Write a file for the FIRST process cmsRun --parameter-set ${LOCAL_TEST_DIR}/EventHistory_1_cfg.py || die 'Failed in EventHistory_1' $? @@ -46,5 +46,3 @@ cmsRun --parameter-set ${LOCAL_TEST_DIR}/EventHistory_SubProcess_cfg.py || die ' echo "*************************************************" echo "**************** Finished pass SubProcess *******" echo "*************************************************" - -popd diff --git a/FWCore/Integration/test/eventSetupTest.sh b/FWCore/Integration/test/eventSetupTest.sh index 80519a4ddb587..34a6b737ffe59 100755 --- a/FWCore/Integration/test/eventSetupTest.sh +++ b/FWCore/Integration/test/eventSetupTest.sh @@ -3,7 +3,7 @@ function die { echo $1: status $2 ; exit $2; } function diecat { echo "$1: status $2, log" ; cat $3; exit $2; } -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} cmsRun --parameter-set ${LOCAL_TEST_DIR}/EventSetupTest_cfg.py || die 'Failed in EventSetupTest_cfg.py' $? cmsRun --parameter-set ${LOCAL_TEST_DIR}/EventSetupAppendLabelTest_cfg.py || die 'Failed in EventSetupAppendLabelTest_cfg.py' $? @@ -46,5 +46,3 @@ cmsRun --parameter-set ${LOCAL_TEST_DIR}/testConcurrentIOVsAndRuns_cfg.py || die echo testConcurrentIOVsAndRunsRead_cfg.py cmsRun --parameter-set ${LOCAL_TEST_DIR}/testConcurrentIOVsAndRunsRead_cfg.py || die 'Failed in testConcurrentIOVsAndRunsRead_cfg.py' $? - -popd diff --git a/FWCore/Integration/test/hierarchy_example.sh b/FWCore/Integration/test/hierarchy_example.sh index 2e6489abe6f98..93e0f537235ff 100755 --- a/FWCore/Integration/test/hierarchy_example.sh +++ b/FWCore/Integration/test/hierarchy_example.sh @@ -2,5 +2,5 @@ function die { echo $1: status $2 ; exit $2; } -cmsRun --parameter-set ${LOCAL_TEST_DIR}/hierarchy_example_cfg.py || die 'Failed in hierarchy_example_cfg.py' $? +cmsRun --parameter-set ${SCRAM_TEST_PATH}/hierarchy_example_cfg.py || die 'Failed in hierarchy_example_cfg.py' $? diff --git a/FWCore/Integration/test/inputExtSourceTest.sh b/FWCore/Integration/test/inputExtSourceTest.sh index b197abfde6999..7e9e9c1817c07 100755 --- a/FWCore/Integration/test/inputExtSourceTest.sh +++ b/FWCore/Integration/test/inputExtSourceTest.sh @@ -2,4 +2,4 @@ function die { echo $1: status $2 ; exit $2; } -cmsRun --parameter-set ${LOCAL_TEST_DIR}/inputExtSourceTest_cfg.py || die 'Failed in inputExtSourceTest_cfg.py' $? +cmsRun --parameter-set ${SCRAM_TEST_PATH}/inputExtSourceTest_cfg.py || die 'Failed in inputExtSourceTest_cfg.py' $? diff --git a/FWCore/Integration/test/inputSourceTest.sh b/FWCore/Integration/test/inputSourceTest.sh index 5724881ce735e..5a6dda3408bb7 100755 --- a/FWCore/Integration/test/inputSourceTest.sh +++ b/FWCore/Integration/test/inputSourceTest.sh @@ -2,4 +2,4 @@ function die { echo $1: status $2 ; exit $2; } -cmsRun --parameter-set ${LOCAL_TEST_DIR}/inputSourceTest_cfg.py || die 'Failed in inputSourceTest_cfg.py' $? +cmsRun --parameter-set ${SCRAM_TEST_PATH}/inputSourceTest_cfg.py || die 'Failed in inputSourceTest_cfg.py' $? diff --git a/FWCore/Integration/test/newdetsetvector_t.sh b/FWCore/Integration/test/newdetsetvector_t.sh index a060d9855fa1c..efa7113f796c1 100755 --- a/FWCore/Integration/test/newdetsetvector_t.sh +++ b/FWCore/Integration/test/newdetsetvector_t.sh @@ -2,6 +2,6 @@ function die { echo $1: status $2 ; exit $2; } -cmsRun --parameter-set ${LOCAL_TEST_DIR}/newdetsetvector_t_cfg.py || die 'Failed in detsetvector_t_cfg.py' $? +cmsRun --parameter-set ${SCRAM_TEST_PATH}/newdetsetvector_t_cfg.py || die 'Failed in detsetvector_t_cfg.py' $? edmEventSize -A -v testDSTV.root diff --git a/FWCore/Integration/test/parentlessTest.sh b/FWCore/Integration/test/parentlessTest.sh index 1c9cb90f487ab..c1ee79ca6c1f1 100755 --- a/FWCore/Integration/test/parentlessTest.sh +++ b/FWCore/Integration/test/parentlessTest.sh @@ -2,4 +2,4 @@ function die { echo $1: status $2 ; exit $2; } -cmsRun --parameter-set ${LOCAL_TEST_DIR}/parentlessTest_cfg.py || die 'Failed in parentlessTest_cfg.py' $? +cmsRun --parameter-set ${SCRAM_TEST_PATH}/parentlessTest_cfg.py || die 'Failed in parentlessTest_cfg.py' $? diff --git a/FWCore/Integration/test/refTest.sh b/FWCore/Integration/test/refTest.sh index 654684235d893..6c19e208ad440 100755 --- a/FWCore/Integration/test/refTest.sh +++ b/FWCore/Integration/test/refTest.sh @@ -2,7 +2,7 @@ function die { echo $1: status $2 ; exit $2; } -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} echo cmsRun RefTest_cfg.py cmsRun --parameter-set ${LOCAL_TEST_DIR}/RefTest_cfg.py || die 'Failed in RefTest_cfg.py' $? @@ -12,5 +12,3 @@ cmsRun --parameter-set ${LOCAL_TEST_DIR}/AssociationMapTest_cfg.py || die 'Faile echo cmsRun AssociationMapReadTest_cfg.py cmsRun --parameter-set ${LOCAL_TEST_DIR}/AssociationMapReadTest_cfg.py || die 'Failed in AssociationMapReadTest_cfg.py' $? - -popd diff --git a/FWCore/Integration/test/run_ParameterSet.sh b/FWCore/Integration/test/run_ParameterSet.sh index 15bde439b89eb..b7cae9f932964 100755 --- a/FWCore/Integration/test/run_ParameterSet.sh +++ b/FWCore/Integration/test/run_ParameterSet.sh @@ -4,7 +4,7 @@ test=testParameterSet function die { echo Failure $1: status $2 ; exit $2 ; } -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} # Intentionally fails because of an illegal parameter in a module. echo ${test} ------------------------------------------------------------ @@ -34,7 +34,7 @@ pushd ${LOCAL_TMP_DIR} cmsRun -p ${LOCAL_TEST_DIR}/runAutoGeneratedCfi_cfg.py || die "cmsRun runAutoGeneratedCfi_cfg.py" $? # Compare the cfi file to a reference file to ensure it is correct - diff ${LOCAL_TMP_DIR}/testProducerWithPsetDesc_cfi.py ${LOCAL_TEST_DIR}/unit_test_outputs/testProducerWithPsetDesc_cfi.py || die "comparing testProducerWithPsetDesc_cfi.py" $? + diff ./testProducerWithPsetDesc_cfi.py ${LOCAL_TEST_DIR}/unit_test_outputs/testProducerWithPsetDesc_cfi.py || die "comparing testProducerWithPsetDesc_cfi.py" $? # This time try a cfi without any of the required parameters to test that we properly insert # required missing parameters into the ParameterSet @@ -44,22 +44,22 @@ pushd ${LOCAL_TMP_DIR} # Compare the output of the PSetAnalyzer with a reference file echo cmsRun testPSetAnalyzer_cfg.py ------------------------------------------------------------ cmsRun -p ${LOCAL_TEST_DIR}/testPSetAnalyzer_cfg.py 2>&1 | grep " PSet test " > testPSetAnalyzer.txt - diff ${LOCAL_TMP_DIR}/testPSetAnalyzer.txt ${LOCAL_TEST_DIR}/unit_test_outputs/testPSetAnalyzer.txt || die "comparing testPSetAnalyzer.txt" $? + diff ./testPSetAnalyzer.txt ${LOCAL_TEST_DIR}/unit_test_outputs/testPSetAnalyzer.txt || die "comparing testPSetAnalyzer.txt" $? # Print human readable from the ParameterSetDescription echo edmPluginHelp -p ProducerWithPSetDesc ------------------------------ edmPluginHelp -p ProducerWithPSetDesc &> testProducerWithPsetDesc_doc.txt || die "edmPluginHelp -p ProducerWithPSetDesc" $? - diff ${LOCAL_TMP_DIR}/testProducerWithPsetDesc_doc.txt ${LOCAL_TEST_DIR}/unit_test_outputs/testProducerWithPsetDesc_doc.txt || die "comparing testProducerWithPsetDesc_doc.txt" $? + diff ./testProducerWithPsetDesc_doc.txt ${LOCAL_TEST_DIR}/unit_test_outputs/testProducerWithPsetDesc_doc.txt || die "comparing testProducerWithPsetDesc_doc.txt" $? # Print human readable from the ParameterSetDescription, test comments in ParameterDescription constructor arguments echo edmPluginHelp -p TestDescriptionComments ------------------------------ edmPluginHelp -p TestDescriptionComments &> testDescriptionComments_doc.txt || die "edmPluginHelp -p TestDescriptionComments" $? - diff ${LOCAL_TMP_DIR}/testDescriptionComments_doc.txt ${LOCAL_TEST_DIR}/unit_test_outputs/testDescriptionComments_doc.txt || die "comparing testDescriptionComments_doc.txt" $? + diff ./testDescriptionComments_doc.txt ${LOCAL_TEST_DIR}/unit_test_outputs/testDescriptionComments_doc.txt || die "comparing testDescriptionComments_doc.txt" $? # Print human readable from the ParameterSetDescription, brief format echo edmPluginHelp -p ProducerWithPSetDesc -b --------------------------- edmPluginHelp -p ProducerWithPSetDesc -b &> testProducerWithPsetDesc_briefdoc.txt || die "edmPluginHelp -p ProducerWithPSetDesc -b" $? - diff ${LOCAL_TMP_DIR}/testProducerWithPsetDesc_briefdoc.txt ${LOCAL_TEST_DIR}/unit_test_outputs/testProducerWithPsetDesc_briefdoc.txt || die "comparing testProducerWithPsetDesc_briefdoc.txt" $? + diff ./testProducerWithPsetDesc_briefdoc.txt ${LOCAL_TEST_DIR}/unit_test_outputs/testProducerWithPsetDesc_briefdoc.txt || die "comparing testProducerWithPsetDesc_briefdoc.txt" $? echo edmPluginHelp -t options -b --------------------------- edmPluginHelp -t options -b &> testEdmPluginHelpOptions.txt || die "edmPluginHelp -t options -b" $? @@ -76,7 +76,4 @@ pushd ${LOCAL_TMP_DIR} cmsRun -p ${LOCAL_TEST_DIR}/importRestrictions3.py 2> importRestrictions3.txt grep "Event 2" importRestrictions3.txt || die " cmsRun importRestrictions3.py" $? - -popd - exit 0 diff --git a/FWCore/Integration/test/run_ParentageWithStreamerIO.sh b/FWCore/Integration/test/run_ParentageWithStreamerIO.sh index db9ea984aa9c7..cfe782e460353 100755 --- a/FWCore/Integration/test/run_ParentageWithStreamerIO.sh +++ b/FWCore/Integration/test/run_ParentageWithStreamerIO.sh @@ -4,7 +4,7 @@ test=testParentageWithStreamerIO function die { echo Failure $1: status $2 ; exit $2 ; } -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} echo ${test}_1_cfg.py cmsRun -p ${LOCAL_TEST_DIR}/${test}_1_cfg.py || die "cmsRun ${test}_1_cfg.py" $? @@ -15,6 +15,4 @@ pushd ${LOCAL_TMP_DIR} echo ${test}_3_cfg.py cmsRun -p ${LOCAL_TEST_DIR}/${test}_3_cfg.py || die "cmsRun ${test}_3_cfg.py" $? -popd - exit 0 diff --git a/FWCore/Integration/test/run_RefAlias.sh b/FWCore/Integration/test/run_RefAlias.sh index 150951d67fed9..c00e2d443e853 100755 --- a/FWCore/Integration/test/run_RefAlias.sh +++ b/FWCore/Integration/test/run_RefAlias.sh @@ -3,9 +3,8 @@ test=ref_alias_compare_ function die { echo Failure $1: status $2 ; exit $2 ; } -echo LOCAL_TMP_DIR = ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} -pushd ${LOCAL_TMP_DIR} echo ${test}drop_alias_cfg.py ------------------------------------------------------------ cmsRun -p ${LOCAL_TEST_DIR}/${test}drop_alias_cfg.py || die "cmsRun ${test}drop_alias_cfg.py" $? @@ -18,6 +17,4 @@ pushd ${LOCAL_TMP_DIR} echo ${test}read_original_cfg.py------------------------------------------------------------ cmsRun -p ${LOCAL_TEST_DIR}/${test}read_original_cfg.py || die "cmsRun ${test}read_original_cfg.py" $? -popd - exit 0 diff --git a/FWCore/Integration/test/run_RefMerge.sh b/FWCore/Integration/test/run_RefMerge.sh index 3fcad40b51cef..f8533d2643715 100755 --- a/FWCore/Integration/test/run_RefMerge.sh +++ b/FWCore/Integration/test/run_RefMerge.sh @@ -4,9 +4,7 @@ test=ref_merge_ function die { echo Failure $1: status $2 ; exit $2 ; } -echo LOCAL_TMP_DIR = ${LOCAL_TMP_DIR} - -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} echo ${test}prod1 ------------------------------------------------------------ cmsRun -p ${LOCAL_TEST_DIR}/${test}prod1_cfg.py || die "cmsRun ${test}prod1_cfg.py" $? @@ -22,6 +20,4 @@ pushd ${LOCAL_TMP_DIR} echo ${test}test------------------------------------------------------------ cmsRun -p ${LOCAL_TEST_DIR}/${test}subprocess_cfg.py || die "cmsRun ${test}subprocess_cfg.py" $? -popd - exit 0 diff --git a/FWCore/Integration/test/run_RunMerge.sh b/FWCore/Integration/test/run_RunMerge.sh index c810f0b0859b6..aafb8f3c86456 100755 --- a/FWCore/Integration/test/run_RunMerge.sh +++ b/FWCore/Integration/test/run_RunMerge.sh @@ -4,9 +4,7 @@ test=testRunMerge function die { echo Failure $1: status $2 ; exit $2 ; } -echo LOCAL_TMP_DIR = ${LOCAL_TMP_DIR} - -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} echo ${test}PROD0 ------------------------------------------------------------ cmsRun -p ${LOCAL_TEST_DIR}/${test}PROD0_cfg.py || die "cmsRun ${test}PROD0_cfg.py" $? @@ -118,6 +116,4 @@ pushd ${LOCAL_TMP_DIR} cmsRun -p ${LOCAL_TEST_DIR}/testLooperEventNavigation1_cfg.py < ${LOCAL_TEST_DIR}/testLooperEventNavigation.txt > testLooperEventNavigationOutput1.txt || die "cmsRun testLooperEventNavigation1_cfg.py " $? diff ${LOCAL_TEST_DIR}/unit_test_outputs/testLooperEventNavigationOutput.txt testLooperEventNavigationOutput1.txt || die "comparing testLooperEventNavigationOutput1.txt" $? -popd - exit 0 diff --git a/FWCore/Integration/test/run_RunMerge2.sh b/FWCore/Integration/test/run_RunMerge2.sh index 8f7d590efd37a..ee7290ba4e8a6 100755 --- a/FWCore/Integration/test/run_RunMerge2.sh +++ b/FWCore/Integration/test/run_RunMerge2.sh @@ -4,9 +4,7 @@ test=testRunMerge function die { echo Failure $1: status $2 ; exit $2 ; } -echo LOCAL_TMP_DIR = ${LOCAL_TMP_DIR} - -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} echo ${test}PROD100 ------------------------------------------------------------ cmsRun -p ${LOCAL_TEST_DIR}/${test}PROD100_cfg.py || die "cmsRun ${test}PROD100_cfg.py" $? @@ -49,6 +47,4 @@ pushd ${LOCAL_TMP_DIR} echo ${test}COPY101 ------------------------------------------------------------ cmsRun -p ${LOCAL_TEST_DIR}/${test}COPY101_cfg.py || die "cmsRun ${test}COPY101_cfg.py" $? -popd - exit 0 diff --git a/FWCore/Integration/test/run_SeriesOfProcesses.sh b/FWCore/Integration/test/run_SeriesOfProcesses.sh index c56d603ae82f4..c7fc3b66ec8f2 100755 --- a/FWCore/Integration/test/run_SeriesOfProcesses.sh +++ b/FWCore/Integration/test/run_SeriesOfProcesses.sh @@ -4,7 +4,7 @@ test=testSeriesOfProcesses function die { echo Failure $1: status $2 ; exit $2 ; } -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} cmsRun -p ${LOCAL_TEST_DIR}/${test}HLT_cfg.py || die "cmsRun ${test}HLT_cfg.py" $? @@ -25,6 +25,4 @@ pushd ${LOCAL_TMP_DIR} cmsRun -p ${LOCAL_TEST_DIR}/${test}PROD2TEST_unscheduled_cfg.py || die "cmsRun ${test}PROD2TEST_cfg.py" $? -popd - exit 0 diff --git a/FWCore/Integration/test/run_SubProcess.sh b/FWCore/Integration/test/run_SubProcess.sh index 14f8c8f256e94..5cc64b0fecf70 100755 --- a/FWCore/Integration/test/run_SubProcess.sh +++ b/FWCore/Integration/test/run_SubProcess.sh @@ -4,7 +4,7 @@ test=testSubProcess function die { echo Failure $1: status $2 ; exit $2 ; } -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} rm -f testSubProcess.grep.txt rm -f ${test}.log @@ -38,6 +38,4 @@ pushd ${LOCAL_TMP_DIR} echo cmsRun testSubProcessUnscheduledRead_cfg.py cmsRun -p ${LOCAL_TEST_DIR}/testSubProcessUnscheduledRead_cfg.py || die "cmsRun testSubProcessUnscheduledRead_cfg.py" $? -popd - exit 0 diff --git a/FWCore/Integration/test/run_TestDropOnInput.sh b/FWCore/Integration/test/run_TestDropOnInput.sh index 9efb136fb2ccf..6abafd263f359 100755 --- a/FWCore/Integration/test/run_TestDropOnInput.sh +++ b/FWCore/Integration/test/run_TestDropOnInput.sh @@ -4,7 +4,7 @@ test=testDropOnInput function die { echo Failure $1: status $2 ; exit $2 ; } -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} echo "testDropOnInput1_1" cmsRun -p ${LOCAL_TEST_DIR}/${test}1_1_cfg.py || die "cmsRun ${test}1_1_cfg.py" $? @@ -33,7 +33,5 @@ pushd ${LOCAL_TMP_DIR} echo "testDropOnInputReadSubProcess_cfg.py" cmsRun -p ${LOCAL_TEST_DIR}/${test}ReadSubProcess_cfg.py || die "cmsRun ${test}ReadSubProcess_cfg.py" $? -popd - exit 0 diff --git a/FWCore/Integration/test/run_TestEDAlias.sh b/FWCore/Integration/test/run_TestEDAlias.sh index 76f65bda1c6ee..3c410cb42aabb 100755 --- a/FWCore/Integration/test/run_TestEDAlias.sh +++ b/FWCore/Integration/test/run_TestEDAlias.sh @@ -4,7 +4,7 @@ test=testEDAlias function die { echo Failure $1: status $2 ; exit $2 ; } -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} echo "*************************************************" echo "EDAlias consumer in a Task" @@ -34,6 +34,4 @@ pushd ${LOCAL_TMP_DIR} cmsRun ${LOCAL_TEST_DIR}/${test}ManyModulesAmbiguous_cfg.py consumerGets=0 || die "cmsRun ${test}ManyModulesAmbiguous_cfg.py consumerGets=0" $? cmsRun ${LOCAL_TEST_DIR}/${test}ManyModulesAmbiguous_cfg.py explicitProcessName=1 && die "cmsRun ${test}ManyModulesAmbiguous_cfg.py explicitProcessName=1" 1 -popd - exit 0 diff --git a/FWCore/Integration/test/run_TestExistingDictionary.sh b/FWCore/Integration/test/run_TestExistingDictionary.sh index 70620c0ae81ce..e392270a691b0 100755 --- a/FWCore/Integration/test/run_TestExistingDictionary.sh +++ b/FWCore/Integration/test/run_TestExistingDictionary.sh @@ -4,7 +4,7 @@ test=testExistingDictionaryChecking function die { echo Failure $1: status $2 ; exit $2 ; } -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} echo "*************************************************" echo "Producer" @@ -14,5 +14,3 @@ pushd ${LOCAL_TMP_DIR} echo "Consumer" cmsRun ${LOCAL_TEST_DIR}/${test}Read_cfg.py || die "cmsRun ${test}Read_cfg.py 1" $? -popd - diff --git a/FWCore/Integration/test/run_TestFrameworkExceptionHandling.sh b/FWCore/Integration/test/run_TestFrameworkExceptionHandling.sh index 618dca60f3aba..8e26601ccecf5 100755 --- a/FWCore/Integration/test/run_TestFrameworkExceptionHandling.sh +++ b/FWCore/Integration/test/run_TestFrameworkExceptionHandling.sh @@ -1,12 +1,9 @@ #!/bin/bash #set -x -LOCAL_TEST_DIR=${CMSSW_BASE}/src/FWCore/Integration/test -LOCAL_TMP_DIR=${CMSSW_BASE}/tmp/${SCRAM_ARCH} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} function die { echo Failure $1: status $2 ; exit $2 ; } -pushd ${LOCAL_TMP_DIR} - logfile=testFrameworkExceptionHandling$1.log echo $logfile cmsRun ${LOCAL_TEST_DIR}/testFrameworkExceptionHandling_cfg.py testNumber=$1 &> $logfile && die "cmsRun testFrameworkExceptionHandling_cfg.py testNumber=$1" 1 @@ -80,6 +77,4 @@ then grep "ExceptionThrowingProducer::streamEndLuminosityBlock, module configured to throw on: run: 3 lumi: 1 event: 0" $logfile || die " - Cannot find the following string in the exception message: ExceptionThrowingProducer::streamEndLuminosityBlock, module configured to throw on: run: 3 lumi: 1 event: 0 " $? fi -popd - exit 0 diff --git a/FWCore/Integration/test/run_TestGetBy.sh b/FWCore/Integration/test/run_TestGetBy.sh index 422cb9393433b..4091148592073 100755 --- a/FWCore/Integration/test/run_TestGetBy.sh +++ b/FWCore/Integration/test/run_TestGetBy.sh @@ -4,7 +4,7 @@ test=testGetBy function die { echo Failure $1: status $2 ; exit $2 ; } -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} echo "testGetBy1" cmsRun -p ${LOCAL_TEST_DIR}/${test}1_cfg.py > testGetBy1.log 2>/dev/null || die "cmsRun ${test}1_cfg.py" $? @@ -52,6 +52,4 @@ pushd ${LOCAL_TMP_DIR} echo "testGetByWithEmptyRun_cfg.py" cmsRun -p ${LOCAL_TEST_DIR}/testGetByWithEmptyRun_cfg.py || die "cmsRun testGetByWithEmptyRun_cfg.py" $? -popd - exit 0 diff --git a/FWCore/Integration/test/run_TestOutput.sh b/FWCore/Integration/test/run_TestOutput.sh index 34b3af2eed8ca..2aa90cc5c485d 100755 --- a/FWCore/Integration/test/run_TestOutput.sh +++ b/FWCore/Integration/test/run_TestOutput.sh @@ -4,7 +4,7 @@ test=testOutput function die { echo Failure $1: status $2 ; exit $2 ; } -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} echo "testOutput1" cmsRun -p ${LOCAL_TEST_DIR}/${test}1_cfg.py 2> testOutput1.log || die "cmsRun ${test}1_cfg.py" $? @@ -66,6 +66,4 @@ pushd ${LOCAL_TMP_DIR} grep "limited globalEndLuminosityBlock" testOutput2.log > /dev/null || die "grep failed to find 'limited globalEndLuminosityBlock'" $? grep "limited branchID 4057644746" testOutput2.log > /dev/null || die "grep failed to find 'limited branchID 4057644746'" $? -popd - exit 0 diff --git a/FWCore/Integration/test/run_TestProcessAccelerator.sh b/FWCore/Integration/test/run_TestProcessAccelerator.sh index 3a6eef0a705f2..7aa273228ee16 100755 --- a/FWCore/Integration/test/run_TestProcessAccelerator.sh +++ b/FWCore/Integration/test/run_TestProcessAccelerator.sh @@ -1,13 +1,10 @@ #!/bin/bash test=testProcessAccelerator -LOCAL_TEST_DIR=${CMSSW_BASE}/src/FWCore/Integration/test -LOCAL_TMP_DIR=${CMSSW_BASE}/tmp/${SCRAM_ARCH} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} function die { echo Failure $1: status $2 ; exit $2 ; } -pushd ${LOCAL_TMP_DIR} - echo "*************************************************" echo "accelerators=*" cmsRun ${LOCAL_TEST_DIR}/${test}_cfg.py || die "cmsRun ${test}_cfg.py" $? diff --git a/FWCore/Integration/test/run_TestProcessBlock.sh b/FWCore/Integration/test/run_TestProcessBlock.sh index 18fae01ba0fd3..cab9f9d4d65d0 100755 --- a/FWCore/Integration/test/run_TestProcessBlock.sh +++ b/FWCore/Integration/test/run_TestProcessBlock.sh @@ -1,12 +1,9 @@ #!/bin/bash set -x -LOCAL_TEST_DIR=${CMSSW_BASE}/src/FWCore/Integration/test -LOCAL_TMP_DIR=${CMSSW_BASE}/tmp/${SCRAM_ARCH} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} 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 @@ -319,6 +316,4 @@ then fi -popd - exit 0 diff --git a/FWCore/Integration/test/run_TestSwitchProducer.sh b/FWCore/Integration/test/run_TestSwitchProducer.sh index 909413dffb960..26b25c79e589c 100755 --- a/FWCore/Integration/test/run_TestSwitchProducer.sh +++ b/FWCore/Integration/test/run_TestSwitchProducer.sh @@ -7,8 +7,7 @@ function die { echo Failure $1: status $2 ; exit $2 ; } # Running on multiple threads and streams to test any behavior that # occurs when there are many of them NUMTHREADS=4 - -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} echo "*************************************************" echo "SwitchProducer in a Task" @@ -141,6 +140,4 @@ pushd ${LOCAL_TMP_DIR} echo "SwitchProducer tests succeeded" echo "*************************************************" -popd - exit 0 diff --git a/FWCore/Integration/test/run_ThinningTests.sh b/FWCore/Integration/test/run_ThinningTests.sh index 33247ce8bd7f1..03984d1c39504 100755 --- a/FWCore/Integration/test/run_ThinningTests.sh +++ b/FWCore/Integration/test/run_ThinningTests.sh @@ -2,7 +2,7 @@ function die { echo Failure $1: status $2 ; exit $2 ; } -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} cmsRun -p ${LOCAL_TEST_DIR}/ThinningTest1_cfg.py || die "cmsRun ThinningTest1_cfg.py" $? @@ -51,6 +51,4 @@ pushd ${LOCAL_TMP_DIR} cmsRun -p ${LOCAL_TEST_DIR}/SlimmingTest4B_cfg.py || die "cmsRun SlimmingTest4B_cfg.py" $? cmsRun -p ${LOCAL_TEST_DIR}/SlimmingTest4F_cfg.py && die "cmsRun SlimmingTest4F_cfg.py" 1 -popd - exit 0 diff --git a/FWCore/Integration/test/run_all_t.sh b/FWCore/Integration/test/run_all_t.sh index 7f9f0139b4d11..a9cb62ab9516c 100755 --- a/FWCore/Integration/test/run_all_t.sh +++ b/FWCore/Integration/test/run_all_t.sh @@ -4,6 +4,8 @@ # Pass in name and status function die { echo $1: status $2 ; exit $2; } +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} + ${LOCAL_TEST_DIR}/refTest.sh || die 'Failed in refTest.sh' $? ${LOCAL_TEST_DIR}/transRefTest.sh || die 'Failed in transRefTest.sh' $? diff --git a/FWCore/Integration/test/run_getProductAtEnd.sh b/FWCore/Integration/test/run_getProductAtEnd.sh index 63233b9dcc25c..7317698addf13 100755 --- a/FWCore/Integration/test/run_getProductAtEnd.sh +++ b/FWCore/Integration/test/run_getProductAtEnd.sh @@ -2,11 +2,9 @@ function die { echo Failure $1: status $2 ; exit $2 ; } -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} cmsRun ${LOCAL_TEST_DIR}/testGetProductAtEnd_cfg.py || die "cmsRun testGetProductAtEnd_cfg.py" $? cmsRun ${LOCAL_TEST_DIR}/testGetProductAtEndUnscheduled_cfg.py || die "cmsRun testGetProductAtEndUnscheduled_cfg.py" $? -popd - exit 0 diff --git a/FWCore/Integration/test/run_unscheduledFailOnOutput.sh b/FWCore/Integration/test/run_unscheduledFailOnOutput.sh index 20428a9bce2a6..98e3cdf409f24 100755 --- a/FWCore/Integration/test/run_unscheduledFailOnOutput.sh +++ b/FWCore/Integration/test/run_unscheduledFailOnOutput.sh @@ -1,12 +1,11 @@ #!/bin/bash test=unscheduled_fail_on_output_ +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} CFG_DIR=${LOCAL_TEST_DIR}/../python/test function die { echo Failure $1: status $2 ; exit $2 ; } -pushd ${LOCAL_TMP_DIR} - cmsRun ${CFG_DIR}/${test}Rethrow_cfg.py && die "cmsRun ${test}Rethrow_cfg.py did not fail" 1 cmsRun ${CFG_DIR}/${test}IgnoreCompletely_cfg.py || die "cmsRun ${test}IgnoreCompletely_cfg.py" $? @@ -18,6 +17,4 @@ pushd ${LOCAL_TMP_DIR} cmsRun -p ${CFG_DIR}/${test}SkipEvent_cfg.py || die "cmsRun ${test}SkipEvent_cfg.py" $? cmsRun ${CFG_DIR}/${test}read_no_events.py || die "cmsRun ${test}read_no_events.py" $? -popd - exit 0 diff --git a/FWCore/Integration/test/service_example.sh b/FWCore/Integration/test/service_example.sh index c09ddaee264db..6207e9761805e 100755 --- a/FWCore/Integration/test/service_example.sh +++ b/FWCore/Integration/test/service_example.sh @@ -2,4 +2,4 @@ function die { echo $1: status $2 ; exit $2; } -cmsRun --parameter-set ${LOCAL_TEST_DIR}/service_example_cfg.py || die 'Failed in service_example_cfg.py' $? +cmsRun --parameter-set ${SCRAM_TEST_PATH}/service_example_cfg.py || die 'Failed in service_example_cfg.py' $? diff --git a/FWCore/Integration/test/testTables.sh b/FWCore/Integration/test/testTables.sh index c2f662732da77..2cdf086fb8245 100755 --- a/FWCore/Integration/test/testTables.sh +++ b/FWCore/Integration/test/testTables.sh @@ -2,4 +2,4 @@ function die { echo $1: status $2 ; exit $2; } -cmsRun ${LOCAL_TEST_DIR}/testTableTest_cfg.py || die 'Failed in testTableTest_cfg.py' $? \ No newline at end of file +cmsRun ${SCRAM_TEST_PATH}/testTableTest_cfg.py || die 'Failed in testTableTest_cfg.py' $? diff --git a/FWCore/Integration/test/test_finalpath.sh b/FWCore/Integration/test/test_finalpath.sh index 5383fb4757134..6e002d69b51ec 100755 --- a/FWCore/Integration/test/test_finalpath.sh +++ b/FWCore/Integration/test/test_finalpath.sh @@ -1,13 +1,10 @@ #!/bin/bash -LOCAL_TEST_DIR=${CMSSW_BASE}/src/FWCore/Integration/test -LOCAL_TMP_DIR=${CMSSW_BASE}/tmp/${SCRAM_ARCH} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} # Pass in name and status function die { echo $1: status $2 ; echo === Log file === ; cat ${3:-/dev/null} ; echo === End log file === ; exit $2; } -pushd ${LOCAL_TMP_DIR} - cat < finalpath_expected_empty.log EOF diff --git a/FWCore/Integration/test/transRefTest.sh b/FWCore/Integration/test/transRefTest.sh index 50bc43e6acc4d..2ce38ece18616 100755 --- a/FWCore/Integration/test/transRefTest.sh +++ b/FWCore/Integration/test/transRefTest.sh @@ -2,4 +2,4 @@ function die { echo $1: status $2 ; exit $2; } -cmsRun --parameter-set ${LOCAL_TEST_DIR}/TransRefTest_cfg.py || die 'Failed in TransRefTest_cfg.py' $? +cmsRun --parameter-set ${SCRAM_TEST_PATH}/TransRefTest_cfg.py || die 'Failed in TransRefTest_cfg.py' $? diff --git a/FWCore/Integration/test/waiting_thread_test.sh b/FWCore/Integration/test/waiting_thread_test.sh index 6da96b68e6864..7e90abc153802 100755 --- a/FWCore/Integration/test/waiting_thread_test.sh +++ b/FWCore/Integration/test/waiting_thread_test.sh @@ -2,9 +2,7 @@ function die { echo $1: status $2 ; exit $2; } -pushd ${LOCAL_TMP_DIR} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} echo "cmsRun acquireTest_cfg.py" cmsRun --parameter-set ${LOCAL_TEST_DIR}/acquireTest_cfg.py || die 'Failed in acquireTest_cfg.py' $? - -popd diff --git a/FWCore/TFWLiteSelector/test/BuildFile.xml b/FWCore/TFWLiteSelector/test/BuildFile.xml index 770232c1b2ca0..1c88252224884 100644 --- a/FWCore/TFWLiteSelector/test/BuildFile.xml +++ b/FWCore/TFWLiteSelector/test/BuildFile.xml @@ -1,5 +1 @@ - - - - - + diff --git a/FWCore/TFWLiteSelector/test/run_all_t.sh b/FWCore/TFWLiteSelector/test/run_all_t.sh index 83eb5b0cd85f4..45f1c57234fe5 100755 --- a/FWCore/TFWLiteSelector/test/run_all_t.sh +++ b/FWCore/TFWLiteSelector/test/run_all_t.sh @@ -3,9 +3,8 @@ # Pass in name and status function die { echo $1: status $2 ; exit $2; } -pushd ${LOCAL_TMP_DIR} - -export TMPDIR=${LOCAL_TMP_DIR:-/tmp} +LOCAL_TEST_DIR=${SCRAM_TEST_PATH} +export TMPDIR=`pwd` cmsRun ${LOCAL_TEST_DIR}/gen_things_cfg.py || die 'Failed generating test root file' $? rm -f a.jpg refA.jpg @@ -26,6 +25,4 @@ root -b -n -q ${LOCAL_TEST_DIR}/proof_thing2_sel.C || die 'Failed tfwliteselecto rm -f a.jpg refA.jpg -popd - exit 0