Skip to content
Snippets Groups Projects
Commit b21b0bf5 authored by Auke Klazema's avatar Auke Klazema
Browse files

Merge branch 'cherry-pick-dc8e4fe3' into 'LOFAR-Release-4_0'

COB-69: Merge branch 'COB-69-fix-tests' into 'LOFAR-Release-4_0'

See merge request !58
parents 1e830d81 0309e3f7
No related branches found
No related tags found
2 merge requests!59Merge LOFAR-Release-4_0 into master,!58COB-69: Merge branch 'COB-69-fix-tests' into 'LOFAR-Release-4_0'
Showing
with 158 additions and 155 deletions
#!/bin/bash #!/bin/bash
source MessageFuncs.sh source MessageFuncs.sh
create_queue lofar.task.feedback.dataproducts create_queue otdb.task.feedback.dataproducts
# remove any output files from prev runs # remove any output files from prev runs
rm -rf tManyPartTABOutput-data/ rm -rf tManyPartTABOutput-data/
......
#!/bin/bash #!/bin/bash
source MessageFuncs.sh source MessageFuncs.sh
create_queue lofar.task.feedback.dataproducts create_queue otdb.task.feedback.dataproducts
# remove any output files from prev runs # remove any output files from prev runs
rm -f tMultiPartTABOutput-L123881_SAP000_B000_P00?_bf.h5 tMultiPartTABOutput-L123881_SAP000_B000_P00?_bf.raw rm -f tMultiPartTABOutput-L123881_SAP000_B000_P00?_bf.h5 tMultiPartTABOutput-L123881_SAP000_B000_P00?_bf.raw
......
...@@ -8,7 +8,7 @@ PID_ID=$! # get the PID ...@@ -8,7 +8,7 @@ PID_ID=$! # get the PID
source MessageFuncs.sh source MessageFuncs.sh
# Empty queues (if any) # Empty queues (if any)
create_queue lofar.task.feedback.dataproducts create_queue otdb.task.feedback.dataproducts
# Start the test # Start the test
tStorageProcesses || exit 1 tStorageProcesses || exit 1
...@@ -16,7 +16,7 @@ wait $PID_ID ...@@ -16,7 +16,7 @@ wait $PID_ID
# Validate queues # Validate queues
if have_qpid; then if have_qpid; then
recv_msg lofar.task.feedback.dataproducts > tStorageProcesses.queue recv_msg otdb.task.feedback.dataproducts > tStorageProcesses.queue
compare_msg $srcdir/tStorageProcesses.queue tStorageProcesses.queue || exit 1 compare_msg $srcdir/tStorageProcesses.queue tStorageProcesses.queue || exit 1
fi fi
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
...@@ -11,7 +11,6 @@ endforeach() ...@@ -11,7 +11,6 @@ endforeach()
set(_tests set(_tests
tgenerateStationStreams tgenerateStationStreams
tStatusFeedback tStatusFeedback
tProductionParsets
tstartBGL tstartBGL
) )
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment