From 73e553cb7f008bef7d0e6a688008dd78dec29c1f Mon Sep 17 00:00:00 2001
From: Guilherme Amadio <amadio@cern.ch>
Date: Thu, 19 Apr 2018 15:48:49 +0200
Subject: [PATCH] Revert "Count tasks before launching them in case they are
chained"
This reverts commit 9d226a34507a33407efe47a309bbea9708ed6203.
This interferes with counting the tasks in a way that breaks the test.
---
io/io/test/TBufferMerger.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/io/io/test/TBufferMerger.cxx b/io/io/test/TBufferMerger.cxx
index 284fab88ce7..4707fa987f7 100644
--- a/io/io/test/TBufferMerger.cxx
+++ b/io/io/test/TBufferMerger.cxx
@@ -341,12 +341,12 @@ TEST(TBufferMerger, RegisterCallbackTasks)
TTaskGroup tg;
- /* callback: launch up to two new tasks when called */
+ /* callback: launches new tasks when called */
merger.RegisterCallback([&]() {
int i = 0;
while (launched < tasks && ++i <= 2) {
- ++launched;
tg.Run(task);
+ ++launched;
}
});
--
GitLab