From 885700d138a6d128041194711caa57e97d596fef Mon Sep 17 00:00:00 2001 From: charlie-foxtrot <13514783+charlie-foxtrot@users.noreply.github.com> Date: Sat, 27 May 2023 20:38:46 -0700 Subject: [PATCH 1/8] add integration tests workflow --- .devcontainer/Dockerfile.ubuntu-20.04 | 2 +- .devcontainer/Dockerfile.ubuntu-latest | 2 +- .devcontainer/devcontainer.json | 3 +- .github/install_dependencies | 4 +- .github/workflows/integration_tests.yml | 23 ++++++++++ .gitignore | 2 + integration_tests/run | 58 +++++++++++++++++++++++++ 7 files changed, 89 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/integration_tests.yml create mode 100755 integration_tests/run diff --git a/.devcontainer/Dockerfile.ubuntu-20.04 b/.devcontainer/Dockerfile.ubuntu-20.04 index 20d5880..b466ed4 100644 --- a/.devcontainer/Dockerfile.ubuntu-20.04 +++ b/.devcontainer/Dockerfile.ubuntu-20.04 @@ -1,7 +1,7 @@ FROM ubuntu:20.04 RUN apt-get update && \ - apt-get install -y + apt-get upgrade -y RUN sed -i 's/^# \(.*export LS_OPTIONS.*$\)/\1/g' ~/.bashrc && \ sed -i 's/^# \(.*alias ll.*$\)/\1/g' ~/.bashrc diff --git a/.devcontainer/Dockerfile.ubuntu-latest b/.devcontainer/Dockerfile.ubuntu-latest index e9f5ebc..60bdd95 100644 --- a/.devcontainer/Dockerfile.ubuntu-latest +++ b/.devcontainer/Dockerfile.ubuntu-latest @@ -1,7 +1,7 @@ FROM ubuntu:latest RUN apt-get update && \ - apt-get install -y + apt-get upgrade -y RUN sed -i 's/^# \(.*export LS_OPTIONS.*$\)/\1/g' ~/.bashrc && \ sed -i 's/^# \(.*alias ll.*$\)/\1/g' ~/.bashrc diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 099ffa2..751106f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -21,7 +21,8 @@ "ms-vscode.cpptools-extension-pack", "twxs.cmake", "streetsidesoftware.code-spell-checker", - "ms-azuretools.vscode-docker" + "ms-azuretools.vscode-docker", + "github.vscode-github-actions" ] } }, diff --git a/.github/install_dependencies b/.github/install_dependencies index 31147d0..c179468 100755 --- a/.github/install_dependencies +++ b/.github/install_dependencies @@ -8,12 +8,12 @@ case "${unameOut}" in Linux*) echo "Installing Linux dependencies" sudo apt-get update -y - sudo apt-get install -y \ + sudo apt-get install -y --no-install-recommends \ build-essential \ cmake \ libmp3lame-dev \ libshout3-dev \ - libconfig++-dev \ + 'libconfig++-dev' \ libfftw3-dev \ librtlsdr-dev \ libsoapysdr-dev \ diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml new file mode 100644 index 0000000..6b0c469 --- /dev/null +++ b/.github/workflows/integration_tests.yml @@ -0,0 +1,23 @@ +name: Integration Tests + +on: + push: + branches: [main, unstable] + pull_request: + schedule: + - cron: '39 13 * * *' # run daily + +jobs: + build: + runs-on: [rpi3b] + timeout-minutes: 25 + steps: + - name: Checkout repository + uses: actions/checkout@main + + - name: Install packaged dependencies + run: .github/install_dependencies + + - name: Integration Tests + run: | + integration_tests/run diff --git a/.gitignore b/.gitignore index 2f6658a..32a0aad 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ build*/ .cache compile_commands.json rtl_airband*.log +integration_tests/rpiv2 +integration_tests/native diff --git a/integration_tests/run b/integration_tests/run new file mode 100755 index 0000000..5ce8568 --- /dev/null +++ b/integration_tests/run @@ -0,0 +1,58 @@ +#!/bin/bash + +set -x +set -e + +REPO_DIR=$(readlink -f `dirname ${0}`/../) + +INTEGRATION_TESTS_DIR=${REPO_DIR}/integration_tests + +function run_rtl_airband { + BIN_PATH=$1 + CONFIG_PATH=$2 + OUTPUT_DIR=$3 + + mkdir -p ${OUTPUT_DIR} + pushd ${OUTPUT_DIR} + + # run for 30 seconds then send kill command + ${BIN_PATH} -c ${CONFIG_PATH} -F & + PID=$! + sleep 30 + kill $PID + + # wait 5 seconds for files to be closed and renamed + sleep 5 + + popd + +} + +# build a version that uses the Broadcom VideoCore GPU +GPU_BUILD_DIR=${INTEGRATION_TESTS_DIR}/rpiv2 +cmake -B ${GPU_BUILD_DIR} -DNFM=TRUE -DPLATFORM=rpiv2 -DCMAKE_BUILD_TYPE=Release +VERBOSE=1 cmake --build ${GPU_BUILD_DIR} -j2 + +# make sure the binary is linking about the GPU library +ldd ${GPU_BUILD_DIR}/src/rtl_airband | grep libbcm_host + + +# build a version that uses FFTW +FFTW_BUILD_DIR=${INTEGRATION_TESTS_DIR}/native +cmake -B ${FFTW_BUILD_DIR} -DNFM=TRUE -DPLATFORM=native -DCMAKE_BUILD_TYPE=Release +VERBOSE=1 cmake --build ${FFTW_BUILD_DIR} -j2 + +# make sure the binary is linking against the FFTW library +ldd ${FFTW_BUILD_DIR}/src/rtl_airband | grep libfft3f + +# make a work dir +WORK_DIR=${INTEGRATION_TESTS_DIR}/work +rm -rf ${WORK_DIR} || true + + +# run the noaa config twice, once for each binary +GPU_WORK_DIR=${WORK_DIR}/gpu/ +FFTW_WORK_DIR=${WORK_DIR}/fftw/ +run_rtl_airband ${GPU_BUILD_DIR}/src/rtl_airband ${INTEGRATION_TESTS_DIR}/configs/noaa.conf ${GPU_WORK_DIR} +run_rtl_airband ${FFTW_BUILD_DIR}/src/rtl_airband ${INTEGRATION_TESTS_DIR}/configs/noaa.conf ${FFTW_WORK_DIR} + From 212a80df88329dc574561ffa27c3db616053e230 Mon Sep 17 00:00:00 2001 From: charlie-foxtrot <13514783+charlie-foxtrot@users.noreply.github.com> Date: Sat, 27 May 2023 20:43:44 -0700 Subject: [PATCH 2/8] fixup --- integration_tests/configs/noaa.conf | 137 ++++++++++++++++++++++++++++ integration_tests/run | 12 ++- 2 files changed, 144 insertions(+), 5 deletions(-) create mode 100644 integration_tests/configs/noaa.conf diff --git a/integration_tests/configs/noaa.conf b/integration_tests/configs/noaa.conf new file mode 100644 index 0000000..44c016e --- /dev/null +++ b/integration_tests/configs/noaa.conf @@ -0,0 +1,137 @@ +fft_size = 1024; +localtime = true; +multiple_demod_threads = true; +multiple_output_threads = true; +devices: +( + { + type = "rtlsdr"; + serial = "device1"; + gain = 19.7; + centerfreq = 162.00000; + correction = 0; + sample_rate = 2.40; + channels: + ( + { + freq = 162.40000; + label = "NOAA 162.400 (162.40000)"; + modulation = "nfm"; + lowpass = -1; + highpass = -1; + bandwidth = 5000; + squelch_snr_threshold = 0.00; + outputs: + ( + { + type = "file"; + directory = "/app/integration_tests/work/"; + filename_template = "NOAA_162.400"; + } + ); + }, + { + freq = 162.42500; + label = "NOAA 162.425 (162.42500)"; + modulation = "nfm"; + lowpass = -1; + highpass = -1; + bandwidth = 5000; + squelch_snr_threshold = 0.00; + outputs: + ( + { + type = "file"; + directory = "/app/integration_tests/work/"; + filename_template = "NOAA_162.425"; + } + ); + }, + { + freq = 162.45000; + label = "NOAA 162.450 (162.45000)"; + modulation = "nfm"; + lowpass = -1; + highpass = -1; + bandwidth = 5000; + squelch_snr_threshold = 0.00; + outputs: + ( + { + type = "file"; + directory = "/app/integration_tests/work/"; + filename_template = "NOAA_162.450"; + } + ); + }, + { + freq = 162.47500; + label = "NOAA 162.475 (162.47500)"; + modulation = "nfm"; + lowpass = -1; + highpass = -1; + bandwidth = 5000; + squelch_snr_threshold = 0.00; + outputs: + ( + { + type = "file"; + directory = "/app/integration_tests/work/"; + filename_template = "NOAA_162.475"; + } + ); + }, + { + freq = 162.50000; + label = "NOAA 162.500 (162.50000)"; + modulation = "nfm"; + lowpass = -1; + highpass = -1; + bandwidth = 5000; + squelch_snr_threshold = 0.00; + outputs: + ( + { + type = "file"; + directory = "/app/integration_tests/work/"; + filename_template = "NOAA_162.500"; + } + ); + }, + { + freq = 162.52500; + label = "NOAA 162.525 (162.52500)"; + modulation = "nfm"; + lowpass = -1; + highpass = -1; + bandwidth = 5000; + squelch_snr_threshold = 0.00; + outputs: + ( + { + type = "file"; + directory = "/app/integration_tests/work/"; + filename_template = "NOAA_162.525"; + } + ); + }, + { + freq = 162.55000; + label = "NOAA 162.550 (162.55000)"; + modulation = "nfm"; + lowpass = -1; + highpass = -1; + bandwidth = 5000; + squelch_snr_threshold = 0.00; + outputs: + ( + { + type = "file"; + directory = "/app/integration_tests/work/"; + filename_template = "NOAA_162.550"; + } + ); + } + ); + } +); diff --git a/integration_tests/run b/integration_tests/run index 5ce8568..10787b1 100755 --- a/integration_tests/run +++ b/integration_tests/run @@ -3,10 +3,6 @@ set -x set -e -REPO_DIR=$(readlink -f `dirname ${0}`/../) - -INTEGRATION_TESTS_DIR=${REPO_DIR}/integration_tests - function run_rtl_airband { BIN_PATH=$1 CONFIG_PATH=$2 @@ -28,6 +24,12 @@ function run_rtl_airband { } +REPO_DIR=$(readlink -f `dirname ${0}`/../) + +INTEGRATION_TESTS_DIR=${REPO_DIR}/integration_tests + +cd ${REPO_DIR} + # build a version that uses the Broadcom VideoCore GPU GPU_BUILD_DIR=${INTEGRATION_TESTS_DIR}/rpiv2 cmake -B ${GPU_BUILD_DIR} -DNFM=TRUE -DPLATFORM=rpiv2 -DCMAKE_BUILD_TYPE=Release @@ -43,7 +45,7 @@ cmake -B ${FFTW_BUILD_DIR} -DNFM=TRUE -DPLATFORM=native -DCMAKE_BUILD_TYPE=Relea VERBOSE=1 cmake --build ${FFTW_BUILD_DIR} -j2 # make sure the binary is linking against the FFTW library -ldd ${FFTW_BUILD_DIR}/src/rtl_airband | grep libfft3f +ldd ${FFTW_BUILD_DIR}/src/rtl_airband | grep libfftw3f # make a work dir WORK_DIR=${INTEGRATION_TESTS_DIR}/work From 02db3d51a0bcf5962244574614402ed964e7dd73 Mon Sep 17 00:00:00 2001 From: charlie-foxtrot <13514783+charlie-foxtrot@users.noreply.github.com> Date: Mon, 29 May 2023 08:51:23 -0700 Subject: [PATCH 3/8] run both rtlsdr and soapysdr --- integration_tests/configs/noaa.conf | 162 +++++++++++++++++++++++++--- integration_tests/run | 43 ++++++-- 2 files changed, 178 insertions(+), 27 deletions(-) diff --git a/integration_tests/configs/noaa.conf b/integration_tests/configs/noaa.conf index 44c016e..cb3b8c0 100644 --- a/integration_tests/configs/noaa.conf +++ b/integration_tests/configs/noaa.conf @@ -1,4 +1,4 @@ -fft_size = 1024; +fft_size = 512; localtime = true; multiple_demod_threads = true; multiple_output_threads = true; @@ -7,7 +7,7 @@ devices: { type = "rtlsdr"; serial = "device1"; - gain = 19.7; + gain = 16.6; centerfreq = 162.00000; correction = 0; sample_rate = 2.40; @@ -25,8 +25,8 @@ devices: ( { type = "file"; - directory = "/app/integration_tests/work/"; - filename_template = "NOAA_162.400"; + directory = "./"; + filename_template = "NOAA_162.400_rtlsdr"; } ); }, @@ -42,8 +42,8 @@ devices: ( { type = "file"; - directory = "/app/integration_tests/work/"; - filename_template = "NOAA_162.425"; + directory = "./"; + filename_template = "NOAA_162.425_rtlsdr"; } ); }, @@ -59,8 +59,8 @@ devices: ( { type = "file"; - directory = "/app/integration_tests/work/"; - filename_template = "NOAA_162.450"; + directory = "./"; + filename_template = "NOAA_162.450_rtlsdr"; } ); }, @@ -76,8 +76,8 @@ devices: ( { type = "file"; - directory = "/app/integration_tests/work/"; - filename_template = "NOAA_162.475"; + directory = "./"; + filename_template = "NOAA_162.475_rtlsdr"; } ); }, @@ -93,8 +93,8 @@ devices: ( { type = "file"; - directory = "/app/integration_tests/work/"; - filename_template = "NOAA_162.500"; + directory = "./"; + filename_template = "NOAA_162.500_rtlsdr"; } ); }, @@ -110,8 +110,8 @@ devices: ( { type = "file"; - directory = "/app/integration_tests/work/"; - filename_template = "NOAA_162.525"; + directory = "./"; + filename_template = "NOAA_162.525_rtlsdr"; } ); }, @@ -127,8 +127,138 @@ devices: ( { type = "file"; - directory = "/app/integration_tests/work/"; - filename_template = "NOAA_162.550"; + directory = "./"; + filename_template = "NOAA_162.550_rtlsdr"; + } + ); + } + ); + }, + { + type = "soapysdr"; + device_string = "driver=airspy,device_id=0"; + gain = 16.6; + centerfreq = 162.00000; + correction = 0; + sample_rate = 3.0; + channels: + ( + { + freq = 162.40000; + label = "NOAA 162.400 (162.40000)"; + modulation = "nfm"; + lowpass = -1; + highpass = -1; + bandwidth = 5000; + squelch_snr_threshold = 0.00; + outputs: + ( + { + type = "file"; + directory = "./"; + filename_template = "NOAA_162.400_soapysdr"; + } + ); + }, + { + freq = 162.42500; + label = "NOAA 162.425 (162.42500)"; + modulation = "nfm"; + lowpass = -1; + highpass = -1; + bandwidth = 5000; + squelch_snr_threshold = 0.00; + outputs: + ( + { + type = "file"; + directory = "./"; + filename_template = "NOAA_162.425_soapysdr"; + } + ); + }, + { + freq = 162.45000; + label = "NOAA 162.450 (162.45000)"; + modulation = "nfm"; + lowpass = -1; + highpass = -1; + bandwidth = 5000; + squelch_snr_threshold = 0.00; + outputs: + ( + { + type = "file"; + directory = "./"; + filename_template = "NOAA_162.450_soapysdr"; + } + ); + }, + { + freq = 162.47500; + label = "NOAA 162.475 (162.47500)"; + modulation = "nfm"; + lowpass = -1; + highpass = -1; + bandwidth = 5000; + squelch_snr_threshold = 0.00; + outputs: + ( + { + type = "file"; + directory = "./"; + filename_template = "NOAA_162.475_soapysdr"; + } + ); + }, + { + freq = 162.50000; + label = "NOAA 162.500 (162.50000)"; + modulation = "nfm"; + lowpass = -1; + highpass = -1; + bandwidth = 5000; + squelch_snr_threshold = 0.00; + outputs: + ( + { + type = "file"; + directory = "./"; + filename_template = "NOAA_162.500_soapysdr"; + } + ); + }, + { + freq = 162.52500; + label = "NOAA 162.525 (162.52500)"; + modulation = "nfm"; + lowpass = -1; + highpass = -1; + bandwidth = 5000; + squelch_snr_threshold = 0.00; + outputs: + ( + { + type = "file"; + directory = "./"; + filename_template = "NOAA_162.525_soapysdr"; + } + ); + }, + { + freq = 162.55000; + label = "NOAA 162.550 (162.55000)"; + modulation = "nfm"; + lowpass = -1; + highpass = -1; + bandwidth = 5000; + squelch_snr_threshold = 0.00; + outputs: + ( + { + type = "file"; + directory = "./"; + filename_template = "NOAA_162.550_soapysdr"; } ); } diff --git a/integration_tests/run b/integration_tests/run index 10787b1..cb407fa 100755 --- a/integration_tests/run +++ b/integration_tests/run @@ -12,7 +12,7 @@ function run_rtl_airband { pushd ${OUTPUT_DIR} # run for 30 seconds then send kill command - ${BIN_PATH} -c ${CONFIG_PATH} -F & + ${BIN_PATH} -c ${CONFIG_PATH} -F -e & PID=$! sleep 30 kill $PID @@ -20,18 +20,43 @@ function run_rtl_airband { # wait 5 seconds for files to be closed and renamed sleep 5 + # make sure there is at least one NOAA channel that generated an MP3 longer + # than 15 seconds for each rtl and soapy (not 30 seconds because of startup time) + check_length '*_rtlsdr_*.mp3' + check_length '*_soapysdr_*.mp3' + popd } +function check_length { + + for i in $@ ; do + + seconds=$(ffmpeg -i $i -f null - 2>&1 | grep time | awk '{print $2}' | cut -d ':' -f 3) + echo "$i is $seconds sec long" + if (( $(echo "$seconds > 15.0" | bc -l) )); then + return 0 + fi + + done + + return -1 + +} + REPO_DIR=$(readlink -f `dirname ${0}`/../) INTEGRATION_TESTS_DIR=${REPO_DIR}/integration_tests +# make a work dir +WORK_DIR=${INTEGRATION_TESTS_DIR}/work +rm -rf ${WORK_DIR} || true + cd ${REPO_DIR} # build a version that uses the Broadcom VideoCore GPU -GPU_BUILD_DIR=${INTEGRATION_TESTS_DIR}/rpiv2 +GPU_BUILD_DIR=${WORK_DIR}/build_rpiv2 cmake -B ${GPU_BUILD_DIR} -DNFM=TRUE -DPLATFORM=rpiv2 -DCMAKE_BUILD_TYPE=Release VERBOSE=1 cmake --build ${GPU_BUILD_DIR} -j2 @@ -40,21 +65,17 @@ ldd ${GPU_BUILD_DIR}/src/rtl_airband | grep libbcm_host # build a version that uses FFTW -FFTW_BUILD_DIR=${INTEGRATION_TESTS_DIR}/native +FFTW_BUILD_DIR=${WORK_DIR}/build_native cmake -B ${FFTW_BUILD_DIR} -DNFM=TRUE -DPLATFORM=native -DCMAKE_BUILD_TYPE=Release VERBOSE=1 cmake --build ${FFTW_BUILD_DIR} -j2 # make sure the binary is linking against the FFTW library ldd ${FFTW_BUILD_DIR}/src/rtl_airband | grep libfftw3f -# make a work dir -WORK_DIR=${INTEGRATION_TESTS_DIR}/work -rm -rf ${WORK_DIR} || true - # run the noaa config twice, once for each binary -GPU_WORK_DIR=${WORK_DIR}/gpu/ -FFTW_WORK_DIR=${WORK_DIR}/fftw/ -run_rtl_airband ${GPU_BUILD_DIR}/src/rtl_airband ${INTEGRATION_TESTS_DIR}/configs/noaa.conf ${GPU_WORK_DIR} -run_rtl_airband ${FFTW_BUILD_DIR}/src/rtl_airband ${INTEGRATION_TESTS_DIR}/configs/noaa.conf ${FFTW_WORK_DIR} +GPU_OUTPUT_DIR=${WORK_DIR}/output_rpiv2/ +FFTW_OUTPUT_DIR=${WORK_DIR}/output_native/ +#run_rtl_airband ${GPU_BUILD_DIR}/src/rtl_airband ${INTEGRATION_TESTS_DIR}/configs/noaa.conf ${GPU_OUTPUT_DIR} +run_rtl_airband ${FFTW_BUILD_DIR}/src/rtl_airband ${INTEGRATION_TESTS_DIR}/configs/noaa.conf ${FFTW_OUTPUT_DIR} From fa500260dc00edaf5291f3a044112251591074a9 Mon Sep 17 00:00:00 2001 From: charlie-foxtrot <13514783+charlie-foxtrot@users.noreply.github.com> Date: Mon, 29 May 2023 08:57:35 -0700 Subject: [PATCH 4/8] tweak to workflow --- .github/workflows/integration_tests.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 6b0c469..942677f 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -10,14 +10,10 @@ on: jobs: build: runs-on: [rpi3b] - timeout-minutes: 25 + timeout-minutes: 10 steps: - name: Checkout repository uses: actions/checkout@main - - name: Install packaged dependencies - run: .github/install_dependencies - - name: Integration Tests - run: | - integration_tests/run + run: integration_tests/run From 468faefc4f3120c95bd2f50b5f6dbc8c9fbb4c6a Mon Sep 17 00:00:00 2001 From: charlie-foxtrot <13514783+charlie-foxtrot@users.noreply.github.com> Date: Mon, 29 May 2023 12:19:36 -0700 Subject: [PATCH 5/8] drop threshold to 10s --- integration_tests/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration_tests/run b/integration_tests/run index cb407fa..9ef3a8d 100755 --- a/integration_tests/run +++ b/integration_tests/run @@ -21,7 +21,7 @@ function run_rtl_airband { sleep 5 # make sure there is at least one NOAA channel that generated an MP3 longer - # than 15 seconds for each rtl and soapy (not 30 seconds because of startup time) + # than 10 seconds for each rtl and soapy (not 30 seconds because of startup time) check_length '*_rtlsdr_*.mp3' check_length '*_soapysdr_*.mp3' @@ -35,7 +35,7 @@ function check_length { seconds=$(ffmpeg -i $i -f null - 2>&1 | grep time | awk '{print $2}' | cut -d ':' -f 3) echo "$i is $seconds sec long" - if (( $(echo "$seconds > 15.0" | bc -l) )); then + if (( $(echo "$seconds > 10.0" | bc -l) )); then return 0 fi From e8a9d884f17934ce73c66e18a16aeb5399fcb88b Mon Sep 17 00:00:00 2001 From: charlie-foxtrot <13514783+charlie-foxtrot@users.noreply.github.com> Date: Mon, 29 May 2023 13:58:25 -0700 Subject: [PATCH 6/8] run GPU builds as well --- integration_tests/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration_tests/run b/integration_tests/run index 9ef3a8d..80dd30d 100755 --- a/integration_tests/run +++ b/integration_tests/run @@ -12,7 +12,7 @@ function run_rtl_airband { pushd ${OUTPUT_DIR} # run for 30 seconds then send kill command - ${BIN_PATH} -c ${CONFIG_PATH} -F -e & + sudo ${BIN_PATH} -c ${CONFIG_PATH} -F -e & PID=$! sleep 30 kill $PID @@ -76,6 +76,6 @@ ldd ${FFTW_BUILD_DIR}/src/rtl_airband | grep libfftw3f # run the noaa config twice, once for each binary GPU_OUTPUT_DIR=${WORK_DIR}/output_rpiv2/ FFTW_OUTPUT_DIR=${WORK_DIR}/output_native/ -#run_rtl_airband ${GPU_BUILD_DIR}/src/rtl_airband ${INTEGRATION_TESTS_DIR}/configs/noaa.conf ${GPU_OUTPUT_DIR} +run_rtl_airband ${GPU_BUILD_DIR}/src/rtl_airband ${INTEGRATION_TESTS_DIR}/configs/noaa.conf ${GPU_OUTPUT_DIR} run_rtl_airband ${FFTW_BUILD_DIR}/src/rtl_airband ${INTEGRATION_TESTS_DIR}/configs/noaa.conf ${FFTW_OUTPUT_DIR} From af060dd4443da5a79d9bc66a695ae325f8d19b29 Mon Sep 17 00:00:00 2001 From: charlie-foxtrot <13514783+charlie-foxtrot@users.noreply.github.com> Date: Mon, 29 May 2023 14:30:55 -0700 Subject: [PATCH 7/8] fixup config --- integration_tests/configs/noaa.conf | 45 ----------------------------- 1 file changed, 45 deletions(-) diff --git a/integration_tests/configs/noaa.conf b/integration_tests/configs/noaa.conf index cb3b8c0..91fd527 100644 --- a/integration_tests/configs/noaa.conf +++ b/integration_tests/configs/noaa.conf @@ -1,7 +1,4 @@ fft_size = 512; -localtime = true; -multiple_demod_threads = true; -multiple_output_threads = true; devices: ( { @@ -17,9 +14,6 @@ devices: freq = 162.40000; label = "NOAA 162.400 (162.40000)"; modulation = "nfm"; - lowpass = -1; - highpass = -1; - bandwidth = 5000; squelch_snr_threshold = 0.00; outputs: ( @@ -34,9 +28,6 @@ devices: freq = 162.42500; label = "NOAA 162.425 (162.42500)"; modulation = "nfm"; - lowpass = -1; - highpass = -1; - bandwidth = 5000; squelch_snr_threshold = 0.00; outputs: ( @@ -51,9 +42,6 @@ devices: freq = 162.45000; label = "NOAA 162.450 (162.45000)"; modulation = "nfm"; - lowpass = -1; - highpass = -1; - bandwidth = 5000; squelch_snr_threshold = 0.00; outputs: ( @@ -68,9 +56,6 @@ devices: freq = 162.47500; label = "NOAA 162.475 (162.47500)"; modulation = "nfm"; - lowpass = -1; - highpass = -1; - bandwidth = 5000; squelch_snr_threshold = 0.00; outputs: ( @@ -85,9 +70,6 @@ devices: freq = 162.50000; label = "NOAA 162.500 (162.50000)"; modulation = "nfm"; - lowpass = -1; - highpass = -1; - bandwidth = 5000; squelch_snr_threshold = 0.00; outputs: ( @@ -102,9 +84,6 @@ devices: freq = 162.52500; label = "NOAA 162.525 (162.52500)"; modulation = "nfm"; - lowpass = -1; - highpass = -1; - bandwidth = 5000; squelch_snr_threshold = 0.00; outputs: ( @@ -119,9 +98,6 @@ devices: freq = 162.55000; label = "NOAA 162.550 (162.55000)"; modulation = "nfm"; - lowpass = -1; - highpass = -1; - bandwidth = 5000; squelch_snr_threshold = 0.00; outputs: ( @@ -147,9 +123,6 @@ devices: freq = 162.40000; label = "NOAA 162.400 (162.40000)"; modulation = "nfm"; - lowpass = -1; - highpass = -1; - bandwidth = 5000; squelch_snr_threshold = 0.00; outputs: ( @@ -164,9 +137,6 @@ devices: freq = 162.42500; label = "NOAA 162.425 (162.42500)"; modulation = "nfm"; - lowpass = -1; - highpass = -1; - bandwidth = 5000; squelch_snr_threshold = 0.00; outputs: ( @@ -181,9 +151,6 @@ devices: freq = 162.45000; label = "NOAA 162.450 (162.45000)"; modulation = "nfm"; - lowpass = -1; - highpass = -1; - bandwidth = 5000; squelch_snr_threshold = 0.00; outputs: ( @@ -198,9 +165,6 @@ devices: freq = 162.47500; label = "NOAA 162.475 (162.47500)"; modulation = "nfm"; - lowpass = -1; - highpass = -1; - bandwidth = 5000; squelch_snr_threshold = 0.00; outputs: ( @@ -215,9 +179,6 @@ devices: freq = 162.50000; label = "NOAA 162.500 (162.50000)"; modulation = "nfm"; - lowpass = -1; - highpass = -1; - bandwidth = 5000; squelch_snr_threshold = 0.00; outputs: ( @@ -232,9 +193,6 @@ devices: freq = 162.52500; label = "NOAA 162.525 (162.52500)"; modulation = "nfm"; - lowpass = -1; - highpass = -1; - bandwidth = 5000; squelch_snr_threshold = 0.00; outputs: ( @@ -249,9 +207,6 @@ devices: freq = 162.55000; label = "NOAA 162.550 (162.55000)"; modulation = "nfm"; - lowpass = -1; - highpass = -1; - bandwidth = 5000; squelch_snr_threshold = 0.00; outputs: ( From 774fd819c403f92860e72e49a7c5e1f6ea757b1b Mon Sep 17 00:00:00 2001 From: charlie-foxtrot <13514783+charlie-foxtrot@users.noreply.github.com> Date: Mon, 29 May 2023 21:58:32 -0700 Subject: [PATCH 8/8] sudo kill --- integration_tests/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration_tests/run b/integration_tests/run index 80dd30d..a4d92d9 100755 --- a/integration_tests/run +++ b/integration_tests/run @@ -15,7 +15,7 @@ function run_rtl_airband { sudo ${BIN_PATH} -c ${CONFIG_PATH} -F -e & PID=$! sleep 30 - kill $PID + sudo kill -SIGINT $PID # wait 5 seconds for files to be closed and renamed sleep 5