diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/CMakeLists.txt b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/CMakeLists.txt
index 7654abe0716eb8109608a4bf6b841d7ab7f8f78c..d7c0a12dc6bcd9321f3b090d9de2812e47633dbe 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/CMakeLists.txt
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/CMakeLists.txt
@@ -1,10 +1,10 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthenaPoolMultiTest )
# External dependencies:
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
+find_package( CORAL COMPONENTS CoralBase )
# Component(s) in the package:
atlas_add_component( AthenaPoolMultiTest
@@ -16,40 +16,34 @@ atlas_add_component( AthenaPoolMultiTest
# Install files from the package:
atlas_install_joboptions( share/*.py )
-function (athenapoolmultitest_run_test testName jo postScript)
- cmake_parse_arguments( ARG "" "DEPENDS" "" ${ARGN} )
-
- configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/test/athenapoolmultitest_test.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/athenapoolmultitest_${testName}.sh
- @ONLY )
- atlas_add_test( ${testName}
- SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/athenapoolmultitest_${testName}.sh
- POST_EXEC_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/test/${postScript}.sh ${testName} "
- PROPERTIES TIMEOUT 600
- )
- if( ARG_DEPENDS )
- set_tests_properties( AthenaPoolMultiTest_${testName}_ctest
- PROPERTIES DEPENDS AthenaPoolMultiTest_${ARG_DEPENDS}_ctest )
- endif()
-endfunction (athenapoolmultitest_run_test)
-
-athenapoolmultitest_run_test( AthenaPoolMultiTestBuildInput SplittableData_jo
- post_check_bi )
-athenapoolmultitest_run_test( AthenaPoolMultiTestEventSplit EventSplit_jo
- post_check_es
- DEPENDS AthenaPoolMultiTestBuildInput )
-athenapoolmultitest_run_test( AthenaPoolMultiTestEventSplitDecision EventSplitDecision_jo
- post_check_es
- DEPENDS AthenaPoolMultiTestBuildInput )
-athenapoolmultitest_run_test( AthenaPoolMultiTestEventNoSplit EventNoSplit_jo
- post_check_es
- DEPENDS AthenaPoolMultiTestBuildInput )
-athenapoolmultitest_run_test( AthenaPoolMultiTestPropagate DecisionPropagation_jo
- post_check_p
- DEPENDS AthenaPoolMultiTestEventSplitDecision )
-#athenapoolmultitest_run_test( AthenaPoolMultiTestCheckNull CheckNull_jo
-# post_check_cn
-# DEPENDS AthenaPoolMultiTestEventSplit )
-#athenapoolmultitest_run_test( AthenaPoolMultiTestCheckOutput CheckImplicit_jo
-# post_check_co
-# DEPENDS AthenaPoolMultiTestEventSplit )
+# Tests in the package:
+atlas_add_test( AthenaPoolMultiTestBuildInput
+ SCRIPT athena.py AthenaPoolMultiTest/SplittableData_jo.py
+ LOG_SELECT_PATTERN "WriteData|AddTrigMap|Stream1|FullColl|NullColl"
+ LOG_IGNORE_PATTERN "ExampleHit"
+ PROPERTIES TIMEOUT 600 )
+
+atlas_add_test( AthenaPoolMultiTestEventSplit
+ SCRIPT athena.py AthenaPoolMultiTest/EventSplit_jo.py
+ LOG_SELECT_PATTERN "Splitter|Triggered|EventInfoTag|Stream|Coll|Others|Bad"
+ PROPERTIES DEPENDS AthenaPoolMultiTest_AthenaPoolMultiTestBuildInput_ctest
+ PROPERTIES TIMEOUT 600 )
+
+atlas_add_test( AthenaPoolMultiTestEventSplitDecision
+ SCRIPT athena.py AthenaPoolMultiTest/EventSplitDecision_jo.py
+ LOG_SELECT_PATTERN "Splitter|Triggered|EventInfoTag|Stream|Coll|Others|Bad"
+ PROPERTIES DEPENDS AthenaPoolMultiTest_AthenaPoolMultiTestBuildInput_ctest
+ PROPERTIES TIMEOUT 600 )
+
+atlas_add_test( AthenaPoolMultiTestEventNoSplit
+ SCRIPT athena.py AthenaPoolMultiTest/EventNoSplit_jo.py
+ LOG_SELECT_PATTERN "Splitter|Triggered|EventInfoTag|Stream|Coll|Others|Bad"
+ PROPERTIES DEPENDS AthenaPoolMultiTest_AthenaPoolMultiTestBuildInput_ctest
+ PROPERTIES TIMEOUT 600 )
+
+atlas_add_test( AthenaPoolMultiTestPropagate
+ SCRIPT athena.py AthenaPoolMultiTest/DecisionPropagation_jo.py
+ LOG_SELECT_PATTERN "Splitter|Triggered|EventInfoTag|Stream|Coll|Others|Bad"
+ PROPERTIES DEPENDS AthenaPoolMultiTest_AthenaPoolMultiTestEventSplitDecision_ctest
+ PROPERTIES TIMEOUT 600 )
+
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/Count1.py b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/Count1.py
deleted file mode 100755
index 9c88a6a4d4750a6e6987b04b8f1c8ddb78dace89..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/Count1.py
+++ /dev/null
@@ -1,16 +0,0 @@
-## @file CheckEDM.py
-## @brief TopOptions: Check whether simulation output from DC2
-## is still readable.
-## @author Jack Cranshaw Jack.Cranshaw@cern.ch
-## $Id: Count1.py,v 1.2 2008-04-01 19:41:36 cranshaw Exp $
-#--------------------------------------------------------------
-# Event related parameters
-#--------------------------------------------------------------
-#import glob, os, re
-In=['AthenaPoolMultiTest_Split1.root']
-include('AthenaPoolTools/EventCount.py')
-#==============================================================
-#
-# End of job options file
-#
-###############################################################
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/Count2.py b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/Count2.py
deleted file mode 100755
index 26d6a26d5bf4bba7a05961433d20d1d29bf75cf9..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/Count2.py
+++ /dev/null
@@ -1,16 +0,0 @@
-## @file CheckEDM.py
-## @brief TopOptions: Check whether simulation output from DC2
-## is still readable.
-## @author Jack Cranshaw Jack.Cranshaw@cern.ch
-## $Id: Count2.py,v 1.2 2008-04-01 19:41:36 cranshaw Exp $
-#--------------------------------------------------------------
-# Event related parameters
-#--------------------------------------------------------------
-#import glob, os, re
-In=['AthenaPoolMultiTest_Missed.root']
-include('AthenaPoolTools/EventCount.py')
-#==============================================================
-#
-# End of job options file
-#
-###############################################################
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/Count3.py b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/Count3.py
deleted file mode 100755
index c49bac264833a2e01282d85c5ffec3728877fe16..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/Count3.py
+++ /dev/null
@@ -1,16 +0,0 @@
-## @file CheckEDM.py
-## @brief TopOptions: Check whether simulation output from DC2
-## is still readable.
-## @author Jack Cranshaw Jack.Cranshaw@cern.ch
-## $Id: Count3.py,v 1.2 2008-04-01 19:41:36 cranshaw Exp $
-#--------------------------------------------------------------
-# Event related parameters
-#--------------------------------------------------------------
-#import glob, os, re
-In=['AthenaPoolMultiTest_Bad.root']
-include('AthenaPoolTools/EventCount.py')
-#==============================================================
-#
-# End of job options file
-#
-###############################################################
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/clean.sh b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/clean.sh
deleted file mode 100755
index 491731572b2e8656cb3d9ab0ec9c912bb9db928b..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/clean.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/tcsh
-rm -f *.root
-rm -f CL*
-rm -f *.xml*
-rm -f log*
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/AthenaPoolMultiTest.xml b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/AthenaPoolMultiTest.xml
deleted file mode 100644
index 6b77c4ba871e166fc2bd47de2c65a9d3c6ae8a6f..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/AthenaPoolMultiTest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<atn>
- <TEST name="AthenaPoolMultiTest" type="makecheck" suite="Examples">
- <timelimit>20</timelimit>
- <author>Jack Cranshaw</author>
- <mailto>Jack.Cranshaw@cern.ch</mailto>
- <expectations>
- <errorMessage> ERROR</errorMessage>
- <successMessage> OK</successMessage>
- <returnValue>0</returnValue>
- </expectations>
- </TEST>
-</atn>
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/athenapoolmultitest_test.sh.in b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/athenapoolmultitest_test.sh.in
deleted file mode 100755
index 54a553ec63b6c736661f01bfb914ecbabcd6bc11..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/athenapoolmultitest_test.sh.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Turn off pool verbose printing
-export POOL_OUTMSG_LEVEL=4
-
-athena.py AthenaPoolMultiTest/@jo@.py
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/checkImplicit b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/checkImplicit
deleted file mode 100755
index 2cfa80ed543b7ab7982e211365b34450fdc5f934..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/checkImplicit
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-# MAILTO : cranshawset anl.gov
-retcode=3
-#
-# Identify running environment and do setup's
-#
-if [ ${CMTWORK} ]
- then
- echo Identified environment as local work area
- echo Will first source setup.sh in CMTWORK area
- source ${CMTWORK}/TestRelease/*/cmt/setup.sh
- else
- echo Identified environment as nightly tests
- cd ${NIGHTLYAREA}/AtlasRelease/*/run
-fi
-# clean things up
-rm -f checkImplicit*.log
-#
-# Run first test to create dummy data and dummy collection
-#
-echo About to run SplittableData_jo with output in checkImplicit1.log
-if [ ${CMTWORK} ]
- then
- athena.py AthenaPoolMultiTest/SplittableData_jo.py > checkImplicit1.log
- else
- ${NIGHTLYAREA}/InstallArea/share/bin/athena.py AthenaPoolMultiTest/SplittableData_jo.py > checkImplicit1.log
-fi
-#athena.py AthenaPoolMultiTest/SplittableData_jo.py
-# check athena exit code first
-stat=$?
-if [ "$stat" != "0" ]; then
- echo "Athena did not exit properly for checkImplicit1"
-fi
-# Now check log file
-grep -s " ERROR" checkImplicit1.log
-if [ $? = "0" ]; then stat="10"; fi
-grep -s "FullColl INFO Collection Events output: 100" checkImplicit1.log
-if [ $? != "0" ]; then stat="11"; fi
-grep -s "Stream1 INFO Events output: 100" checkImplicit1.log
-if [ $? != "0" ]; then stat="12"; fi
-grep -sq "WriteData INFO Container = 6" checkImplicit1.log
-if [ $? != "0" ]; then stat="13"; fi
-
-if [ "$stat" != "0" ]; then
- echo " ------------------------------------ "
- echo " FAILURE: AthenaPoolMultiTest Stage 1 " $stat
- echo " ------------------------------------ "
- exit $stat
-fi
-#
-# Run data splitting (implicit collections)
-#
-echo About to run EventSplit_jo with output in checkImplicit2.log
-if [ ${CMTWORK} ]
- then
- athena.py AthenaPoolMultiTest/EventSplit_jo.py > checkImplicit2.log
- else
- ${NIGHTLYAREA}/InstallArea/share/bin/athena.py AthenaPoolMultiTest/EventSplit_jo.py > checkImplicit2.log
-fi
-# check athena exit code first
-stat=$?
-if [ "$stat" != "0" ]; then
- echo "Athena did not exit properly for checkImplicit2"
-fi
-# Now check log file
-grep -s " ERROR" checkImplicit2.log
-if [ $? = "0" ]; then stat="20"; fi
-grep -s "Stream1 INFO Events output: 37" checkImplicit2.log
-if [ $? != "0" ]; then stat="21"; fi
-grep -s "Stream2 INFO Events output: 37" checkImplicit2.log
-if [ $? != "0" ]; then stat="22"; fi
-grep -s "Stream3 INFO Events output: 36" checkImplicit2.log
-if [ $? != "0" ]; then stat="23"; fi
-grep -s "Others INFO Events output: 1" checkImplicit2.log
-if [ $? != "0" ]; then stat="24"; fi
-grep -s "Bad INFO Events output: 1" checkImplicit2.log
-if [ $? != "0" ]; then stat="25"; fi
-
-if [ "$stat" != "0" ]; then
- echo " ------------------------------------ "
- echo " FAILURE: AthenaPoolMultiTest Stage 2 " $stat
- echo " ------------------------------------ "
- exit $stat
-fi
-#
-#Check that output is readable
-#
-echo About to run CheckImplicit_jo with output in checkImplicit3.log
-if [ ${CMTWORK} ]
- then
- athena.py AthenaPoolMultiTest/CheckImplicit_jo.py > checkImplicit3.log
- else
- ${NIGHTLYAREA}/InstallArea/share/bin/athena.py AthenaPoolMultiTest/CheckImplicit_jo.py > checkImplicit3.log
-fi
-# check athena exit code first
-stat=$?
-if [ "$stat" != "0" ]; then
- echo "Athena did not exit properly for checkImplicit3"
-fi
-# Now check log file
-grep -s " ERROR" checkImplicit3.log
-if [ $? = "0" ]; then stat="30"; fi
-
-if [ "$stat" != "0" ]; then
- echo " ------------------------------------ "
- echo " FAILURE: AthenaPoolMultiTest Stage 3 " $stat
- echo " ------------------------------------ "
- exit $stat
-fi
-
-exit 0
-#echo Listing files
-#ls -lrt *.root >! logfiles
-
-#ls *.xml >> logfiles
-
-#echo Dumping catalogs
-#cat SplittableData.xml >! logcat
-#cat EventSplit.xml >> logcat
-#cat PoolFileCatalog.xml >> logcat
-
-#exit $stat
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/miniT0 b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/miniT0
deleted file mode 100755
index fc3ba0b82c26b6d065ea16a526596998c7c75fbe..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/miniT0
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-# MAILTO : cranshawset anl.gov
-retcode=3
-#
-# Identify running environment and do setup's
-#
-#if [ ${CMTWORK} ]
-# then
-# echo Identified environment as local work area
-# echo Will first source setup.sh in CMTWORK area
-# source ${CMTWORK}/TestRelease/*/cmt/setup.sh
-# else
-# echo Identified environment as nightly tests
-# cd ${NIGHTLYAREA}/AtlasRelease/*/run
-# exit 99
-#fi
-# clean things up
-rm -f checkImplicit*.log
-#
-# Run first test to create dummy data and dummy collection
-#
-#export POOL_OUTMSG_LEVEL 4
-${NIGHTLYAREA}/AtlasTest/DatabaseTest/AthenaPoolMultiTest/*/scripts/Task1.sh
-${NIGHTLYAREA}/AtlasTest/DatabaseTest/AthenaPoolMultiTest/*/scripts/Task2.sh
-${NIGHTLYAREA}/AtlasTest/DatabaseTest/AthenaPoolMultiTest/*/scripts/Task3.sh
-${NIGHTLYAREA}/AtlasTest/DatabaseTest/AthenaPoolMultiTest/*/scripts/Task4.sh
-${NIGHTLYAREA}/AtlasTest/DatabaseTest/AthenaPoolMultiTest/*/scripts/Task4d5.sh
-
-exit 0
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_bi.sh b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_bi.sh
deleted file mode 100755
index 677204d7a3508db86c69af30da2ee7318595a267..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_bi.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-#/** @file post_check_bi.sh
-# @brief sh script that check the return code of an executable and compares
-# its output with a reference (if available). Modified to restrict checks
-# to output from AthenaPoolMultiTest BuildInput test.
-# @param test_name
-#
-# @author Jack Cranshaw (Jack.Cranshaw@cern.ch), Paolo Calafiura.
-# $Id: post_check_bi.sh,v 1.5 2009-02-13 16:29:40 cranshaw Exp $
-# **/
-test=$1
-status=${?}
-if [ -z "$status" ]
- then
- echo "[93;1m post_check_bi.sh> Warning: athena exit status is not available [m"
-else
- # check exit status
- joblog=${test}.log
- if [ "$status" = 0 ]
- then
- #echo "[92;1m post_check_bi.sh> OK: ${test} exited normally. Output is in $joblog [m"
- reflog=../share/${test}.ref
- grep -e 'WriteData' \
- -e 'AddTrigMap' \
- -e 'Stream1' \
- -e 'FullColl' \
- -e 'NullColl' \
- -e 'ERROR' \
- -e 'Error' \
- ${joblog} > ${joblog}.middle
- grep -v 'ExampleHit' ${joblog}.middle > ${joblog}.small
- joblog=${joblog}.small
- if [ -r $reflog ]
- then
- #echo " post_check_bi.sh> Now comparing output with reference"
-
- # ignore diff annotations
- PP='^---|^[[:digit:]]+[acd,][[:digit:]]+'
- # ignore hex addresses
- PP="$PP"'|0x\w{4,}'
- # ignore package names e.g. Package-00-00-00
- PP="$PP"'|\w+-[[:digit:]]{2}-[[:digit:]]{2}-[[:digit:]]{2}'
- # ignore trunk package names e.g. Package-r123456
- PP="$PP"'|\w+-r[[:digit:]]+'
- # ignore history service
- PP="$PP"'|HistorySvc DEBUG'
- # ignore cpu usage printouts
- PP="$PP"'|ChronoStatSvc +INFO Time'
- PP="$PP"'|Time left.+ Seconds'
- PP="$PP"'|Timeleft.+ sec'
- PP="$PP"'|INFO Time User'
- # ignore clid db file name
- PP="$PP"'|from CLIDDB file'
- # ignore slug machine printout
- PP="$PP"'| Machine: .* System and Processor Info'
- PP="$PP"'| Jobname = .* Machine ='
- # ignore slug pid printout
- PP="$PP"'|Atlas Detector Simulation, Reconstruction and Analysis Running on'
- PP="$PP"'|Program: Slug-Dice-Arecon .+ pid +[[:digit:]]+'
- #ignore DllClassManager DEBUG messages
- PP="$PP"'|DllClassManager DEBUG'
- # ignore slug Library printout
- PP="$PP"'|Library of +[[:digit:]]+ at +[[:digit:]]+'
- PP="$PP"'|Library compiled on +[[:digit:]]'
- # ignore ClassIDSvc "in memory db" printouts
- PP="$PP"'|CLID: .* - type name:'
- # ignore ClassIDSvc "already set" printouts
- PP="$PP"'|ClassIDSvc .* setTypeNameForID: .* already set for'
- # ignore ClassIDSvc finalize output
- PP="$PP"'|ClassIDSvc .* finalize: wrote .*'
- # ignore rcs version comments
- PP="$PP"'|Id: .+ Exp \$'
- # ignore listings
- PP="$PP"'|athena.*listing'
- # ignore ptr values for LArCell
- PP="$PP"'|Found elem'
- # ignore Dict issues
- PP="$PP"'|Dict.so'
- # ignore file names
- PP="$PP"'|Reading file'
- # ignore root collect key
- PP="$PP"'|NewEventCollection.root, recovered'
- # ignore new file catalog messages
- PP="$PP"'|registerPFN'
- # EventSelector sourceID
- PP="$PP"'|Disconnecting input sourceID'
-
- jobdiff=`basename ${joblog}`-todiff
- refdiff=`basename ${reflog}`-todiff
- egrep -a -v "$PP" < $joblog > $jobdiff
- egrep -a -v "$PP" < $reflog > $refdiff
- diff -a -b -E -B -u $jobdiff $refdiff
-
- diffStatus=$?
- if [ $diffStatus -ne 0 ]
- then
- echo "[97;101;1m post_check_bi.sh> ERROR: $joblog and $reflog differ [m"
- exit 1
- else
- true
- #echo "[92;1m post_check_bi.sh> OK: $joblog and $reflog identical [m"
- fi
- else
- tail $joblog
- echo "[93;1m post_check_bi.sh> WARNING: reference output $reflog not available [m"
- echo " post_check_bi.sh> Please check ${PWD}/$joblog"
- exit 1
- fi
- else
- tail $joblog
- echo "[97;101;1m post_check_bi.sh> ERROR: Athena exited abnormally! Exit code: $status [m"
- echo " post_check_bi.sh> Please check ${PWD}/$joblog"
- fi
-fi
-
-# Check output for ERROR/FATAL
-joblog=${test}.log
-#echo
-
-exit $status
-
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_bs.sh b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_bs.sh
deleted file mode 100755
index 2d2afb6040c4b4257292f0b8b5a9c01d191f058b..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_bs.sh
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/sh
-#/** @file post_check_bs.sh
-# @brief sh script that check the return code of an executable and compares
-# its output with a reference (if available). Modified to restrict checks
-# to output from AthenaPoolMultiTest CheckOutput test.
-# @param test_name
-#
-# @author Jack Cranshaw (Jack.Cranshaw@cern.ch), Paolo Calafiura (pcalafiura@lbl.gov).
-# $Id: post_check_bs.sh,v 1.4 2006-04-27 21:03:11 cranshaw Exp $
-# @param test_name
-#
-# @author Paolo Calafiura <pcalafiura@lbl.gov> - ATLAS Collaboration.
-# $Id: post_check_bs.sh,v 1.4 2006-04-27 21:03:11 cranshaw Exp $
-# **/
-test=$1
-status=${?}
-if [ -z "$status" ]
- then
- echo "[93;1m post_check_bs.sh> Warning: athena exit status is not available [m"
-else
- # check exit status
- joblog=${test}.log
- if [ "$status" = 0 ]
- then
- echo "[92;1m post_check_bs.sh> OK: ${test} exited normally. Output is in $joblog [m"
- reflog=../share/${test}.ref
- grep -e 'RunEventTag' \
- -e 'ByteStreamAtt' \
- -e 'ByteStreamEvent' \
- -e 'StoreDump' \
- -e 'StreamBSFileOutput' \
- ${joblog} |\
- grep -v 'EventSelectorAthenaPool' | \
- grep -v 'POOLCollectionID' \
- > ${joblog}.small
- joblog=${joblog}.small
- if [ -r $reflog ]
- then
-# echo " post_check_bs.sh> Now comparing output with reference"
- diff -a -b -B $joblog $reflog |\
- # ignore diff annotations
- egrep -a -v '^---|^[[:digit:]]+[acd,][[:digit:]]+' |\
- # ignore hex addresses
- egrep -a -v ' 0x\w{4,}' |\
- # ignore package names e.g. Package-00-00-00
- egrep -a -v '\w+-[[:digit:]]{2}-[[:digit:]]{2}-[[:digit:]]{2}' |\
- # ignore cpu usage printouts
- egrep -a -v 'ChronoStatSvc +INFO Time' |\
- egrep -a -v 'Time left.+ Seconds' |\
- egrep -a -v 'Timeleft.+ sec' |\
- egrep -a -v 'INFO Time User' |\
- egrep -a -v 'UnixTimestamp' | \
- egrep -a -v 'package version' | \
- # ignore clid db file name
- grep -a -v 'from CLIDDB file' |\
- # ignore slug machine printout
- egrep -a -v ' Machine: .* System and Processor Info' |\
- egrep -a -v ' Jobname = .* Machine =' |\
- # ignore slug pid printout
- grep -a -v 'Atlas Detector Simulation, Reconstruction and Analysis Running on' |\
- egrep -a -v 'Program: Slug-Dice-Arecon .+ pid +[[:digit:]]+' |\
- #ignore DllClassManager DEBUG messages
- egrep -a -v 'DllClassManager DEBUG' |\
- # ignore slug Library printout
- egrep -a -v 'Library of +[[:digit:]]+ at +[[:digit:]]+' |\
- egrep -a -v 'Library compiled on +[[:digit:]]' |\
- # ignore ClassIDSvc "in memory db" printouts
- egrep -a -v 'CLID: .* - type name:' |\
- # ignore ClassIDSvc "already set" printouts
- egrep -a -v 'ClassIDSvc .* setTypeNameForID: .* already set for' |\
- # ignore ClassIDSvc finalize output
- egrep -a -v 'ClassIDSvc * DEBUG finalize: wrote .*' |\
- # ignore rcs version comments
- egrep -a -v 'Id: .+ Exp \$' |\
- # ignore listings
- egrep -a -v 'athena.*listing' |\
- # ignore ptr values for LArCell
- egrep -a -v 'Found elem' |\
- # ignore file names
- egrep -a -v 'Reading file' |\
- # ignore root collect key
- egrep -a -v 'NewEventCollection.root, recovered' |\
- # ignore destructor messages
- egrep -a -v 'destructor'
-
- diffStatus=$?
- if [ $diffStatus -ne 1 ]
- then
- echo "[97;101;1m post_check_bs.sh> ERROR: $joblog and $reflog differ [m"
- exit 1
- else
- echo "[92;1m post_check_bs.sh> OK: $joblog and $reflog identical [m"
- fi
- else
- tail $joblog
- echo "[93;1m post_check_bs.sh> WARNING: reference output $reflog not available [m"
- echo " post_check_bs.sh> Please check ${PWD}/$joblog"
- exit 1
- fi
- else
- tail $joblog
- echo "[97;101;1m post_check_bs.sh> ERROR: Athena exited abnormally! Exit code: $status [m"
- echo " post_check_bs.sh> Please check ${PWD}/$joblog"
- fi
-fi
-
-# Check output for ERROR/FATAL
-joblog=${test}.log
-#echo
-
-exit $status
-
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_ci.sh b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_ci.sh
deleted file mode 100755
index 324d436f35fd2f4bd9cb2d0235cda0bdb9acf884..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_ci.sh
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-#/** @file post_check_ci.sh
-# @brief sh script that check the return code of an executable and compares
-# its output with a reference (if available). Modified to restrict checks
-# to output from AthenaPoolMultiTest CheckOutput test.
-# @param test_name
-#
-# @author Jack Cranshaw (Jack.Cranshaw@cern.ch), Paolo Calafiura (pcalafiura@lbl.gov).
-# $Id: post_check_ci.sh,v 1.6 2009-02-13 16:29:40 cranshaw Exp $
-# @param test_name
-#
-# @author Paolo Calafiura <pcalafiura@lbl.gov> - ATLAS Collaboration.
-# $Id: post_check_ci.sh,v 1.6 2009-02-13 16:29:40 cranshaw Exp $
-# **/
-test=$1
-status=${?}
-if [ -z "$status" ]
- then
- echo "[93;1m post_check_ci.sh> Warning: athena exit status is not available [m"
-else
- # check exit status
- joblog=${test}.log
- if [ "$status" = 0 ]
- then
- #echo "[92;1m post_check_ci.sh> OK: ${test} exited normally. Output is in $joblog [m"
- reflog=../share/${test}.ref
- grep -e 'RegStream1' \
- -e 'RunEventTagWriter' \
- -e 'Splittable' \
- -e 'Nullable' \
- -e 'ERROR' \
- -e 'Error' \
- -e 'EventSelector' ${joblog} |\
- grep -v 'EventSelectorAthenaPool' \
- > ${joblog}.small
- joblog=${joblog}.small
- if [ -r $reflog ]
- then
-# echo " post_check_ci.sh> Now comparing output with reference"
- diff -a -b -B $joblog $reflog |\
- # ignore diff annotations
- egrep -a -v '^---|^[[:digit:]]+[acd,][[:digit:]]+' |\
- # ignore hex addresses
- egrep -a -v ' 0x\w{4,}' |\
- # ignore package names e.g. Package-00-00-00
- egrep -a -v '\w+-[[:digit:]]{2}-[[:digit:]]{2}-[[:digit:]]{2}' |\
- # ignore history service
- egrep -a -v 'HistorySvc DEBUG' |\
- # ignore cpu usage printouts
- egrep -a -v 'ChronoStatSvc +INFO Time' |\
- egrep -a -v 'Time left.+ Seconds' |\
- egrep -a -v 'Timeleft.+ sec' |\
- egrep -a -v 'INFO Time User' |\
- # ignore clid db file name
- grep -a -v 'from CLIDDB file' |\
- # ignore slug machine printout
- egrep -a -v ' Machine: .* System and Processor Info' |\
- egrep -a -v ' Jobname = .* Machine =' |\
- # ignore slug pid printout
- grep -a -v 'Atlas Detector Simulation, Reconstruction and Analysis Running on' |\
- egrep -a -v 'Program: Slug-Dice-Arecon .+ pid +[[:digit:]]+' |\
- #ignore DllClassManager DEBUG messages
- egrep -a -v 'DllClassManager DEBUG' |\
- # ignore slug Library printout
- egrep -a -v 'Library of +[[:digit:]]+ at +[[:digit:]]+' |\
- egrep -a -v 'Library compiled on +[[:digit:]]' |\
- # ignore ClassIDSvc "in memory db" printouts
- egrep -a -v 'CLID: .* - type name:' |\
- # ignore ClassIDSvc "already set" printouts
- egrep -a -v 'ClassIDSvc .* setTypeNameForID: .* already set for' |\
- # ignore ClassIDSvc finalize output
- egrep -a -v 'ClassIDSvc * DEBUG finalize: wrote .*' |\
- # ignore rcs version comments
- egrep -a -v 'Id: .+ Exp \$' |\
- # ignore listings
- egrep -a -v 'athena.*listing' |\
- # ignore ptr values for LArCell
- egrep -a -v 'Found elem' |\
- # ignore file mgr
- egrep -a -v 'FileMgr' |\
- # ignore Dict issues
- egrep -a -v 'Dict.so' |\
- # ignore file names
- egrep -a -v 'Reading file' |\
- # ignore root changes
- egrep -a -v 'RootDBase' |\
- egrep -a -v 'RootDatabase.open' |\
- # ignore root collect key
- egrep -a -v 'NewEventCollection.root, recovered' |\
- # ignore new file catalog messages
- egrep -a -v 'registerPFN' |\
- # EventSelector sourceID
- egrep -a -v 'Disconnecting input sourceID'
-
- diffStatus=$?
- if [ $diffStatus -ne 1 ]
- then
- echo "[97;101;1m post_check_ci.sh> ERROR: $joblog and $reflog differ [m"
- exit 1
- else
- true
- #echo "[92;1m post_check_ci.sh> OK: $joblog and $reflog identical [m"
- fi
- else
- tail $joblog
- echo "[93;1m post_check_ci.sh> WARNING: reference output $reflog not available [m"
- echo " post_check_ci.sh> Please check ${PWD}/$joblog"
- exit 1
- fi
- else
- tail $joblog
- echo "[97;101;1m post_check_ci.sh> ERROR: Athena exited abnormally! Exit code: $status [m"
- echo " post_check_ci.sh> Please check ${PWD}/$joblog"
- fi
-fi
-
-# Check output for ERROR/FATAL
-joblog=${test}.log
-#echo
-
-exit $status
-
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_cn.sh b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_cn.sh
deleted file mode 100755
index f6325806751d3f081f34b0377fbcd94d936c7bb5..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_cn.sh
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/sh
-#/** @file post_check_cn.sh
-# @brief sh script that check the return code of an executable and compares
-# its output with a reference (if available). Modified to restrict checks
-# to output from AthenaPoolMultiTest CheckOutput test.
-# @param test_name
-#
-# @author Jack Cranshaw (Jack.Cranshaw@cern.ch), Paolo Calafiura (pcalafiura@lbl.gov).
-# $Id: post_check_cn.sh,v 1.4 2006-04-27 21:03:11 cranshaw Exp $
-# @param test_name
-#
-# @author Paolo Calafiura <pcalafiura@lbl.gov> - ATLAS Collaboration.
-# $Id: post_check_cn.sh,v 1.4 2006-04-27 21:03:11 cranshaw Exp $
-# **/
-test=$1
-status=${?}
-if [ -z "$status" ]
- then
- echo "[93;1m post_check_cn.sh> Warning: athena exit status is not available [m"
-else
- # check exit status
- joblog=${test}.log
- if [ "$status" = 0 ]
- then
- #echo "[92;1m post_check_cn.sh> OK: ${test} exited normally. Output is in $joblog [m"
- reflog=../share/${test}.ref
- grep -e 'ReadData' \
- -e 'EventSelector' \
- -e 'FullColl' \
- ${joblog} |\
- grep -v 'EventSelectorAthenaPool' | \
- grep -v 'POOLCollectionID' \
- > ${joblog}.small
- joblog=${joblog}.small
- if [ -r $reflog ]
- then
-# echo " post_check_cn.sh> Now comparing output with reference"
- diff -a -b -B $joblog $reflog |\
- # ignore diff annotations
- egrep -a -v '^---|^[[:digit:]]+[acd,][[:digit:]]+' |\
- # ignore hex addresses
- egrep -a -v ' 0x\w{4,}' |\
- # ignore package names e.g. Package-00-00-00
- egrep -a -v '\w+-[[:digit:]]{2}-[[:digit:]]{2}-[[:digit:]]{2}' |\
- # ignore cpu usage printouts
- egrep -a -v 'ChronoStatSvc +INFO Time' |\
- egrep -a -v 'Time left.+ Seconds' |\
- egrep -a -v 'Timeleft.+ sec' |\
- egrep -a -v 'INFO Time User' |\
- egrep -a -v 'UnixTimestamp' | \
- # ignore clid db file name
- grep -a -v 'from CLIDDB file' |\
- # ignore slug machine printout
- egrep -a -v ' Machine: .* System and Processor Info' |\
- egrep -a -v ' Jobname = .* Machine =' |\
- # ignore slug pid printout
- grep -a -v 'Atlas Detector Simulation, Reconstruction and Analysis Running on' |\
- egrep -a -v 'Program: Slug-Dice-Arecon .+ pid +[[:digit:]]+' |\
- #ignore DllClassManager DEBUG messages
- egrep -a -v 'DllClassManager DEBUG' |\
- # ignore slug Library printout
- egrep -a -v 'Library of +[[:digit:]]+ at +[[:digit:]]+' |\
- egrep -a -v 'Library compiled on +[[:digit:]]' |\
- # ignore ClassIDSvc "in memory db" printouts
- egrep -a -v 'CLID: .* - type name:' |\
- # ignore ClassIDSvc "already set" printouts
- egrep -a -v 'ClassIDSvc .* setTypeNameForID: .* already set for' |\
- # ignore ClassIDSvc finalize output
- egrep -a -v 'ClassIDSvc * DEBUG finalize: wrote .*' |\
- # ignore rcs version comments
- egrep -a -v 'Id: .+ Exp \$' |\
- # ignore listings
- egrep -a -v 'athena.*listing' |\
- # ignore ptr values for LArCell
- egrep -a -v 'Found elem' |\
- # ignore Dict issues
- egrep -a -v 'Dict.so' |\
- # ignore file names
- egrep -a -v 'Reading file' |\
- # ignore root collect key
- egrep -a -v 'NewEventCollection.root, recovered' |\
- # ignore destructor messages
- egrep -a -v 'destructor' |\
- egrep -a -v 'Property update' |\
- # ignore new file catalog messages
- egrep -a -v 'registerPFN'
-
- diffStatus=$?
- if [ $diffStatus -ne 1 ]
- then
- echo "[97;101;1m post_check_cn.sh> ERROR: $joblog and $reflog differ [m"
- exit 1
- else
- true
- #echo "[92;1m post_check_cn.sh> OK: $joblog and $reflog identical [m"
- fi
- else
- tail $joblog
- echo "[93;1m post_check_cn.sh> WARNING: reference output $reflog not available [m"
- echo " post_check_cn.sh> Please check ${PWD}/$joblog"
- exit 1
- fi
- else
- tail $joblog
- echo "[97;101;1m post_check_cn.sh> ERROR: Athena exited abnormally! Exit code: $status [m"
- echo " post_check_cn.sh> Please check ${PWD}/$joblog"
- fi
-fi
-
-# Check output for ERROR/FATAL
-joblog=${test}.log
-#echo
-
-exit $status
-
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_co.sh b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_co.sh
deleted file mode 100755
index f1b90d60913c13c7083c588363e171d37a4d24d0..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_co.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-#/** @file post_check_co.sh
-# @brief sh script that check the return code of an executable and compares
-# its output with a reference (if available). Modified to restrict checks
-# to output from AthenaPoolMultiTest CheckOutput test.
-# @param test_name
-#
-# @author Jack Cranshaw (Jack.Cranshaw@cern.ch), Paolo Calafiura (pcalafiura@lbl.gov).
-# $Id: post_check_co.sh,v 1.4 2006-04-27 21:03:11 cranshaw Exp $
-# @param test_name
-#
-# @author Paolo Calafiura <pcalafiura@lbl.gov> - ATLAS Collaboration.
-# $Id: post_check_co.sh,v 1.4 2006-04-27 21:03:11 cranshaw Exp $
-# **/
-test=$1
-status=${?}
-if [ -z "$status" ]
- then
- echo "[93;1m post_check_co.sh> Warning: athena exit status is not available [m"
-else
- # check exit status
- joblog=${test}.log
- if [ "$status" = 0 ]
- then
- #echo "[92;1m post_check_co.sh> OK: ${test} exited normally. Output is in $joblog [m"
- reflog=../share/${test}.ref
- grep -e 'ReadData' \
- -e 'EventSelector' \
- -e 'rimary' \
- -e 'ERROR' \
- -e 'Error' \
- ${joblog} |\
- # Rounding error etc
- sed -e 's/\.\([0-9]\{1\}\)[0-9]*/.\1/g' |\
- sed -e 's/ nan / inf /g' |\
- grep -v 'EventSelectorAthenaPool' | \
- grep -v 'EventBookkeeper' | \
- grep -v 'POOLCollectionID' \
- > ${joblog}.small
- joblog=${joblog}.small
- if [ -r $reflog ]
- then
-# echo " post_check_co.sh> Now comparing output with reference"
- diff -a -b -B $joblog $reflog |\
- # ignore diff annotations
- egrep -a -v '^---|^[[:digit:]]+[acd,][[:digit:]]+' |\
- # ignore hex addresses
- egrep -a -v ' 0x\w{4,}' |\
- # ignore package names e.g. Package-00-00-00
- egrep -a -v '\w+-[[:digit:]]{2}-[[:digit:]]{2}-[[:digit:]]{2}' |\
- # ignore cpu usage printouts
- egrep -a -v 'ChronoStatSvc +INFO Time' |\
- egrep -a -v 'Time left.+ Seconds' |\
- egrep -a -v 'Timeleft.+ sec' |\
- egrep -a -v 'INFO Time User' |\
- egrep -a -v 'UnixTimestamp' | \
- # ignore clid db file name
- grep -a -v 'from CLIDDB file' |\
- # ignore slug machine printout
- egrep -a -v ' Machine: .* System and Processor Info' |\
- egrep -a -v ' Jobname = .* Machine =' |\
- # ignore slug pid printout
- grep -a -v 'Atlas Detector Simulation, Reconstruction and Analysis Running on' |\
- egrep -a -v 'Program: Slug-Dice-Arecon .+ pid +[[:digit:]]+' |\
- #ignore DllClassManager DEBUG messages
- egrep -a -v 'DllClassManager DEBUG' |\
- # ignore slug Library printout
- egrep -a -v 'Library of +[[:digit:]]+ at +[[:digit:]]+' |\
- egrep -a -v 'Library compiled on +[[:digit:]]' |\
- # ignore ClassIDSvc "in memory db" printouts
- egrep -a -v 'CLID: .* - type name:' |\
- # ignore ClassIDSvc "already set" printouts
- egrep -a -v 'ClassIDSvc .* setTypeNameForID: .* already set for' |\
- # ignore ClassIDSvc finalize output
- egrep -a -v 'ClassIDSvc * DEBUG finalize: wrote .*' |\
- # ignore rcs version comments
- egrep -a -v 'Id: .+ Exp \$' |\
- # ignore listings
- egrep -a -v 'athena.*listing' |\
- # ignore ptr values for LArCell
- egrep -a -v 'Found elem' |\
- # ignore Dict issues
- egrep -a -v 'Dict.so' |\
- # ignore file mgr
- egrep -a -v 'FileMgr' |\
- # ignore file names
- egrep -a -v 'Reading file' |\
- # ignore root collect key
- egrep -a -v 'NewEventCollection.root, recovered' |\
- # EventSelector sourceID
- egrep -a -v 'Disconnecting input sourceID'
-
- diffStatus=$?
- if [ $diffStatus -ne 1 ]
- then
- echo "[97;101;1m post_check_co.sh> ERROR: $joblog and $reflog differ [m"
- exit 1
- else
- true
- #echo "[92;1m post_check_co.sh> OK: $joblog and $reflog identical [m"
- fi
- else
- tail $joblog
- echo "[93;1m post_check_co.sh> WARNING: reference output $reflog not available [m"
- echo " post_check_co.sh> Please check ${PWD}/$joblog"
- fi
- else
- tail $joblog
- echo "[97;101;1m post_check_co.sh> ERROR: Athena exited abnormally! Exit code: $status [m"
- echo " post_check_co.sh> Please check ${PWD}/$joblog"
- exit 1
- fi
-fi
-
-# Check output for ERROR/FATAL
-joblog=${test}.log
-#echo
-
-exit $status
-
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_ec.sh b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_ec.sh
deleted file mode 100755
index e82473d34753be71b3427a00175772a0865fa78b..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_ec.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh -xv
-#/** @file post_check_ec.sh
-# @brief sh script that check the return code of an executable and compares
-# its output with a reference (if available). Modified to restrict checks
-# to output from AthenaPoolMultiTest CheckEDM test.
-# @param test_name
-#
-# @author Jack Cranshaw (Jack.Cranshaw@cern.ch), Paolo Calafiura.
-# $Id: post_check_ec.sh,v 1.3 2005-06-27 14:50:24 cranshaw Exp $
-# **/
-test=$1
-status=${?}
-if [ -z "$status" ]
- then
- echo "[93;1m post_check_ec.sh> Warning: athena exit status is not available [m"
-else
- # check exit status
- joblog=${test}.log
- if [ "$status" = 0 ]
- then
- echo "[92;1m post_check_ec.sh> OK: ${test} exited normally. Output is in $joblog [m"
- reflog=../share/${test}.ref
- grep -e 'EventCheck' \
- -e 'EventSelector' \
- ${joblog} > ${joblog}.small
- joblog=${joblog}.small
- if [ -r $reflog ]
- then
-# echo " post_check_ec.sh> Now comparing output with reference"
- diff -a -b -B $joblog $reflog |\
- # ignore diff annotations
- egrep -a -v '^---|^[[:digit:]]+[acd,][[:digit:]]+' |\
- # ignore hex addresses
- egrep -a -v ' 0x\w{4,}' |\
- # ignore package names e.g. Package-00-00-00
- egrep -a -v '\w+-[[:digit:]]{2}-[[:digit:]]{2}-[[:digit:]]{2}' |\
- # ignore cpu usage printouts
- egrep -a -v 'ChronoStatSvc +INFO Time' |\
- egrep -a -v 'Time left.+ Seconds' |\
- egrep -a -v 'Timeleft.+ sec' |\
- egrep -a -v 'INFO Time User' |\
- # ignore clid db file name
- grep -a -v 'from CLIDDB file' |\
- # ignore slug machine printout
- egrep -a -v ' Machine: .* System and Processor Info' |\
- egrep -a -v ' Jobname = .* Machine =' |\
- # ignore slug pid printout
- grep -a -v 'Atlas Detector Simulation, Reconstruction and Analysis Running on' |\
- egrep -a -v 'Program: Slug-Dice-Arecon .+ pid +[[:digit:]]+' |\
- #ignore DllClassManager DEBUG messages
- egrep -a -v 'DllClassManager DEBUG' |\
- # ignore slug Library printout
- egrep -a -v 'Library of +[[:digit:]]+ at +[[:digit:]]+' |\
- egrep -a -v 'Library compiled on +[[:digit:]]' |\
- # ignore ClassIDSvc "in memory db" printouts
- egrep -a -v 'CLID: .* - type name:' |\
- # ignore ClassIDSvc "already set" printouts
- egrep -a -v 'ClassIDSvc .* setTypeNameForID: .* already set for' |\
- # ignore ClassIDSvc finalize output
- egrep -a -v 'ClassIDSvc * DEBUG finalize: wrote .*' |\
- # ignore rcs version comments
- egrep -a -v 'Id: .+ Exp \$' |\
- # ignore listings
- egrep -a -v 'athena.*listing' |\
- # ignore ptr values for LArCell
- egrep -a -v 'Found elem' |\
- # ignore file names
- egrep -a -v 'Reading file' |\
- # ignore root collect key
- egrep -a -v 'NewEventCollection.root, recovered'
-
- diffStatus=$?
- if [ $diffStatus -ne 1 ]
- then
- echo "[97;101;1m post_check_ec.sh> ERROR: $joblog and $reflog differ [m"
- exit 1
- else
- echo "[92;1m post_check_ec.sh> OK: $joblog and $reflog identical [m"
- fi
- else
- tail $joblog
- echo "[93;1m post_check_ec.sh> WARNING: reference output $reflog not available [m"
- echo " post_check_ec.sh> Please check ${PWD}/$joblog"
- exit 1
- fi
- else
- tail $joblog
- echo "[97;101;1m post_check_ec.sh> ERROR: Athena exited abnormally! Exit code: $status [m"
- echo " post_check_ec.sh> Please check ${PWD}/$joblog"
- fi
-fi
-
-# Check output for ERROR/FATAL
-joblog=${test}.log
-echo
-
-exit $status
-
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_ec2.sh b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_ec2.sh
deleted file mode 100755
index 221f68b98ab86e79c7bb0868d0a3d8b8f8bd5dea..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_ec2.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh -xv
-#/** @file post_check_ec.sh
-# @brief sh script that check the return code of an executable and compares
-# its output with a reference (if available). Modified to restrict checks
-# to output from AthenaPoolMultiTest CheckEDM test.
-# @param test_name
-#
-# @author Jack Cranshaw (Jack.Cranshaw@cern.ch), Paolo Calafiura.
-# $Id: post_check_ec2.sh,v 1.2 2005-06-27 14:50:24 cranshaw Exp $
-# **/
-test=$1
-status=${?}
-if [ -z "$status" ]
- then
- echo "[93;1m post_check_ec2.sh> Warning: athena exit status is not available [m"
-else
- # check exit status
- joblog=${test}.log
- if [ "$status" = 0 ]
- then
- echo "[92;1m post_check_ec2.sh> OK: ${test} exited normally. Output is in $joblog [m"
- reflog=../share/${test}.ref
- grep -e 'EventCount' \
- -e 'EventSelector' \
- ${joblog} > ${joblog}.small
- joblog=${joblog}.small
- if [ -r $reflog ]
- then
-# echo " post.sh> Now comparing output with reference"
- diff -a -b -B $joblog $reflog |\
- # ignore diff annotations
- egrep -a -v '^---|^[[:digit:]]+[acd,][[:digit:]]+' |\
- # ignore hex addresses
- egrep -a -v ' 0x\w{4,}' |\
- # ignore package names e.g. Package-00-00-00
- egrep -a -v '\w+-[[:digit:]]{2}-[[:digit:]]{2}-[[:digit:]]{2}' |\
- # ignore cpu usage printouts
- egrep -a -v 'ChronoStatSvc +INFO Time' |\
- egrep -a -v 'Time left.+ Seconds' |\
- egrep -a -v 'Timeleft.+ sec' |\
- egrep -a -v 'INFO Time User' |\
- # ignore clid db file name
- grep -a -v 'from CLIDDB file' |\
- # ignore slug machine printout
- egrep -a -v ' Machine: .* System and Processor Info' |\
- egrep -a -v ' Jobname = .* Machine =' |\
- # ignore slug pid printout
- grep -a -v 'Atlas Detector Simulation, Reconstruction and Analysis Running on' |\
- egrep -a -v 'Program: Slug-Dice-Arecon .+ pid +[[:digit:]]+' |\
- #ignore DllClassManager DEBUG messages
- egrep -a -v 'DllClassManager DEBUG' |\
- # ignore slug Library printout
- egrep -a -v 'Library of +[[:digit:]]+ at +[[:digit:]]+' |\
- egrep -a -v 'Library compiled on +[[:digit:]]' |\
- # ignore ClassIDSvc "in memory db" printouts
- egrep -a -v 'CLID: .* - type name:' |\
- # ignore ClassIDSvc "already set" printouts
- egrep -a -v 'ClassIDSvc .* setTypeNameForID: .* already set for' |\
- # ignore ClassIDSvc finalize output
- egrep -a -v 'ClassIDSvc * DEBUG finalize: wrote .*' |\
- # ignore rcs version comments
- egrep -a -v 'Id: .+ Exp \$' |\
- # ignore listings
- egrep -a -v 'athena.*listing' |\
- # ignore ptr values for LArCell
- egrep -a -v 'Found elem' |\
- # ignore file names
- egrep -a -v 'Reading file' |\
- # ignore root collect key
- egrep -a -v 'NewEventCollection.root, recovered'
-
- diffStatus=$?
- if [ $diffStatus -ne 1 ]
- then
- echo "[97;101;1m post_check_ec2.sh> ERROR: $joblog and $reflog differ [m"
- exit 1
- else
- echo "[92;1m post_check_ec2.sh> OK: $joblog and $reflog identical [m"
- fi
- else
- tail $joblog
- echo "[93;1m post_check_ec2.sh> WARNING: reference output $reflog not available [m"
- echo " post_check_ec2.sh> Please check ${PWD}/$joblog"
- exit 1
- fi
- else
- tail $joblog
- echo "[97;101;1m post_check_ec2.sh> ERROR: Athena exited abnormally! Exit code: $status [m"
- echo " post_check_ec2.sh> Please check ${PWD}/$joblog"
- fi
-fi
-
-# Check output for ERROR/FATAL
-joblog=${test}.log
-echo
-
-exit $status
-
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_eco.sh b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_eco.sh
deleted file mode 100755
index 9fe61c794c7ee68d8f45958ecb1ef653ddc34501..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_eco.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh -xv
-#/** @file post_check_ec.sh
-# @brief sh script that check the return code of an executable and compares
-# its output with a reference (if available). Modified to restrict checks
-# to output from AthenaPoolMultiTest CheckEDM test.
-# @param test_name
-#
-# @author Jack Cranshaw (Jack.Cranshaw@cern.ch), Paolo Calafiura.
-# $Id: post_check_eco.sh,v 1.1 2006-05-03 20:06:24 cranshaw Exp $
-# **/
-test=$1
-status=${?}
-if [ -z "$status" ]
- then
- echo "[93;1m post_check_ec.sh> Warning: athena exit status is not available [m"
-else
- # check exit status
- joblog=${test}.log
- if [ "$status" = 0 ]
- then
- echo "[92;1m post_check_ec.sh> OK: ${test} exited normally. Output is in $joblog [m"
- reflog=../share/${test}.ref
- grep -e 'EventCount' \
- -e 'EventSelector' \
- ${joblog} > ${joblog}.small
- joblog=${joblog}.small
- if [ -r $reflog ]
- then
-# echo " post_check_ec.sh> Now comparing output with reference"
- diff -a -b -B $joblog $reflog |\
- # ignore diff annotations
- egrep -a -v '^---|^[[:digit:]]+[acd,][[:digit:]]+' |\
- # ignore hex addresses
- egrep -a -v ' 0x\w{4,}' |\
- # ignore package names e.g. Package-00-00-00
- egrep -a -v '\w+-[[:digit:]]{2}-[[:digit:]]{2}-[[:digit:]]{2}' |\
- # ignore cpu usage printouts
- egrep -a -v 'ChronoStatSvc +INFO Time' |\
- egrep -a -v 'Time left.+ Seconds' |\
- egrep -a -v 'Timeleft.+ sec' |\
- egrep -a -v 'INFO Time User' |\
- # ignore clid db file name
- grep -a -v 'from CLIDDB file' |\
- # ignore slug machine printout
- egrep -a -v ' Machine: .* System and Processor Info' |\
- egrep -a -v ' Jobname = .* Machine =' |\
- # ignore slug pid printout
- grep -a -v 'Atlas Detector Simulation, Reconstruction and Analysis Running on' |\
- egrep -a -v 'Program: Slug-Dice-Arecon .+ pid +[[:digit:]]+' |\
- #ignore DllClassManager DEBUG messages
- egrep -a -v 'DllClassManager DEBUG' |\
- # ignore slug Library printout
- egrep -a -v 'Library of +[[:digit:]]+ at +[[:digit:]]+' |\
- egrep -a -v 'Library compiled on +[[:digit:]]' |\
- # ignore ClassIDSvc "in memory db" printouts
- egrep -a -v 'CLID: .* - type name:' |\
- # ignore ClassIDSvc "already set" printouts
- egrep -a -v 'ClassIDSvc .* setTypeNameForID: .* already set for' |\
- # ignore ClassIDSvc finalize output
- egrep -a -v 'ClassIDSvc * DEBUG finalize: wrote .*' |\
- # ignore rcs version comments
- egrep -a -v 'Id: .+ Exp \$' |\
- # ignore listings
- egrep -a -v 'athena.*listing' |\
- # ignore ptr values for LArCell
- egrep -a -v 'Found elem' |\
- # ignore file names
- egrep -a -v 'Reading file' |\
- # ignore root collect key
- egrep -a -v 'NewEventCollection.root, recovered'
-
- diffStatus=$?
- if [ $diffStatus -ne 1 ]
- then
- echo "[97;101;1m post_check_ec.sh> ERROR: $joblog and $reflog differ [m"
- exit 1
- else
- echo "[92;1m post_check_ec.sh> OK: $joblog and $reflog identical [m"
- fi
- else
- tail $joblog
- echo "[93;1m post_check_ec.sh> WARNING: reference output $reflog not available [m"
- echo " post_check_ec.sh> Please check ${PWD}/$joblog"
- exit 1
- fi
- else
- tail $joblog
- echo "[97;101;1m post_check_ec.sh> ERROR: Athena exited abnormally! Exit code: $status [m"
- echo " post_check_ec.sh> Please check ${PWD}/$joblog"
- fi
-fi
-
-# Check output for ERROR/FATAL
-joblog=${test}.log
-echo
-
-exit $status
-
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_es.sh b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_es.sh
deleted file mode 100755
index de777596c655ea785b1df5d92f511a3d4749f852..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_es.sh
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/bin/sh
-#/** @file post_check_es.sh
-# @brief sh script that check the return code of an executable and compares
-# its output with a reference (if available). Modified to restrict checks
-# to output from AthenaPoolMultiTest EventSplit test.
-# @param test_name
-#
-# @author Jack Cranshaw (Jack.Cranshaw@cern.ch), Paolo Calafiura.
-# $Id: post_check_es.sh,v 1.6 2009-04-01 21:18:33 cranshaw Exp $
-# **/
-test=$1
-status=${?}
-if [ -z "$status" ]
- then
- echo "[93;1m post_check_es.sh> Warning: athena exit status is not available [m"
-else
- # check exit status
- joblog=${test}.log
- if [ "$status" = 0 ]
- then
- #echo "[92;1m post_check_es.sh> OK: ${test} exited normally. Output is in $joblog [m"
- reflog=../share/${test}.ref
- grep -e 'Splitter' \
- -e 'Triggered' \
- -e 'EventInfoTag' \
- -e 'Stream' \
- -e 'Coll' \
- -e 'Others' \
- -e 'Bad' \
- -e 'ERROR' \
- -e 'Error' \
- ${joblog} |
- grep -v 'Handler' |
- grep -v 'EventSelectorAthenaPool' |\
- grep -v 'CLIDRegistry' |\
- grep -v 'PassNumber' |\
- grep -v 'POOLCollFactory' |\
- grep -v 'PoolXMLFileCatalog' |\
- grep -v 'AthenaSealSvc' |\
- grep -v 'EventBookkeeper' |\
- grep -v 'EventTagWriter' |\
- grep -v 'Py:ConfigurableDb' > ${joblog}.small
- joblog=${joblog}.small
- if [ -r $reflog ]
- then
-# echo " post_check_es.sh> Now comparing output with reference"
- diff -a -b -B $joblog $reflog |\
- # ignore diff annotations
- egrep -a -v '^---|^[[:digit:]]+[acd,][[:digit:]]+' |\
- # ignore hex addresses
- egrep -a -v ' 0x\w{4,}' |\
- # ignore package names e.g. Package-00-00-00
- egrep -a -v '\w+-[[:digit:]]{2}-[[:digit:]]{2}-[[:digit:]]{2}' |\
- # ignore cpu usage printouts
- egrep -a -v 'ChronoStatSvc +INFO Time' |\
- egrep -a -v 'Time left.+ Seconds' |\
- egrep -a -v 'Timeleft.+ sec' |\
- egrep -a -v 'INFO Time User' |\
- egrep -a -v 'OutputStreamSequencerSvc' |\
- # ignore clid db file name
- grep -a -v 'from CLIDDB file' |\
- # ignore slug machine printout
- egrep -a -v ' Machine: .* System and Processor Info' |\
- egrep -a -v ' Jobname = .* Machine =' |\
- # ignore slug pid printout
- grep -a -v 'Atlas Detector Simulation, Reconstruction and Analysis Running on' |\
- egrep -a -v 'Program: Slug-Dice-Arecon .+ pid +[[:digit:]]+' |\
- #ignore DllClassManager DEBUG messages
- egrep -a -v 'DllClassManager DEBUG' |\
- # ignore slug Library printout
- egrep -a -v 'Library of +[[:digit:]]+ at +[[:digit:]]+' |\
- egrep -a -v 'Library compiled on +[[:digit:]]' |\
- # ignore ClassIDSvc "in memory db" printouts
- egrep -a -v 'CLID: .* - type name:' |\
- # ignore ClassIDSvc "already set" printouts
- egrep -a -v 'ClassIDSvc .* setTypeNameForID: .* already set for' |\
- # ignore ClassIDSvc finalize output
- egrep -a -v 'ClassIDSvc * DEBUG finalize: wrote .*' |\
- # ignore rcs version comments
- egrep -a -v 'Id: .+ Exp \$' |\
- # ignore listings
- egrep -a -v 'athena.*listing' |\
- # ignore ptr values for LArCell
- egrep -a -v 'Found elem' |\
- # ignore Dict issues
- egrep -a -v 'Dict.so' |\
- # ignore file mgr
- egrep -a -v 'FileMgr' |\
- # ignore file names
- egrep -a -v 'Reading file' |\
- # ignore root collect key
- egrep -a -v 'NewEventCollection.root, recovered' |\
- # ignore new file catalog messages
- egrep -a -v 'registerPFN' |\
- # ignore root version changes
- egrep -a -v 'File version:' |\
- # output stream helper tools
- egrep -a -v 'Found HelperTools' |\
- # FID changes
- egrep -a -v 'FID ='
-
- diffStatus=$?
- if [ $diffStatus -ne 1 ]
- then
- echo "[97;101;1m post_check_es.sh> ERROR: $joblog and $reflog differ [m"
- exit 1
- else
- true
- #echo "[92;1m post_check_es.sh> OK: $joblog and $reflog identical [m"
- fi
- else
- tail $joblog
- echo "[93;1m post_check_es.sh> WARNING: reference output $reflog not available [m"
- echo " post_check_es.sh> Please check ${PWD}/$joblog"
- exit 1
- fi
- else
- tail $joblog
- echo "[97;101;1m post_check_es.sh> ERROR: Athena exited abnormally! Exit code: $status [m"
- echo " post_check_es.sh> Please check ${PWD}/$joblog"
- fi
-fi
-
-# Check output for ERROR/FATAL
-joblog=${test}.log
-#echo
-
-exit $status
-
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_p.sh b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_p.sh
deleted file mode 100755
index 26638bae3591be66c7e3b3a20977a3620210e758..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_p.sh
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/sh
-#/** @file post_check_es.sh
-# @brief sh script that check the return code of an executable and compares
-# its output with a reference (if available). Modified to restrict checks
-# to output from AthenaPoolMultiTest EventSplit test.
-# @param test_name
-#
-# @author Jack Cranshaw (Jack.Cranshaw@cern.ch), Paolo Calafiura.
-# $Id: post_check_es.sh,v 1.6 2009-04-01 21:18:33 cranshaw Exp $
-# **/
-test=$1
-status=${?}
-if [ -z "$status" ]
- then
- echo "[93;1m post_check_es.sh> Warning: athena exit status is not available [m"
-else
- # check exit status
- joblog=${test}.log
- if [ "$status" = 0 ]
- then
- #echo "[92;1m post_check_es.sh> OK: ${test} exited normally. Output is in $joblog [m"
- reflog=../share/${test}.ref
- grep -e 'Splitter' \
- -e 'Triggered' \
- -e 'EventInfoTag' \
- -e 'Stream' \
- -e 'Coll' \
- -e 'Others' \
- -e 'Bad' \
- -e 'ERROR' \
- -e 'Error' \
- ${joblog} |
- grep -v 'StreamAll2' |
- grep -v 'RootDatabase.open' |
- grep -v 'Handler' |
- grep -v 'EventSelectorAthenaPool' |\
- grep -v 'CLIDRegistry' |\
- grep -v 'PassNumber' |\
- grep -v 'POOLCollFactory' |\
- grep -v 'PoolXMLFileCatalog' |\
- grep -v 'AthenaSealSvc' |\
- grep -v 'EventBookkeeper' |\
- grep -v 'EventTagWriter' |\
- grep -v 'Py:ConfigurableDb' > ${joblog}.small
- joblog=${joblog}.small
- if [ -r $reflog ]
- then
-# echo " post_check_es.sh> Now comparing output with reference"
- diff -a -b -B $joblog $reflog |\
- # ignore diff annotations
- egrep -a -v '^---|^[[:digit:]]+[acd,][[:digit:]]+' |\
- # ignore hex addresses
- egrep -a -v ' 0x\w{4,}' |\
- # ignore package names e.g. Package-00-00-00
- egrep -a -v '\w+-[[:digit:]]{2}-[[:digit:]]{2}-[[:digit:]]{2}' |\
- # ignore cpu usage printouts
- egrep -a -v 'ChronoStatSvc +INFO Time' |\
- egrep -a -v 'Time left.+ Seconds' |\
- egrep -a -v 'Timeleft.+ sec' |\
- egrep -a -v 'INFO Time User' |\
- egrep -a -v 'OutputStreamSequencerSvc' |\
- # ignore clid db file name
- grep -a -v 'from CLIDDB file' |\
- # ignore slug machine printout
- egrep -a -v ' Machine: .* System and Processor Info' |\
- egrep -a -v ' Jobname = .* Machine =' |\
- # ignore slug pid printout
- grep -a -v 'Atlas Detector Simulation, Reconstruction and Analysis Running on' |\
- egrep -a -v 'Program: Slug-Dice-Arecon .+ pid +[[:digit:]]+' |\
- #ignore DllClassManager DEBUG messages
- egrep -a -v 'DllClassManager DEBUG' |\
- # ignore slug Library printout
- egrep -a -v 'Library of +[[:digit:]]+ at +[[:digit:]]+' |\
- egrep -a -v 'Library compiled on +[[:digit:]]' |\
- # ignore ClassIDSvc "in memory db" printouts
- egrep -a -v 'CLID: .* - type name:' |\
- # ignore ClassIDSvc "already set" printouts
- egrep -a -v 'ClassIDSvc .* setTypeNameForID: .* already set for' |\
- # ignore ClassIDSvc finalize output
- egrep -a -v 'ClassIDSvc * DEBUG finalize: wrote .*' |\
- # ignore rcs version comments
- egrep -a -v 'Id: .+ Exp \$' |\
- # ignore listings
- egrep -a -v 'athena.*listing' |\
- # ignore ptr values for LArCell
- egrep -a -v 'Found elem' |\
- # ignore Dict issues
- egrep -a -v 'Dict.so' |\
- # ignore file mgr
- egrep -a -v 'FileMgr' |\
- # ignore file names
- egrep -a -v 'Reading file' |\
- # ignore root collect key
- egrep -a -v 'NewEventCollection.root, recovered' |\
- # ignore new file catalog messages
- egrep -a -v 'registerPFN' |\
- # output stream helper tools
- egrep -a -v 'Found HelperTools'
-
- diffStatus=$?
- if [ $diffStatus -ne 1 ]
- then
- echo "[97;101;1m post_check_es.sh> ERROR: $joblog and $reflog differ [m"
- exit 1
- else
- true
- #echo "[92;1m post_check_es.sh> OK: $joblog and $reflog identical [m"
- fi
- else
- tail $joblog
- echo "[93;1m post_check_es.sh> WARNING: reference output $reflog not available [m"
- echo " post_check_es.sh> Please check ${PWD}/$joblog"
- exit 1
- fi
- else
- tail $joblog
- echo "[97;101;1m post_check_es.sh> ERROR: Athena exited abnormally! Exit code: $status [m"
- echo " post_check_es.sh> Please check ${PWD}/$joblog"
- fi
-fi
-
-# Check output for ERROR/FATAL
-joblog=${test}.log
-#echo
-
-exit $status
-
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_ss.sh b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_ss.sh
deleted file mode 100755
index f1b90d60913c13c7083c588363e171d37a4d24d0..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_ss.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-#/** @file post_check_co.sh
-# @brief sh script that check the return code of an executable and compares
-# its output with a reference (if available). Modified to restrict checks
-# to output from AthenaPoolMultiTest CheckOutput test.
-# @param test_name
-#
-# @author Jack Cranshaw (Jack.Cranshaw@cern.ch), Paolo Calafiura (pcalafiura@lbl.gov).
-# $Id: post_check_co.sh,v 1.4 2006-04-27 21:03:11 cranshaw Exp $
-# @param test_name
-#
-# @author Paolo Calafiura <pcalafiura@lbl.gov> - ATLAS Collaboration.
-# $Id: post_check_co.sh,v 1.4 2006-04-27 21:03:11 cranshaw Exp $
-# **/
-test=$1
-status=${?}
-if [ -z "$status" ]
- then
- echo "[93;1m post_check_co.sh> Warning: athena exit status is not available [m"
-else
- # check exit status
- joblog=${test}.log
- if [ "$status" = 0 ]
- then
- #echo "[92;1m post_check_co.sh> OK: ${test} exited normally. Output is in $joblog [m"
- reflog=../share/${test}.ref
- grep -e 'ReadData' \
- -e 'EventSelector' \
- -e 'rimary' \
- -e 'ERROR' \
- -e 'Error' \
- ${joblog} |\
- # Rounding error etc
- sed -e 's/\.\([0-9]\{1\}\)[0-9]*/.\1/g' |\
- sed -e 's/ nan / inf /g' |\
- grep -v 'EventSelectorAthenaPool' | \
- grep -v 'EventBookkeeper' | \
- grep -v 'POOLCollectionID' \
- > ${joblog}.small
- joblog=${joblog}.small
- if [ -r $reflog ]
- then
-# echo " post_check_co.sh> Now comparing output with reference"
- diff -a -b -B $joblog $reflog |\
- # ignore diff annotations
- egrep -a -v '^---|^[[:digit:]]+[acd,][[:digit:]]+' |\
- # ignore hex addresses
- egrep -a -v ' 0x\w{4,}' |\
- # ignore package names e.g. Package-00-00-00
- egrep -a -v '\w+-[[:digit:]]{2}-[[:digit:]]{2}-[[:digit:]]{2}' |\
- # ignore cpu usage printouts
- egrep -a -v 'ChronoStatSvc +INFO Time' |\
- egrep -a -v 'Time left.+ Seconds' |\
- egrep -a -v 'Timeleft.+ sec' |\
- egrep -a -v 'INFO Time User' |\
- egrep -a -v 'UnixTimestamp' | \
- # ignore clid db file name
- grep -a -v 'from CLIDDB file' |\
- # ignore slug machine printout
- egrep -a -v ' Machine: .* System and Processor Info' |\
- egrep -a -v ' Jobname = .* Machine =' |\
- # ignore slug pid printout
- grep -a -v 'Atlas Detector Simulation, Reconstruction and Analysis Running on' |\
- egrep -a -v 'Program: Slug-Dice-Arecon .+ pid +[[:digit:]]+' |\
- #ignore DllClassManager DEBUG messages
- egrep -a -v 'DllClassManager DEBUG' |\
- # ignore slug Library printout
- egrep -a -v 'Library of +[[:digit:]]+ at +[[:digit:]]+' |\
- egrep -a -v 'Library compiled on +[[:digit:]]' |\
- # ignore ClassIDSvc "in memory db" printouts
- egrep -a -v 'CLID: .* - type name:' |\
- # ignore ClassIDSvc "already set" printouts
- egrep -a -v 'ClassIDSvc .* setTypeNameForID: .* already set for' |\
- # ignore ClassIDSvc finalize output
- egrep -a -v 'ClassIDSvc * DEBUG finalize: wrote .*' |\
- # ignore rcs version comments
- egrep -a -v 'Id: .+ Exp \$' |\
- # ignore listings
- egrep -a -v 'athena.*listing' |\
- # ignore ptr values for LArCell
- egrep -a -v 'Found elem' |\
- # ignore Dict issues
- egrep -a -v 'Dict.so' |\
- # ignore file mgr
- egrep -a -v 'FileMgr' |\
- # ignore file names
- egrep -a -v 'Reading file' |\
- # ignore root collect key
- egrep -a -v 'NewEventCollection.root, recovered' |\
- # EventSelector sourceID
- egrep -a -v 'Disconnecting input sourceID'
-
- diffStatus=$?
- if [ $diffStatus -ne 1 ]
- then
- echo "[97;101;1m post_check_co.sh> ERROR: $joblog and $reflog differ [m"
- exit 1
- else
- true
- #echo "[92;1m post_check_co.sh> OK: $joblog and $reflog identical [m"
- fi
- else
- tail $joblog
- echo "[93;1m post_check_co.sh> WARNING: reference output $reflog not available [m"
- echo " post_check_co.sh> Please check ${PWD}/$joblog"
- fi
- else
- tail $joblog
- echo "[97;101;1m post_check_co.sh> ERROR: Athena exited abnormally! Exit code: $status [m"
- echo " post_check_co.sh> Please check ${PWD}/$joblog"
- exit 1
- fi
-fi
-
-# Check output for ERROR/FATAL
-joblog=${test}.log
-#echo
-
-exit $status
-
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/pre_check.sh b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/pre_check.sh
deleted file mode 100755
index 35bcfacdd423f4ba6eb34c0bd87d9bc5827decbb..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/pre_check.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh -xv
-#
-# echo "Starting pre_check.sh"
-#Cleaning
-#echo "## cleaning"
-test=$1
-/bin/rm -f ${test}.log
-
-# Turn off pool verbose printing
-export POOL_OUTMSG_LEVEL=4
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/pre_check_bs.sh b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/pre_check_bs.sh
deleted file mode 100755
index db7912c48c83e4cdaf43a583d16a7b8771f6f0f1..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/pre_check_bs.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh -xv
-#
-# echo "Starting pre_check.sh"
-#Cleaning
-#echo "## cleaning"
-test=$1
-/bin/rm -f ${test}.log
-/bin/rm -f metatest*.data
-/bin/rm -f PoolFileCatalog.xml
-#
-#echo "## setting up environment "
-# source ../cmt/setup.sh
-#echo "## ready to run"
-#echo $CMTPATH
-#echo $JOBOPTSEARCHPATH
-
-# Turn off pool verbose printing
-export POOL_OUTMSG_LEVEL=4
-
-# For test remove data file
-#echo " For test remove data file"
-#/bin/rm -f SimplePoolFile.root
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/pre_check_ec.sh b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/pre_check_ec.sh
deleted file mode 100755
index 0218868ab3ad5381a25c73293240136b47aabacd..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/pre_check_ec.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh -xv
-# /** @file pre_check_ec.sh
-# @brief generate PoolFileCatalog.xml need by CheckEDM test
-# @param test_name
-#
-# @author Jack Cranshaw (Jack.Cranshaw@cern.ch)
-# $Id: pre_check_ec.sh,v 1.2 2005-01-05 21:13:25 cranshaw Exp $
-##
-# echo "Starting pre_check.sh"
-#Cleaning
-#echo "## cleaning"
-test=$1
-/bin/rm -f ${test}.log
-# Build pool catalog
-cat > PoolFileCatalog.xml <<EOF
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!-- Edited By POOL -->
-<!DOCTYPE POOLFILECATALOG SYSTEM "InMemory">
-<POOLFILECATALOG>
-
- <File ID="740D8273-E5C8-D811-964F-00D0B7B86559">
- <physical>
- <pfn filetype="ROOT_All" name="/afs/cern.ch/atlas/offline/data/testfile/dc2.002885.pyt_z_ee.g4dig805._0001.pool.root"/>
- </physical>
- <logical/>
- </File>
-
-</POOLFILECATALOG>
-EOF
-#
-#echo "## setting up environment "
-# source ../cmt/setup.sh
-#echo "## ready to run"
-#echo $CMTPATH
-#echo $JOBOPTSEARCHPATH
-
-# Turn off pool verbose printing
-export POOL_OUTMSG_LEVEL=4
-
-# For test remove data file
-#echo " For test remove data file"
-#/bin/rm -f SimplePoolFile.root