Skip to content
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

Jump to bottom

[Core] Unit tests fixes/improvements #40988

Merged
merged 1 commit into from Mar 8, 2023
Merged

[Core] Unit tests fixes/improvements #40988

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
91 changes: 19 additions & 72 deletions FWCore/Framework/test/BuildFile.xml
View file
Open in desktop
@@ -1,3 +1,4 @@
<flags USE_UNITTEST_DIR="1"/>
<use name="boost"/>
<library file="DummyData.cc,DummyRecord.cc,DepRecord.cc,Dummy2Record.cc,DepOn2Record.cc" name="FWCoreFrameworkTestDummyForEventSetup">
<use name="FWCore/Framework"/>
Expand Down Expand Up @@ -31,10 +32,7 @@
<use name="FWCore/ParameterSet"/>
</library>

<bin name="TestFWCoreFrameworkTBBTasks" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test run_tbbTasks.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="TestFWCoreFrameworkTBBTasks" command="run_tbbTasks.sh"/>

<test name="TestFWCoreFrameworkOptions" command="run_testOptions.sh ${value}" for="0,4"/>

Expand Down Expand Up @@ -254,55 +252,25 @@
<use name="cppunit"/>
</bin>

<bin name="TestFWCoreFrameworkCmsRun" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test run_cmsRun.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="TestFWCoreFrameworkCmsRun" command="run_cmsRun.sh"/>

<bin name="TestFWCoreFrameworkESRefer" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test run_es_refer_tests.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="TestFWCoreFrameworkESRefer" command="run_es_refer_tests.sh"/>

<bin name="TestFWCoreFrameworkUnscheduled" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test run_unscheduled.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="TestFWCoreFrameworkUnscheduled" command="run_unscheduled.sh"/>

<bin name="TestFWCoreFrameworkGlobalStreamOne" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test run_global_stream_one.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="TestFWCoreFrameworkGlobalStreamOne" command="run_global_stream_one.sh"/>

<bin name="TestFWCoreFrameworkMayConsumesDeadlock" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test run_deadlock_test.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="TestFWCoreFrameworkMayConsumesDeadlock" command="run_deadlock_test.sh"/>

<bin name="TestFWCoreFrameworkReplace" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test run_replace_tests.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="TestFWCoreFrameworkReplace" command="run_replace_tests.sh"/>

<bin name="TestFWCoreFrameworkESProducerLooper" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test run_esproducerlooper.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="TestFWCoreFrameworkESProducerLooper" command="run_esproducerlooper.sh"/>

<bin name="TestFWCoreFrameworkTrigBit" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test run_trigbit.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="TestFWCoreFrameworkTrigBit" command="run_trigbit.sh"/>

<bin name="TestFWCoreFrameworkTrigMask" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test run_trigmask.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="TestFWCoreFrameworkTrigMask" command="run_trigmask.sh"/>

<bin name="TestXMLSafeException" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test run_XMLException.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="TestXMLSafeException" command="run_XMLException.sh"/>

<bin name="TestFWCoreFrameworkProductSelector" file="ProductSelector_t.cpp">
<use name="DataFormats/Provenance"/>
Expand Down Expand Up @@ -359,40 +327,19 @@
<use name="boost_program_options"/>
</bin>

<bin name="TestFWCoreFrameworkStatemachineSH" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test run_statemachine.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="TestFWCoreFrameworkStatemachineSH" command="run_statemachine.sh"/>

<bin name="TestFWCoreFrameworkInputTagFailure" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test test_InputTag_cache_failure.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="TestFWCoreFrameworkInputTagFailure" command="test_InputTag_cache_failure.sh"/>

<bin name="TestFWCoreFrameworkDeleteEarly" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test test_deleteEarly.sh"/>
<use name="FWCore/Utilities"/>
</bin>
test name="TestFWCoreFrameworkDeleteEarly" command="test_deleteEarly.sh"/>

<bin name="TestFWCoreFrameworkEarlyTerminationSignal" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test test_earlyTerminationSignal.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="TestFWCoreFrameworkEarlyTerminationSignal" command="test_earlyTerminationSignal.sh"/>

<bin name="TestFWCoreFrameworkPrintDependencies" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test run_PrintDependencies.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="TestFWCoreFrameworkPrintDependencies" command="run_PrintDependencies.sh"/>

<bin name="TestFWCoreFrameworkTransitions" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test transition_test.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="TestFWCoreFrameworkTransitions" command="transition_test.sh"/>

<bin name="TestFWCoreFrameworkEmptyPath" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Framework/test test_emptyPath.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="TestFWCoreFrameworkEmptyPath" command="test_emptyPath.sh"/>

<bin file="test_catch2_main.cc,test_catch2notTP_*.cc" name="TestFWCoreFrameworkCatch2notTP">
<use name="catch2"/>
Expand Down
3 changes: 0 additions & 3 deletions FWCore/Framework/test/TestDriver.cpp
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions FWCore/Framework/test/run_PrintDependencies.sh
View file
Open in desktop
Expand Up @@ -3,10 +3,11 @@
# Pass in name and status
function die { echo $1: status $2 ; exit $2; }

LOCAL_TEST_DIR="${CMSSW_BASE}/src/FWCore/Framework/test"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given that scram knows it is executing a test, couldn't we pass a special environment variable to the tests to let them know about where they come from? As seen here, that is a very useful thing for the test. It also avoids having to know exactly which CMSSW variable are available both in a local work area and in the IBs. It would also help if a test is moved from one directory to a different directory for maintenance reasons as one would not have to remember to update the internals of the test as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Dr15Jones , scram does set the following env

export SCRAM_TEST_NAME="<name-of-test>"
export SCRAM_TEST_PATH="$(CMSSW_BASE)/src/<Package/Name>/test"
export SCRAM_TEST_PACKAGE="<Package/Name>"
export SCRAM_TEST_PRE_TESTS="<test-dependencies-on-other-tests>"

so one can make use of these but the only problem is that these are set when you run tests via scram i.e. scram build runtests or scram b unittests. So test will fail if you try to run them directly

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the previously written tests, they would also fail if not run via scram as the arguments needed for the test were embedded in the BuildFile.xml files. Therefore I do not see it as a problem to use those environment variables in the tests themselves.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not really, previously the TestHelper was setting various env e.g LOCAL_TMP_DIR, LOCAL_TEST_DIR so when you run the unit tests executable e.g. TestFWCoreFrameworkDeleteEarly then it works. Of course if you run the shell script directly then yes it would have failed.

But I have no issues if tests can make use of these SCRAM_TEST_*

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TestHelper generates LOCAL_TEST_DIR based on the 3rd argument it is passed and that argument is embedded in the BuildFile.xml file. So executing just TestFWCoreFrameworkDeleteEarly should fail with an 'invalid number of arguments' error.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yes, you are right

F1=${LOCAL_TEST_DIR}/testPrintDependencies.py

cmsRun $F1 2>&1 | grep "depends on data products" >& ${LOCAL_TEST_DIR}/dependencies.txt || die "Failure using $F1" $?
diff -q ${LOCAL_TEST_DIR}/dependencies.txt ${LOCAL_TEST_DIR}/unit_test_outputs/dependencies.txt || die "dependencies differ" $?
cmsRun $F1 2>&1 | grep "depends on data products" >& dependencies.txt || die "Failure using $F1" $?
diff -q dependencies.txt ${LOCAL_TEST_DIR}/unit_test_outputs/dependencies.txt || die "dependencies differ" $?

rm -f ${LOCAL_TEST_DIR}/dependencies.txt
rm -f dependencies.txt

11 changes: 3 additions & 8 deletions FWCore/Framework/test/run_XMLException.sh
View file
Open in desktop
Expand Up @@ -2,11 +2,6 @@

function die { echo Failure $1: status $2 ; exit $2 ; }

pushd ${LOCAL_TMP_DIR}
echo ${LOCAL_TMP_DIR}
cmsRun -j testXMLSafeException.xml -p ${LOCAL_TEST_DIR}/testXMLSafeException_cfg.py
xmllint testXMLSafeException.xml || die "cmsRun testXMLSafeException_cfg.py produced invalid XML job report" $?

popd

exit 0
LOCAL_TEST_DIR="${CMSSW_BASE}/src/FWCore/Framework/test"
cmsRun -j testXMLSafeException.xml -p ${LOCAL_TEST_DIR}/testXMLSafeException_cfg.py
xmllint testXMLSafeException.xml || die "cmsRun testXMLSafeException_cfg.py produced invalid XML job report" $?
2 changes: 2 additions & 0 deletions FWCore/Framework/test/run_cmsRun.sh
View file
Open in desktop
Expand Up @@ -3,6 +3,8 @@
# Pass in name and status
function die { echo $1: status $2 ; exit $2; }

LOCAL_TEST_DIR="${CMSSW_BASE}/src/FWCore/Framework/test"

(cmsRun --help ) || die 'Failure running cmsRun --help' $?

# This test is supposed to throw an exception.
Expand Down
2 changes: 1 addition & 1 deletion FWCore/Framework/test/run_deadlock_test.sh
View file
Open in desktop
Expand Up @@ -3,6 +3,6 @@
# Pass in name and status
function die { echo $1: status $2 ; exit $2; }

F1=${LOCAL_TEST_DIR}/test_mayConsumes_deadlocking_cfg.py
F1=${CMSSW_BASE}/src/FWCore/Framework/test/test_mayConsumes_deadlocking_cfg.py
(cmsRun $F1 ) || die "Failure using $F1" $?

1 change: 1 addition & 0 deletions FWCore/Framework/test/run_es_refer_tests.sh
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
# Pass in name and status
function die { echo $1: status $2 ; exit $2; }

LOCAL_TEST_DIR="${CMSSW_BASE}/src/FWCore/Framework/test"
(cmsRun ${LOCAL_TEST_DIR}/test_es_prefer_prods_cfg.py ) || die 'Failure using test_es_prefer_prods_cfg.py' $?
(cmsRun ${LOCAL_TEST_DIR}/test_es_prefer_sources_cfg.py ) || die 'Failure using test_es_prefer_sources_cfg.py' $?
(cmsRun ${LOCAL_TEST_DIR}/test_es_prefer_source_beats_prod_cfg.py ) || die 'Failure using test_es_prefer_source_beats_prod_cfg.py' $?
Expand Down
1 change: 1 addition & 0 deletions FWCore/Framework/test/run_esproducerlooper.sh
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
# Pass in name and status
function die { echo $1: status $2 ; exit $2; }

LOCAL_TEST_DIR="${CMSSW_BASE}/src/FWCore/Framework/test"
(cmsRun ${LOCAL_TEST_DIR}/test_esproducerlooper_cfg.py ) || die 'Failure using test_esproducerlooper_cfg.py' $?
(cmsRun ${LOCAL_TEST_DIR}/test_esproducerlooper_stop_cfg.py ) || die 'Failure using test_esproducerlooper_stop_cfg.py' $?
(cmsRun ${LOCAL_TEST_DIR}/test_esproducerlooper_override_cfg.py ) || die 'Failure using test_esproducerlooper_override_cfg.py' $?
Expand Down
4 changes: 1 addition & 3 deletions FWCore/Framework/test/run_global_stream_one.sh
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
# 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}
LOCAL_TEST_DIR="${CMSSW_BASE}/src/FWCore/Framework/test"

F1=${LOCAL_TEST_DIR}/test_global_modules_cfg.py
F2=${LOCAL_TEST_DIR}/test_stream_modules_cfg.py
Expand Down Expand Up @@ -36,5 +36,3 @@ cat log_test_limited_concurrent_module | tail -n 3 | grep -v ' 0 ' | grep -v 'e-

echo cmsRun modules_2_concurrent_lumis_cfg.py
(cmsRun ${LOCAL_TEST_DIR}/modules_2_concurrent_lumis_cfg.py ) &> log_modules_2_concurrent_lumis || die "cmsRun modules_2_concurrent_lumis_cfg.py" $? log_modules_2_concurrent_lumis

popd
2 changes: 1 addition & 1 deletion FWCore/Framework/test/run_module_delete_tests.sh
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
# Pass in name and status
function die { echo $1: status $2 ; exit $2; }

TEST_DIR=src/FWCore/Framework/test
TEST_DIR=$CMSSW_BASE/src/FWCore/Framework/test

cmsRun $TEST_DIR/test_module_delete_cfg.py || die "module deletion test failed" $?
echo "module deletion test succeeded"
Expand Down
1 change: 1 addition & 0 deletions FWCore/Framework/test/run_replace_tests.sh
View file
Open in desktop
Expand Up @@ -3,5 +3,6 @@
# Pass in name and status
function die { echo $1: status $2 ; exit $2; }

LOCAL_TEST_DIR="${CMSSW_BASE}/src/FWCore/Framework/test"
(cmsRun ${LOCAL_TEST_DIR}/test_replace_with_unnamed_esproducer_cfg.py ) || die 'Failure using test_replace_with_unnamed_esproducer_cfg.py' $?
(cmsRun ${LOCAL_TEST_DIR}/test_replace_with_unnamed_essource_cfg.py ) || die 'Failure using test_replace_with_unnamed_essource_cfg.py' $?
19 changes: 7 additions & 12 deletions FWCore/Framework/test/run_statemachine.sh
View file
Open in desktop
Expand Up @@ -7,17 +7,16 @@
#LOCAL_TMP_DIR=/uscms_data/d1/wdd/CMSSW_1_8_0_pre2/tmp/slc4_ia32_gcc345
#LOCAL_TEST_DIR=/uscms_data/d1/wdd/CMSSW_1_8_0_pre2/src/FWCore/Framework/test

LOCAL_TEST_DIR="${CMSSW_BASE}/src/FWCore/Framework/test"
exe=TestFWCoreFrameworkStatemachine
input=${LOCAL_TEST_DIR}/unit_test_outputs/statemachine_
output=statemachine_output_
reference_output=${LOCAL_TEST_DIR}/unit_test_outputs/statemachine_output_

function die { echo Failure $1: status $2 ; exit $2 ; }

pushd ${LOCAL_TMP_DIR}

for i in 1 2 5 6 7 8 9 10 11
do
for i in 1 2 5 6 7 8 9 10 11
do

${exe} -i ${input}${i}.txt -o ${output}${i}.txt || die "TestFWCoreFrameworkStatemachine with input ${i}" $?
diff ${reference_output}${i}.txt ${output}${i}.txt || die "comparing ${output}${i}.txt" $?
Expand All @@ -38,17 +37,13 @@ pushd ${LOCAL_TMP_DIR}
${exe} -i ${input}${i}.txt -o ${output}${i}.txt || die "TestFWCoreFrameworkStatemachine with input ${i}" $?
diff ${reference_output}${i}.txt ${output}${i}.txt || die "comparing ${output}${i}.txt" $?

done
done

#testing exceptions
for i in 20 21 22 23
do
for i in 20 21 22 23
do

${exe} -i ${input}${i}.txt -o ${output}${i}.txt || die "TestFWCoreFrameworkStatemachine with input ${i}" $?
diff ${reference_output}${i}.txt ${output}${i}.txt || die "comparing ${output}${i}.txt" $?

done

popd

exit 0
done
2 changes: 2 additions & 0 deletions FWCore/Framework/test/run_tbbTasks.sh
View file
Open in desktop
Expand Up @@ -3,6 +3,8 @@
# Pass in name and status
function die { echo $1: status $2 ; exit $2; }

LOCAL_TEST_DIR="${CMSSW_BASE}/src/FWCore/Framework/test"

F1=${LOCAL_TEST_DIR}/test_tbb_threads_cfg.py
F2="-n 8 ${LOCAL_TEST_DIR}/test_tbb_threads_from_commandline_cfg.py"
F3="--numThreads 8 ${LOCAL_TEST_DIR}/test_tbb_threads_from_commandline_cfg.py"
Expand Down
5 changes: 0 additions & 5 deletions FWCore/Framework/test/run_testOptions.sh
View file
Open in desktop
Expand Up @@ -4,12 +4,9 @@
# argument from 0 to 4 specifying which test to run

LOCAL_TEST_DIR=${CMSSW_BASE}/src/FWCore/Framework/test
LOCAL_TMP_DIR=${CMSSW_BASE}/tmp/${SCRAM_ARCH}

function die { echo Failure $1: status $2 ; exit $2 ; }

pushd ${LOCAL_TMP_DIR}

echo "Running run_testOptions.sh $1"

# Configuration files and expected outputs for the 5 tests
Expand All @@ -25,6 +22,4 @@ grep "Number of Concurrent IOVs = ${expectedConcurrentIOVs[$1]}" ${configFiles[$

rm ${configFiles[$1]}.log

popd

exit 0
2 changes: 1 addition & 1 deletion FWCore/Framework/test/run_test_1_thread_es_prefetching.sh
View file
Open in desktop
Expand Up @@ -3,6 +3,6 @@
# Pass in name and status
function die { echo $1: status $2 ; exit $2; }

TEST_DIR=src/FWCore/Framework/test
TEST_DIR=$CMSSW_BASE/src/FWCore/Framework/test

(cmsRun ${TEST_DIR}/test_1_thread_es_prefetch_cfg.py 2>&1) | grep 'Maximum concurrent running modules: 1' || die "grep failed to find 'Maximum concurrent running modules: 1'" $?
1 change: 1 addition & 0 deletions FWCore/Framework/test/run_trigbit.sh
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
# Pass in name and status
function die { echo $1: status $2 ; exit $2; }

LOCAL_TEST_DIR="${CMSSW_BASE}/src/FWCore/Framework/test"
F1=${LOCAL_TEST_DIR}/testBitsPass_cfg.py
F2=${LOCAL_TEST_DIR}/testBitsFail_cfg.py
F3=${LOCAL_TEST_DIR}/testBitsMove_cfg.py
Expand Down
1 change: 1 addition & 0 deletions FWCore/Framework/test/run_trigmask.sh
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
# Pass in name and status
function die { echo $1: status $2 ; exit $2; }

LOCAL_TEST_DIR="${CMSSW_BASE}/src/FWCore/Framework/test"
F1=${LOCAL_TEST_DIR}/testTrigBits0_cfg.py
F2=${LOCAL_TEST_DIR}/testTrigBits1_cfg.py
F3=${LOCAL_TEST_DIR}/testTrigBits2_cfg.py
Expand Down
4 changes: 1 addition & 3 deletions FWCore/Framework/test/run_unscheduled.sh
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
# Pass in name and status
function die { echo $1: status $2 ; exit $2; }

pushd ${LOCAL_TMP_DIR}
LOCAL_TEST_DIR="${CMSSW_BASE}/src/FWCore/Framework/test"

F1=${LOCAL_TEST_DIR}/test_deepCall_unscheduled_cfg.py
F2=${LOCAL_TEST_DIR}/test_deepCall_unscheduled_fail_cfg.py
Expand All @@ -23,5 +23,3 @@ diff ${LOCAL_TEST_DIR}/unit_test_outputs/test_onPath_unscheduled.log test_onPath

!(cmsRun $F5 ) || die "Failure using $F5" $?

popd

2 changes: 1 addition & 1 deletion FWCore/Framework/test/test_InputTag_cache_failure.sh
View file
Open in desktop
Expand Up @@ -3,5 +3,5 @@
# Pass in name and status
function die { echo $1: status $2 ; exit $2; }

F1=${LOCAL_TEST_DIR}/test_InputTag_cache_failure_cfg.py
F1=${CMSSW_BASE}/src/FWCore/Framework/test/test_InputTag_cache_failure_cfg.py
(cmsRun $F1 ) || die "Failure using $F1" $?
1 change: 1 addition & 0 deletions FWCore/Framework/test/test_deleteEarly.sh
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
# Pass in name and status
function die { echo $1: status $2 ; exit $2; }

LOCAL_TEST_DIR="${CMSSW_BASE}/src/FWCore/Framework/test"
F1=${LOCAL_TEST_DIR}/test_doNotDeleteEarly_cfg.py
F2=${LOCAL_TEST_DIR}/test_simpleDeleteEarly_cfg.py
F3=${LOCAL_TEST_DIR}/test_referencingDeleteEarly_cfg.py
Expand Down
1 change: 1 addition & 0 deletions FWCore/Framework/test/test_earlyTerminationSignal.sh
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@ function test_failure {
fi
}

LOCAL_TEST_DIR="${CMSSW_BASE}/src/FWCore/Framework/test"
echo "running cmsRun testEarlyTerminationSignal_cfg.py"
(cmsRun ${LOCAL_TEST_DIR}/testEarlyTerminationSignal_cfg.py 2>&1 | grep -q 'early termination of event: stream = 0 run = 1 lumi = 1 event = 10 : time = 50000001') || die "Early termination signal failed" $?

Expand Down
1 change: 1 addition & 0 deletions FWCore/Framework/test/test_emptyPath.sh
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
# Pass in name and status
function die { echo $1: status $2 ; exit $2; }

LOCAL_TEST_DIR="${CMSSW_BASE}/src/FWCore/Framework/test"
F1=${LOCAL_TEST_DIR}/test_emptyPathWithTask_cfg.py
F2=${LOCAL_TEST_DIR}/test_emptyEndPathWithTask_cfg.py

Expand Down
2 changes: 1 addition & 1 deletion FWCore/Framework/test/test_non_event_ordering.sh
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
# Pass in name and status
function die { echo $1: status $2 ; exit $2; }

TEST_DIR=src/FWCore/Framework/test
TEST_DIR=$CMSSW_BASE/src/FWCore/Framework/test

echo test_non_event_ordering_beginLumi_cfg.py
cmsRun $TEST_DIR/test_non_event_ordering_beginLumi_cfg.py || die "begin Lumi test failed" $?
Expand Down
1 change: 1 addition & 0 deletions FWCore/Framework/test/transition_test.sh
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
# Pass in name and status
function die { echo $1: status $2 ; exit $2; }

LOCAL_TEST_DIR="${CMSSW_BASE}/src/FWCore/Framework/test"
(cmsRun ${LOCAL_TEST_DIR}/transition_test_cfg.py 0 ) || die 'Failure running cmsRun transition_test_cfg.py 0' $?
(cmsRun ${LOCAL_TEST_DIR}/transition_test_cfg.py 1 ) || die 'Failure running cmsRun transition_test_cfg.py 1' $?
(cmsRun ${LOCAL_TEST_DIR}/transition_test_cfg.py 2 ) || die 'Failure running cmsRun transition_test_cfg.py 2' $?
Expand Down