From d0897aee98537ca832c7019af1ab5cf51fb6e5dc Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Mon, 13 Jan 2014 16:42:36 +0000
Subject: [PATCH] Task #5291: tMACfeedback and tstartBGL cannot run
 concurrently, because they're using the same port to connect to the mock
 OnlineControl process (thanks for choosing a port based on obs-id :( ). The
 robust way to fix this is to enforce serialization (which I have done). The
 other (less robust) solution would be to change the obs-id in one of the
 parsets.

---
 RTCP/Cobalt/GPUProc/test/CMakeLists.txt   | 2 ++
 RTCP/Cobalt/GPUProc/test/tMACfeedback.run | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/RTCP/Cobalt/GPUProc/test/CMakeLists.txt b/RTCP/Cobalt/GPUProc/test/CMakeLists.txt
index 9ec33813aff..997e4f479a4 100644
--- a/RTCP/Cobalt/GPUProc/test/CMakeLists.txt
+++ b/RTCP/Cobalt/GPUProc/test/CMakeLists.txt
@@ -33,6 +33,8 @@ set_tests_properties(
   tCorrelate_3sec_2st_5sb
   tBeamform_1sec_1st_5sb_noflagging
   tBeamform_incoherent_2sec_1st_5sb_noflagging
+  tstartBGL
+  tMACfeedback
   PROPERTIES RUN_SERIAL ON
 )
 
diff --git a/RTCP/Cobalt/GPUProc/test/tMACfeedback.run b/RTCP/Cobalt/GPUProc/test/tMACfeedback.run
index c1ae9a9011c..5530205d329 100755
--- a/RTCP/Cobalt/GPUProc/test/tMACfeedback.run
+++ b/RTCP/Cobalt/GPUProc/test/tMACfeedback.run
@@ -28,10 +28,12 @@ wait $ONLINECONTROL_PID
 ONLINECONTROLRESULT=$?
 
 if [ $OBSRESULT -gt 0 ]; then
+  echo "runObservation.sh failed (status: $OBSRESULT)"
   exit $OBSRESULT
 fi
 
 if [ $ONLINECONTROLRESULT -gt 0 ]; then
+  echo "MockOnlineControl.sh failed (status: $ONLINECONTROLRESULT)"
   exit $ONLINECONTROLRESULT
 fi
 
-- 
GitLab