From a935003f19b098a43832a4633acad40644f54532 Mon Sep 17 00:00:00 2001 From: Jan David Mol <mol@astron.nl> Date: Wed, 4 Feb 2015 12:24:16 +0000 Subject: [PATCH] Task #7350: Show all queues that fail to match in output --- SubSystems/Online_Cobalt/test/runtest.sh.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/SubSystems/Online_Cobalt/test/runtest.sh.in b/SubSystems/Online_Cobalt/test/runtest.sh.in index 3050c1ada71..7287a02c518 100755 --- a/SubSystems/Online_Cobalt/test/runtest.sh.in +++ b/SubSystems/Online_Cobalt/test/runtest.sh.in @@ -65,11 +65,16 @@ echo " in directory $(pwd)" mkdir "queues" || error "Failed to create temporary directory ${OUTDIR}/queues" echo "[ -d ${PWD}/queues ] && cp -r ${PWD}/queues ${REFDIR}" >> accept_output QUEUES=`cd ${REFDIR}/queues 2>/dev/null && ls` + INCORRECT_QUEUES="" for Q in $QUEUES; do echo "Comparing output of queue $Q" @QPID_RECEIVE_EXECUTABLE@ -b 127.0.0.1 -a $Q --ignore-reply-to > queues/$Q || error "Could not read output of queue $Q" - diff ${REFDIR}/queues/$Q queues/$Q || error "Output of queue $Q does not match" + diff ${REFDIR}/queues/$Q queues/$Q || INCORRECT_QUEUES+="$Q " done + + if [ "$INCORRECT_QUEUES" != "" ]; then + error "Output of queue(s) $INCORRECT_QUEUES do(es) not match" + fi fi ) || exit 1 -- GitLab