From d8521f74f1b4bfffea18fe489d54d7d317007139 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 15 Jun 2017 15:36:43 +0200 Subject: [PATCH] tests: make pipe-loopback-socket-full more robust --- tests/integration/pipe-loopback-shmem.sh | 2 +- tests/integration/pipe-loopback-socket-full.sh | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/integration/pipe-loopback-shmem.sh b/tests/integration/pipe-loopback-shmem.sh index 395b9125d..81db13082 100755 --- a/tests/integration/pipe-loopback-shmem.sh +++ b/tests/integration/pipe-loopback-shmem.sh @@ -62,7 +62,7 @@ if (( ${RC} != 0 )); then cat ${OUTPUT_FILE} exit ${RC} else - echo "=========== Sub-test succeeded for: ${LAYER} ${HEADER} ${ENDIAN} ${VERIFY_SOURCE}" + echo "=========== Sub-test succeeded for: polling=${POLLING}, vecotrize=${VECTORIZE}" fi done; done diff --git a/tests/integration/pipe-loopback-socket-full.sh b/tests/integration/pipe-loopback-socket-full.sh index d80e67bfe..0bc3df499 100755 --- a/tests/integration/pipe-loopback-socket-full.sh +++ b/tests/integration/pipe-loopback-socket-full.sh @@ -93,11 +93,13 @@ EOF villas-pipe -r ${CONFIG_FILE} node2 > ${OUTPUT_FILE} & PID=$! -sleep 0.1 +sleep 0.5 # We delay EOF of the INPUT_FILE by 1 second in order to wait for incoming data to be received villas-pipe -s ${CONFIG_FILE} node1 < ${INPUT_FILE} +sleep 0.5 + kill ${PID} # Comapre data @@ -105,7 +107,7 @@ villas-test-cmp ${INPUT_FILE} ${OUTPUT_FILE} RC=$? if (( ${RC} != 0 )); then - echo "=========== Sub-test failed for: ${LAYER} ${HEADER} ${ENDIAN} ${VERIFY_SOURCE}" + echo "=========== Sub-test failed for: layer=${LAYER}, header=${HEADER}, endian=${ENDIAN} verify_source=${VERIFY_SOURCE}" cat ${CONFIG_FILE} echo cat ${INPUT_FILE} @@ -113,7 +115,7 @@ if (( ${RC} != 0 )); then cat ${OUTPUT_FILE} exit ${RC} else - echo "=========== Sub-test succeeded for: ${LAYER} ${HEADER} ${ENDIAN} ${VERIFY_SOURCE}" + echo "=========== Sub-test succeeded for: layer=${LAYER}, header=${HEADER}, endian=${ENDIAN} verify_source=${VERIFY_SOURCE}" fi done; done; done; done