diff --git a/CMakeLists.txt b/CMakeLists.txt index 8beb1f4a..2c5f4ad2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,6 +80,6 @@ add_test(NAME 001_highsnr_virtual3_P_P_MM PATH=$PATH:${CODEC2_BUILD_DIR}/src; cd ${CMAKE_CURRENT_SOURCE_DIR}/test/001_highsnr_stdio_audio; ./test_virtual_mm.sh") - set_tests_properties(001_highsnr_virtual3_P_P_MM PROPERTIES PASS_REGULAR_EXPRESSION "RECEIVED BURSTS: 5 RECEIVED FRAMES: 10 RX_ERRORS: 0") + set_tests_properties(001_highsnr_virtual3_P_P_MM PROPERTIES PASS_REGULAR_EXPRESSION "DATAC0: 2/4 DATAC1: 2/4 DATAC3: 2/4") endif() diff --git a/test/001_highsnr_stdio_audio/test_virtual_mm.sh b/test/001_highsnr_stdio_audio/test_virtual_mm.sh index 186c334e..5460ba2a 100755 --- a/test/001_highsnr_stdio_audio/test_virtual_mm.sh +++ b/test/001_highsnr_stdio_audio/test_virtual_mm.sh @@ -11,19 +11,22 @@ function check_alsa_loopback { fi } +myInterruptHandler() +{ + exit 1 +} + check_alsa_loopback RX_LOG=$(mktemp) +trap myInterruptHandler SIGINT + # make sure all child processes are killed when we exit trap 'jobs -p | xargs -r kill' EXIT -python3 test_multimode_rx.py --timeout 30 --framesperburst 2 --bursts 1 --audiodev -2 --debug & +python3 test_multimode_rx.py --timeout 60 --framesperburst 2 --bursts 2 --audiodev -2 & rx_pid=$! sleep 1 -python3 test_multimode_tx.py --framesperburst 2 --bursts 1 --audiodev -2 - -#tail -f ${RX_LOG} | sed '/RECEIVED BURSTS/ q' - - +python3 test_multimode_tx.py --framesperburst 2 --bursts 2 --audiodev -2 --delay 500 wait ${rx_pid}