diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_post.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_post.sh index 2943920d18297cee2f788a659bbbe7ffa2c33c93..1c49e6c80a1b3d391c75f7b123527bc22651711e 100755 --- a/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_post.sh +++ b/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_post.sh @@ -110,7 +110,7 @@ fi if [ -f ${REGTESTREF} ]; then echo $(date "+%FT%H:%M %Z")" Running regtest using reference file ${REGTESTREF}" - timeout 5m regtest.pl --inputfile ${REGTESTREF_BASENAME} --reffile ${REGTESTREF} --linematch ".*" 2>&1 | tee regtest.log + timeout 5m regtest.py --inputfile ${REGTESTREF_BASENAME} --reffile ${REGTESTREF} --linematch ".*" 2>&1 | tee regtest.log echo "art-result: ${PIPESTATUS[0]} RegTest" else echo $(date "+%FT%H:%M %Z")" The reference file does not exist: ${REGTESTREF}" diff --git a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py index b4fbfea84dbe06a17c4007b91d65c3cb01c63a27..740a423ba22b8189727087b8b4085e5ad41da965 100644 --- a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py +++ b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py @@ -251,7 +251,7 @@ class RegTestStep(RefComparisonStep): def __init__(self, name='RegTest'): super(RegTestStep, self).__init__(name) self.regex = 'REGTEST' - self.executable = 'regtest.pl' + self.executable = 'regtest.py' self.input_base_name = 'athena' self.args += ' --linematch ".*"' self.auto_report_result = True diff --git a/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh b/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh index 7ad7aab2551cafee3bce9fa6762f01cbca36503a..c4539e3f56a68e99c322eed1e5cd2f32df20e34b 100755 --- a/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh +++ b/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh @@ -71,7 +71,7 @@ grep REGTEST athena.log > athena.regtest if [ -f ${REF_FOLDER}/athena.regtest ]; then echo $(date "+%FT%H:%M %Z")" Running regtest" - timeout 5m regtest.pl --inputfile athena.regtest --reffile ${REF_FOLDER}/athena.regtest 2>&1 | tee regtest.log + timeout 5m regtest.py --inputfile athena.regtest --reffile ${REF_FOLDER}/athena.regtest 2>&1 | tee regtest.log echo "art-result: ${PIPESTATUS[0]} RegTest" else echo $(date "+%FT%H:%M %Z")" No reference athena.regtest found in ${REF_FOLDER}"