Commit 3efa0465 authored by Marco Clemencic's avatar Marco Clemencic
Browse files

renamed property "Atomic" of GaudiSequencer to "Sequential"

required to be able to use !305
parent 85138e25
...@@ -75,7 +75,7 @@ private: ...@@ -75,7 +75,7 @@ private:
GaudiSequencer& operator=( const GaudiSequencer& a ) = delete; GaudiSequencer& operator=( const GaudiSequencer& a ) = delete;
Gaudi::Property<std::vector<std::string>> m_names{this, "Members", {}, "list of algorithms"}; Gaudi::Property<std::vector<std::string>> m_names{this, "Members", {}, "list of algorithms"};
Gaudi::Property<bool> m_atomic{this, "Atomic", false, "Atomic sequence: don't unroll in MT"}; Gaudi::Property<bool> m_sequential{this, "Sequential", false, "execute members one at a time"};
Gaudi::Property<bool> m_modeOR{this, "ModeOR", false, "use OR logic instead of AND"}; Gaudi::Property<bool> m_modeOR{this, "ModeOR", false, "use OR logic instead of AND"};
Gaudi::Property<bool> m_ignoreFilter{this, "IgnoreFilterPassed", false, "always continue"}; Gaudi::Property<bool> m_ignoreFilter{this, "IgnoreFilterPassed", false, "always continue"};
Gaudi::Property<bool> m_measureTime{this, "MeasureTime", false, "measure time"}; Gaudi::Property<bool> m_measureTime{this, "MeasureTime", false, "measure time"};
......
...@@ -66,9 +66,9 @@ gaudi_add_test(AtlasMCRecoScenario ...@@ -66,9 +66,9 @@ gaudi_add_test(AtlasMCRecoScenario
TIMEOUT 120) TIMEOUT 120)
set_property(TEST GaudiHive.AtlasMCRecoScenario PROPERTY SKIP_RETURN_CODE 77) set_property(TEST GaudiHive.AtlasMCRecoScenario PROPERTY SKIP_RETURN_CODE 77)
# Test the AtomicSequencer # Test the SequentialSequencer
gaudi_add_test(AtomicSequencer gaudi_add_test(SequentialSequencer
FRAMEWORK options/AtomicAlgSequencerTest.py FRAMEWORK options/SequentialAlgSequencerTest.py
DEPENDS WhiteBoard DEPENDS WhiteBoard
TIMEOUT 120) TIMEOUT 120)
......
...@@ -76,7 +76,7 @@ for algo in [a3]: ...@@ -76,7 +76,7 @@ for algo in [a3]:
seq = GaudiSequencer("CriticalSection", seq = GaudiSequencer("CriticalSection",
Members=[a1,a2,a4], Members=[a1,a2,a4],
Atomic=True, Sequential=True,
OutputLevel=VERBOSE) OutputLevel=VERBOSE)
# Application Manager ---------------------------------------------------------- # Application Manager ----------------------------------------------------------
......
...@@ -8,8 +8,8 @@ Commit Id: $Format:%H$ ...@@ -8,8 +8,8 @@ Commit Id: $Format:%H$
- Merge branch 'update-test-exclusions' into 'master' - Merge branch 'update-test-exclusions' into 'master'
Hide new proprty "Atomic" in tests Hide new property "Sequential" in tests
See merge request !301 See merge request !306
! 2017-03-01 - Marco Clemencic (commit bf940c1) ! 2017-03-01 - Marco Clemencic (commit bf940c1)
......
...@@ -847,7 +847,7 @@ lineSkipper = LineSkipper(["//GP:", ...@@ -847,7 +847,7 @@ lineSkipper = LineSkipper(["//GP:",
r"Property(.*)'AuditRe(start|initialize)':", # these were missing in tools r"Property(.*)'AuditRe(start|initialize)':", # these were missing in tools
r"Property(.*)'IsIOBound':", r"Property(.*)'IsIOBound':",
r"Property(.*)'ErrorCount(er)?':", # removed with gaudi/Gaudi!273 r"Property(.*)'ErrorCount(er)?':", # removed with gaudi/Gaudi!273
r"Property(.*)'Atomic':", # added with gaudi/Gaudi!287 r"Property(.*)'Sequential':", # added with gaudi/Gaudi!306
# ignore uninteresting/obsolete messages # ignore uninteresting/obsolete messages
r"Property update for OutputLevel : new value =", r"Property update for OutputLevel : new value =",
r"EventLoopMgr\s*DEBUG Creating OutputStream", r"EventLoopMgr\s*DEBUG Creating OutputStream",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment