Merge branch 'Upgrade_UT' into 'master'

Convert ATN tests to unit tests

See merge request !707

Trigger/TrigSteer/ViewAlgsTest/share/BasicMTTrackingTrigger.py

@@ -225,7 +225,7 @@ topSequence += InDetSiTrackerSpacePointFinder
 from TrigFastTrackFinder.TrigFastTrackFinderMT_Config import TrigFastTrackFinderMT_eGamma
 theFTFMT = TrigFastTrackFinderMT_eGamma()
 
-topSequence += theFTFMT
+#topSequence += theFTFMT
 log.info(theFTFMT)
 
 #probably initialized only in trigger=True?

Trigger/TrigSteer/ViewAlgsTest/share/ID_RawDataMT_Trigger.py

@@ -280,6 +280,6 @@ from TrigFastTrackFinder.TrigFastTrackFinderMT_Config import TrigFastTrackFinder
 theFTFMT = TrigFastTrackFinderMT_eGamma()
 theFTFMT.outputLevel=VERBOSE
 
-topSequence += theFTFMT
+#topSequence += theFTFMT
 
 

Trigger/TrigSteer/ViewAlgsTest/share/caloRoIData.dat

-1.3,2.9,2704088841,EM3,EM7; 1.2,3.1,2972524297,EM3,EM7,EM10 
+1.3,2.9,2704088841,EM3,EM7
+1.2,3.1,2972524297,EM3,EM7,EM10 

Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt

@@ -6,7 +6,19 @@
 atlas_subdir( TrigUpgradeTest )
 
 # Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          TestPolicy
-                          )
-atlas_install_runtime( test/TrigUpgradeTest_TestConfiguration.xml )
+#atlas_depends_on_subdirs( PUBLIC
+#                          TestPolicy
+#                          )
+
+atlas_add_test( GraphView1 SCRIPT scripts/GraphView.sh
+                ENVIRONMENT THREADS=1     )
+atlas_add_test( GraphView2 SCRIPT scripts/GraphView.sh
+                ENVIRONMENT THREADS=2     )
+atlas_add_test( GraphView64 SCRIPT scripts/GraphView.sh
+                ENVIRONMENT THREADS=64              )
+
+atlas_add_test( IDRunMC     SCRIPT scripts/IDRunMC.sh
+                )
+atlas_add_test( IDRunData     SCRIPT scripts/IDRunData.sh
+                )
+

Trigger/TrigValidation/TrigUpgradeTest/scripts/GraphView.sh

+get_files -data menuData.dat
+athena.py --threads=$THREADS AthViews/GraphViews.py

Trigger/TrigValidation/TrigUpgradeTest/scripts/IDRunData.sh

+#!/usr/bin/env sh
+get_files -xmls LVL1config_Physics_pp_v7.xml
+athena.py --threads=1 ViewAlgsTest/ID_RawDataMT_Trigger.py

Trigger/TrigValidation/TrigUpgradeTest/scripts/IDRunMC.sh

+get_files -xmls LVL1config_Physics_pp_v7.xml
+get_files -data caloRoIData.dat
+source RecExCommon_links.sh
+athena.py --threads=1 ViewAlgsTest/BasicMTTrackingTrigger.py

Trigger/TrigValidation/TrigUpgradeTest/scripts/menuRun.sh

+get_files -data menuData.dat
+get_files -xmls LVL1config_Physics_pp_v7.xml
+get_files -xmls HLTTestMenu.xml
+athena.py ViewAlgsTest/menuRun.py

Trigger/TrigValidation/TrigUpgradeTest/test/TrigUpgradeTest_TestConfiguration.xml

-<?xml version="1.0"?>  
-<!DOCTYPE unifiedTestConfiguration SYSTEM "http://www.hep.ucl.ac.uk/atlas/AtlasTesting/DTD/unifiedTestConfiguration.dtd">
-<!--
- ***************************************************************************
- *
- *               TrigP1Test_TestConfiguration.xml.autoconf
- *
- * This file is used as input to test-xml-autoconf.py during the build.
- * It will create TrigP1Test_TestConfiguraton.xml on-the-fly, which is
- * used by ATN and RTT tests.
- *
- * For detailed syntax see: TrigValTools/bin/test-xml-autoconf.py
- *
- ***************************************************************************
- -->
-<!-- NB validate this file here before commiting to svn:
- /afs/cern.ch/user/r/rtt/public/xmlvalidate.py TrigP1Test_TestConfiguration.xml
- -->
-
-<unifiedTestConfiguration>
-    
-    <atn>
-        <TEST name="menuRun" type="script" suite="TUT">
-            <options_atn>get_files -xmls LVL1config_Physics_pp_v7.xml; get_files -xmls HLTTestMenu.xml; athena.py ViewAlgsTest/menuRun.py</options_atn>
-            <timelimit>5</timelimit>
-            <expectations>
-                <returnValue>0</returnValue>
-            </expectations>
-        </TEST>
-        <TEST name="IDRunMC" type="script" suite="TUT">
-            <options_atn>get_files -xmls LVL1config_Physics_pp_v7.xml; get_files -data caloRoIData.dat; athena.py --threads=1 ViewAlgsTest/BasicMTTrackingTrigger.py</options_atn>
-            <timelimit>20</timelimit>
-            <expectations>
-                <returnValue>0</returnValue>
-            </expectations>
-        </TEST>
-        <TEST name="IDRunData" type="script" suite="TUT">
-            <options_atn>get_files -xmls LVL1config_Physics_pp_v7.xml; athena.py --threads=1 ViewAlgsTest/ID_RawDataMT_Trigger.py</options_atn>
-            <timelimit>20</timelimit>
-            <expectations>
-                <returnValue>0</returnValue>
-            </expectations>
-        </TEST>
-        <TEST name="GraphView1" type="script" suite="TUT">
-            <options_atn>athena.py --threads=1 AthViews/GraphViews.py </options_atn>
-            <timelimit>5</timelimit>
-            <expectations>
-                <returnValue>0</returnValue>
-            </expectations>
-        </TEST>
-        <TEST name="GraphView2" type="script" suite="TUT">
-            <options_atn>athena.py --threads=2 AthViews/GraphViews.py </options_atn>
-            <timelimit>5</timelimit>
-            <expectations>
-                <returnValue>0</returnValue>
-            </expectations>
-        </TEST>
-        <TEST name="GraphView64" type="script" suite="TUT">
-            <options_atn>athena.py --threads=64 AthViews/GraphViews.py </options_atn>
-            <timelimit>5</timelimit>
-            <expectations>
-                <returnValue>0</returnValue>
-            </expectations>
-        </TEST>
-    </atn>
-    
-</unifiedTestConfiguration>