From 09090d40b3083cc5b196f3f536625f309dddc19e Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Tue, 3 Mar 2020 00:24:13 +0100
Subject: [PATCH] Revert "Move from perl RegTest to python version"
This reverts commit 596875314b6fd57f825b58409eda3a6f78b41a4b.
---
.../TrigUpgradeTest/test/exec_TrigUpgradeTest_art_post.sh | 2 +-
.../TrigValTools/python/TrigValSteering/CheckSteps.py | 2 +-
.../TriggerTest/test/exec_art_triggertest_post.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_post.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_post.sh
index 1c49e6c80a1..2943920d182 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.py --inputfile ${REGTESTREF_BASENAME} --reffile ${REGTESTREF} --linematch ".*" 2>&1 | tee regtest.log
+ timeout 5m regtest.pl --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 c41f3cb56bf..68a35e8069f 100644
--- a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
+++ b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
@@ -262,7 +262,7 @@ class RegTestStep(RefComparisonStep):
def __init__(self, name='RegTest'):
super(RegTestStep, self).__init__(name)
self.regex = 'REGTEST'
- self.executable = 'regtest.py'
+ self.executable = 'regtest.pl'
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 c4539e3f56a..7ad7aab2551 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.py --inputfile athena.regtest --reffile ${REF_FOLDER}/athena.regtest 2>&1 | tee regtest.log
+ timeout 5m regtest.pl --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}"
--
GitLab