Merge pull request #376 from drowe67/ms-macos-ctest

Fix macOS ctest failures

Author: drowe67

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 ----------------------------------
 
@@ -1251,7 +1251,7 @@ endif(NOT APPLE)
                             ./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

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;
 }

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)