diff --git a/CMakeLists.txt b/CMakeLists.txt index c0c4b291..94967586 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,7 @@ add_test(NAME 001_highsnr_virtual2_P_P PATH=$PATH:${CODEC2_BUILD_DIR}/src; cd ${CMAKE_CURRENT_SOURCE_DIR}/test/001_highsnr_stdio_audio; ./test_virtual2.sh") - set_tests_properties(001_highsnr_virtual2_P_P PROPERTIES PASS_REGULAR_EXPRESSION "RECEIVED BURSTS: 5 RECEIVED FRAMES: 10 RX_ERRORS: 0") + set_tests_properties(001_highsnr_virtual2_P_P PROPERTIES PASS_REGULAR_EXPRESSION "RECEIVED BURSTS: 3 RECEIVED FRAMES: 6 RX_ERRORS: 0") # Multimode test with Python I/O add_test(NAME 001_highsnr_virtual3_P_P_MM diff --git a/test/001_highsnr_stdio_audio/test_virtual1.sh b/test/001_highsnr_stdio_audio/test_virtual1.sh index 00e09b84..dcb46693 100755 --- a/test/001_highsnr_stdio_audio/test_virtual1.sh +++ b/test/001_highsnr_stdio_audio/test_virtual1.sh @@ -20,8 +20,8 @@ MAX_RUN_TIME=2600 # make sure all child processes are killed when we exit trap 'jobs -p | xargs -r kill' EXIT -arecord --device="plughw:CARD=CHAT2,DEV=0" -f S16_LE -d $MAX_RUN_TIME | python3 test_rx.py --mode datac0 --frames 2 --bursts 5 --debug & +arecord --device="plughw:CARD=CHAT2,DEV=0" -r 48000 -f S16_LE -d $MAX_RUN_TIME | python3 test_rx.py --mode datac0 --frames 2 --bursts 5 --debug & rx_pid=$! sleep 1 -python3 test_tx.py --mode datac0 --frames 2 --bursts 5 --delay 500 | aplay --device="plughw:CARD=CHAT2,DEV=1" -f S16_LE +python3 test_tx.py --mode datac0 --frames 2 --bursts 5 --delay 500 | aplay --device="plughw:CARD=CHAT2,DEV=1" -r 48000 -f S16_LE wait ${rx_pid} diff --git a/test/001_highsnr_stdio_audio/test_virtual2.sh b/test/001_highsnr_stdio_audio/test_virtual2.sh index d3e5522b..5176040a 100755 --- a/test/001_highsnr_stdio_audio/test_virtual2.sh +++ b/test/001_highsnr_stdio_audio/test_virtual2.sh @@ -13,13 +13,11 @@ function check_alsa_loopback { check_alsa_loopback -RX_LOG=$(mktemp) - # make sure all child processes are killed when we exit trap 'jobs -p | xargs -r kill' EXIT -python3 test_rx.py --mode datac0 --frames 2 --bursts 5 --audiodev -2 --debug --timeout 20 & +python3 test_rx.py --mode datac0 --frames 2 --bursts 3 --audiodev -2 --debug & rx_pid=$! sleep 1 -python3 test_tx.py --mode datac0 --frames 2 --bursts 5 --delay 250 --audiodev -2 +python3 test_tx.py --mode datac0 --frames 2 --bursts 3 --audiodev -2 wait ${rx_pid}