From b3e5bbe4e9bce0c3c8e113aa876051184f705c58 Mon Sep 17 00:00:00 2001
From: John Derek Chapman <chapman@hep.phy.cam.ac.uk>
Date: Fri, 22 Feb 2019 10:17:36 +0000
Subject: [PATCH] Merge branch 'TAT-fixBStest' into '21.3'
Fixes for Trigger TrigAnalysisTest BS ART tests
See merge request atlas/athena!21326
(cherry picked from commit 3fbc1796f9a513036468080db74ca9e24f6a7b3f)
98777324 Fixes for Trigger TrigAnalysisTest BS ART tests
4067ce92 fix typo grid->build
---
Control/CxxUtils/CxxUtils/ATLAS_CHECK_THREAD_SAFETY | 0
.../test/test_physics_pp_v7_rdotobstoesd_build.sh | 2 +-
.../TrigAnalysisTest/test/test_run1_bstoesdaod_build.sh | 3 +--
3 files changed, 2 insertions(+), 3 deletions(-)
mode change 100755 => 100644 Control/CxxUtils/CxxUtils/ATLAS_CHECK_THREAD_SAFETY
diff --git a/Control/CxxUtils/CxxUtils/ATLAS_CHECK_THREAD_SAFETY b/Control/CxxUtils/CxxUtils/ATLAS_CHECK_THREAD_SAFETY
old mode 100755
new mode 100644
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotobstoesd_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotobstoesd_build.sh
index baa5b204770..967ff8d8ee3 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotobstoesd_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotobstoesd_build.sh
@@ -28,7 +28,7 @@ export EVENTS="3"
export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoBS.py"
source exec_athena_art_trigger_validation.sh
-athena.py -c "jp.AthenaCommonFlags.BSRDOInput=['raw.data']" testAthenaTrigBStoESD.py | tee ${JOB_LOG%%.*}2.${JOB_LOG#*.}
+athena.py -c "jp.AthenaCommonFlags.BSRDOInput=['raw.data']" TrigAnalysisTest/testAthenaTrigBStoESD.py | tee ${JOB_LOG%%.*}2.${JOB_LOG#*.}
echo "art-result: ${PIPESTATUS[0]} ${JOB_LOG%%.*}2"
source exec_art_triggertest_post.sh
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_run1_bstoesdaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_run1_bstoesdaod_build.sh
index c1e0221acd4..4a3fa15424b 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_run1_bstoesdaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_run1_bstoesdaod_build.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Trigger test on Run 1 Bytestream data
-# art-type: grid
+# art-type: build
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.0-TrigMC/Athena
@@ -50,5 +50,4 @@ else
echo "art-result: xAODContainers 1"
fi
-source exec_athena_art_trigger_validation.sh
source exec_art_triggertest_post.sh
--
GitLab