From fe2ac1e29f9fca1b079560430b0c17127b39c4b8 Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Sat, 31 Dec 2022 22:46:26 -0800 Subject: [PATCH 1/6] macOS ctest fixes. --- CMakeLists.txt | 2 +- unittest/check_comp.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3fae6441..30bd53739 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -506,7 +506,7 @@ endif() # Check Octave and C compressed waveforms are about the same add_test(NAME test_OFDM_modem_datac0_compression COMMAND sh -c "cd ${CMAKE_CURRENT_SOURCE_DIR}/unittest; - ./check_comp.sh ${CMAKE_CURRENT_SOURCE_DIR} $PATH:${CMAKE_CURRENT_BINARY_DIR}/src") + ./check_comp.sh ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/src") # ---------------------------------- ofdm_mod/demod level C modem tests ---------------------------------- diff --git a/unittest/check_comp.sh b/unittest/check_comp.sh index caf203cbe..b559a2e10 100755 --- a/unittest/check_comp.sh +++ b/unittest/check_comp.sh @@ -8,7 +8,7 @@ # ../unittest/check_comp.sh ${CODEC2} ${PATH}:${CODEC2}/build_linux/src CODEC2=$1 -PATH=$2 +PATH=$2:$PATH set -x octave_log=$(mktemp) ch_log=$(mktemp) From 9efa605ce039782d69a8ccc92e6ac2fe345dc8bf Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Sun, 1 Jan 2023 00:07:42 -0800 Subject: [PATCH 2/6] Additional macOS test tweaks. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30bd53739..a5d6a16ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1248,7 +1248,7 @@ endif(NOT APPLE) # FEC/acquisition a work out, bursts of 1 frame as that stresses acquisition add_test(NAME test_freedv_data_raw_fsk_ldpc_100 COMMAND sh -c "cd ${CMAKE_CURRENT_BINARY_DIR}/src; - ./freedv_data_raw_tx --testframes 10 --bursts 10 FSK_LDPC /dev/zero - | + ./freedv_data_raw_tx --testframes 10 --bursts 11 FSK_LDPC /dev/zero - | ./ch - - --No -5 --ssbfilt 0 | ./freedv_data_raw_rx --testframes -v FSK_LDPC - /dev/null") set_tests_properties(test_freedv_data_raw_fsk_ldpc_100 PROPERTIES PASS_REGULAR_EXPRESSION "Frms.: 10") From ddec6ae2b4fd0fc1d9cca47b35edc65d5ece19be Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Sun, 1 Jan 2023 01:00:14 -0800 Subject: [PATCH 3/6] Tweak test_freedv_data_raw_fsk_ldpc_100 expected results to allow it to work on macOS and Linux. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5d6a16ee..4a264215c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1248,10 +1248,10 @@ endif(NOT APPLE) # FEC/acquisition a work out, bursts of 1 frame as that stresses acquisition add_test(NAME test_freedv_data_raw_fsk_ldpc_100 COMMAND sh -c "cd ${CMAKE_CURRENT_BINARY_DIR}/src; - ./freedv_data_raw_tx --testframes 10 --bursts 11 FSK_LDPC /dev/zero - | + ./freedv_data_raw_tx --testframes 10 --bursts 10 FSK_LDPC /dev/zero - | ./ch - - --No -5 --ssbfilt 0 | ./freedv_data_raw_rx --testframes -v FSK_LDPC - /dev/null") - set_tests_properties(test_freedv_data_raw_fsk_ldpc_100 PROPERTIES PASS_REGULAR_EXPRESSION "Frms.: 10") + set_tests_properties(test_freedv_data_raw_fsk_ldpc_100 PROPERTIES PASS_REGULAR_EXPRESSION "Frms.: ( 9|10)") # FSK LDPC 1000 bit/s 2FSK, Fs=40kHz, as different configs can upset acquisition add_test(NAME test_freedv_data_raw_fsk_ldpc_1k From 467804cd9517075ecb6659972f139c6b935c3830 Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Sun, 1 Jan 2023 17:49:03 -0800 Subject: [PATCH 4/6] Port over remaining ctest fix. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a264215c..e5f143e93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1248,7 +1248,7 @@ endif(NOT APPLE) # FEC/acquisition a work out, bursts of 1 frame as that stresses acquisition add_test(NAME test_freedv_data_raw_fsk_ldpc_100 COMMAND sh -c "cd ${CMAKE_CURRENT_BINARY_DIR}/src; - ./freedv_data_raw_tx --testframes 10 --bursts 10 FSK_LDPC /dev/zero - | + ./freedv_data_raw_tx --testframes 10 --bursts 11 FSK_LDPC /dev/zero - | ./ch - - --No -5 --ssbfilt 0 | ./freedv_data_raw_rx --testframes -v FSK_LDPC - /dev/null") set_tests_properties(test_freedv_data_raw_fsk_ldpc_100 PROPERTIES PASS_REGULAR_EXPRESSION "Frms.: ( 9|10)") From 5b11cd868c6c320b1a330f2c40d547195b60f979 Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Sun, 1 Jan 2023 17:57:30 -0800 Subject: [PATCH 5/6] Revert "Port over remaining ctest fix." This reverts commit 467804cd9517075ecb6659972f139c6b935c3830. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5f143e93..4a264215c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1248,7 +1248,7 @@ endif(NOT APPLE) # FEC/acquisition a work out, bursts of 1 frame as that stresses acquisition add_test(NAME test_freedv_data_raw_fsk_ldpc_100 COMMAND sh -c "cd ${CMAKE_CURRENT_BINARY_DIR}/src; - ./freedv_data_raw_tx --testframes 10 --bursts 11 FSK_LDPC /dev/zero - | + ./freedv_data_raw_tx --testframes 10 --bursts 10 FSK_LDPC /dev/zero - | ./ch - - --No -5 --ssbfilt 0 | ./freedv_data_raw_rx --testframes -v FSK_LDPC - /dev/null") set_tests_properties(test_freedv_data_raw_fsk_ldpc_100 PROPERTIES PASS_REGULAR_EXPRESSION "Frms.: ( 9|10)") From 3d03d2b8bca59772e5f58f2e3a7cb44693f3045d Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Sat, 31 Dec 2022 01:57:13 -0800 Subject: [PATCH 6/6] ofdm_destroy() should be done after we're finished with the ofdm object. --- src/ofdm_demod.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ofdm_demod.c b/src/ofdm_demod.c index 364d53678..04eb5150f 100644 --- a/src/ofdm_demod.c +++ b/src/ofdm_demod.c @@ -634,8 +634,6 @@ int main(int argc, char *argv[]) { f++; } - ofdm_destroy(ofdm); - if (input_specified == true) fclose(fin); @@ -695,5 +693,7 @@ int main(int argc, char *argv[]) { fprintf(stderr, "Npre.....: %6d Npost: %5d uw_fails: %2d\n", ofdm->pre, ofdm->post, ofdm->uw_fails); } + ofdm_destroy(ofdm); + return ret; }