From a40cd52f7e42994a2c083a2764b3d96a96df6d6c Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Fri, 27 May 2016 17:58:47 +0200
Subject: [PATCH] 'Update test to work with both old and new Gaudi versions (as
we are still building against both).' (EventInfo-00-11-02-10)
* Tagging EventInfo-00-11-02-10.
* test/MergedEventInfo_test.cxx: Update to work with both old and
new Gaudi versions (as we are still building against both).
---
Event/EventInfo/test/MergedEventInfo_test.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Event/EventInfo/test/MergedEventInfo_test.cxx b/Event/EventInfo/test/MergedEventInfo_test.cxx
index f201a41b79da..a06609b573c8 100755
--- a/Event/EventInfo/test/MergedEventInfo_test.cxx
+++ b/Event/EventInfo/test/MergedEventInfo_test.cxx
@@ -15,7 +15,8 @@ using namespace std;
int main() {
cout << "*** MergedEventInfo_test starts ***" << endl;
MergedEventInfo empty;
- assert( static_cast<EventID::number_type>(-1) == empty.event_ID()->run_number() );
+ assert( static_cast<EventID::number_type>(-1) == empty.event_ID()->run_number() || // Gaudi 27
+ 0 == empty.event_ID()->run_number()); // Gaudi 26
EventInfo anInfo(new EventID(1, 23), new EventType(), new TriggerInfo());
MergedEventInfo merged(anInfo, 3, 33);
--
GitLab