From bd186fab2e7c01806c5a0e7f6e860539e4d6f349 Mon Sep 17 00:00:00 2001 From: Xavier Arteaga Date: Thu, 7 Oct 2021 16:42:07 +0200 Subject: [PATCH] Fix CMake SSB frequency addition overflow --- lib/src/phy/sync/test/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/src/phy/sync/test/CMakeLists.txt b/lib/src/phy/sync/test/CMakeLists.txt index 95e9d1644..83741dd5a 100644 --- a/lib/src/phy/sync/test/CMakeLists.txt +++ b/lib/src/phy/sync/test/CMakeLists.txt @@ -134,11 +134,11 @@ add_executable(ssb_decode_test ssb_decode_test.c) target_link_libraries(ssb_decode_test srsran_phy) # For 1.0 GHz and 3.5 GHz Center frequencies -foreach (CELL_FREQ 1000000000 3500000000) +foreach (CELL_FREQ 1000000 3500000) # For each supported Cell/Carrier subcarrier spacing foreach (CELL_SCS 15 30) # For SSB centered at -960, 0 and 960 kHz from the center frequency - foreach (SSB_OFFSET_FREQ -960000 +0 +960000) + foreach (SSB_OFFSET_FREQ -960 +0 +960) # For each supported SSB subcarrier spacing foreach (SSB_SCS 15 30) # For patterns A, B, C @@ -147,12 +147,12 @@ foreach (CELL_FREQ 1000000000 3500000000) math(EXPR SSB_FREQ "${CELL_FREQ}${SSB_OFFSET_FREQ}") # Test SSB measurements - add_nr_test(ssb_measure_test_${CELL_FREQ}_${CELL_SCS}_${SSB_FREQ}_${SSB_SCS}_${SSB_PATTERN} ssb_measure_test - -F ${CELL_FREQ} -S ${CELL_SCS} -f ${SSB_FREQ} -s ${SSB_SCS} -P ${SSB_PATTERN}) + add_nr_test(ssb_measure_test_${CELL_FREQ}000_${CELL_SCS}_${SSB_FREQ}000_${SSB_SCS}_${SSB_PATTERN} ssb_measure_test + -F ${CELL_FREQ}000 -S ${CELL_SCS} -f ${SSB_FREQ}000 -s ${SSB_SCS} -P ${SSB_PATTERN}) # Test SSB PBCH decoding - add_nr_test(ssb_decode_test_${CELL_FREQ}_${CELL_SCS}_${SSB_FREQ}_${SSB_SCS}_${SSB_PATTERN} ssb_decode_test - -F ${CELL_FREQ} -S ${CELL_SCS} -f ${SSB_FREQ} -s ${SSB_SCS} -P ${SSB_PATTERN}) + add_nr_test(ssb_decode_test_${CELL_FREQ}000_${CELL_SCS}_${SSB_FREQ}000_${SSB_SCS}_${SSB_PATTERN} ssb_decode_test + -F ${CELL_FREQ}000 -S ${CELL_SCS} -f ${SSB_FREQ}000 -s ${SSB_SCS} -P ${SSB_PATTERN}) endforeach () endforeach () endforeach ()