From dc4283c572af429a691e86378624a5ce271d2fad Mon Sep 17 00:00:00 2001 From: Francisco Date: Thu, 11 Feb 2021 16:32:32 +0000 Subject: [PATCH] added cmake functions as helpers to set labels in ctests --- CMakeLists.txt | 22 + lib/src/phy/ch_estimation/test/CMakeLists.txt | 47 +- lib/src/phy/fec/ldpc/test/CMakeLists.txt | 29 +- lib/src/phy/fec/polar/test/CMakeLists.txt | 17 +- lib/src/phy/fec/turbo/test/CMakeLists.txt | 22 +- lib/src/phy/phch/test/CMakeLists.txt | 538 +++++++++--------- lib/test/phy/CMakeLists.txt | 10 +- lib/test/upper/CMakeLists.txt | 33 +- srsenb/test/phy/CMakeLists.txt | 25 +- srsue/test/phy/CMakeLists.txt | 5 +- 10 files changed, 369 insertions(+), 379 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c3ac3cad7..e0065af49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -540,6 +540,28 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) message(STATUS "Using install prefix: ${CMAKE_INSTALL_PREFIX}") message(STATUS "Building for version: ${VERSION}") +######################################################################## +# Ctest function helpers +######################################################################## + +function(add_lte_test) + add_test(${ARGN}) + set(TNAME ${ARGV0}) + if(${TNAME} STREQUAL NAME) + set(TNAME ${ARGV1}) + endif() + set_tests_properties(${TNAME} PROPERTIES LABELS "lte;${CTEST_LABELS}") +endfunction() + +function(add_nr_test) + add_test(${ARGN}) + set(TNAME ${ARGV0}) + if(${TNAME} STREQUAL NAME) + set(TNAME ${ARGV1}) + endif() + set_tests_properties(${TNAME} PROPERTIES LABELS "nr;${CTEST_LABELS}") +endfunction() + ######################################################################## # Add general includes and dependencies ######################################################################## diff --git a/lib/src/phy/ch_estimation/test/CMakeLists.txt b/lib/src/phy/ch_estimation/test/CMakeLists.txt index be5e3b791..5ef9996ef 100644 --- a/lib/src/phy/ch_estimation/test/CMakeLists.txt +++ b/lib/src/phy/ch_estimation/test/CMakeLists.txt @@ -6,6 +6,8 @@ # the distribution. # +set(CTEST_LABELS "lib;phy;chest") + ######################################################################## # Downlink Channel Estimation TEST ######################################################################## @@ -13,19 +15,13 @@ add_executable(chest_test_dl chest_test_dl.c) target_link_libraries(chest_test_dl srslte_phy) -add_test(chest_test_dl_cellid0 chest_test_dl -c 0) -add_test(chest_test_dl_cellid1 chest_test_dl -c 1) -add_test(chest_test_dl_cellid2 chest_test_dl -c 2) -set_tests_properties(chest_test_dl_cellid0 PROPERTIES LABELS "lib;phy") -set_tests_properties(chest_test_dl_cellid1 PROPERTIES LABELS "lib;phy") -set_tests_properties(chest_test_dl_cellid2 PROPERTIES LABELS "lib;phy") +add_lte_test(chest_test_dl_cellid0 chest_test_dl -c 0) +add_lte_test(chest_test_dl_cellid1 chest_test_dl -c 1) +add_lte_test(chest_test_dl_cellid2 chest_test_dl -c 2) -add_test(chest_test_dl_cellid0_50prb chest_test_dl -c 0 -r 50) -add_test(chest_test_dl_cellid1_50prb chest_test_dl -c 1 -r 50) -add_test(chest_test_dl_cellid2_50prb chest_test_dl -c 2 -r 50) -set_tests_properties(chest_test_dl_cellid0_50prb PROPERTIES LABELS "lib;phy") -set_tests_properties(chest_test_dl_cellid1_50prb PROPERTIES LABELS "lib;phy") -set_tests_properties(chest_test_dl_cellid2_50prb PROPERTIES LABELS "lib;phy") +add_lte_test(chest_test_dl_cellid0_50prb chest_test_dl -c 0 -r 50) +add_lte_test(chest_test_dl_cellid1_50prb chest_test_dl -c 1 -r 50) +add_lte_test(chest_test_dl_cellid2_50prb chest_test_dl -c 2 -r 50) ######################################################################## @@ -38,12 +34,9 @@ target_link_libraries(chest_test_ul srslte_phy srslte_common) add_executable(refsignal_ul_test_all refsignal_ul_test.c) target_link_libraries(refsignal_ul_test_all srslte_phy srslte_common) -add_test(chest_test_ul_cellid0 chest_test_ul -c 0 -r 50) -add_test(chest_test_ul_cellid1 chest_test_ul -c 1 -r 50) -add_test(chest_test_ul_cellid2 chest_test_ul -c 2 -r 50) -set_tests_properties(chest_test_ul_cellid0 PROPERTIES LABELS "lib;phy") -set_tests_properties(chest_test_ul_cellid1 PROPERTIES LABELS "lib;phy") -set_tests_properties(chest_test_ul_cellid2 PROPERTIES LABELS "lib;phy") +add_lte_test(chest_test_ul_cellid0 chest_test_ul -c 0 -r 50) +add_lte_test(chest_test_ul_cellid1 chest_test_ul -c 1 -r 50) +add_lte_test(chest_test_ul_cellid2 chest_test_ul -c 2 -r 50) ######################################################################## # Uplink Sounding Reference Signals Channel Estimation TEST @@ -53,8 +46,7 @@ add_executable(chest_test_srs chest_test_srs.c) target_link_libraries(chest_test_srs srslte_phy srslte_common) foreach (cell_n_prb 6 15 25 50 75 100) - add_test(chest_test_srs_${cell_n_prb} chest_test_srs -c 2 -r ${cell_n_prb}) - set_tests_properties(chest_test_srs_${cell_n_prb} PROPERTIES LABELS "lib;long;phy") + add_lte_test(chest_test_srs_${cell_n_prb} chest_test_srs -c 2 -r ${cell_n_prb}) endforeach(cell_n_prb 6 15 25 50 75 100) @@ -65,8 +57,7 @@ endforeach(cell_n_prb 6 15 25 50 75 100) add_executable(chest_nbiot_test_dl chest_nbiot_test_dl.c) target_link_libraries(chest_nbiot_test_dl srslte_phy) -add_test(chest_nbiot_test_dl chest_nbiot_test_dl) -set_tests_properties(chest_nbiot_test_dl PROPERTIES LABELS "lib;phy") +add_lte_test(chest_nbiot_test_dl chest_nbiot_test_dl) ######################################################################## @@ -76,8 +67,7 @@ set_tests_properties(chest_nbiot_test_dl PROPERTIES LABELS "lib;phy") add_executable(chest_test_sl chest_test_sl.c) target_link_libraries(chest_test_sl srslte_phy) -add_test(chest_test_sl_psbch chest_test_sl) -set_tests_properties(chest_test_sl_psbch PROPERTIES LABELS "lib;phy") +add_lte_test(chest_test_sl_psbch chest_test_sl) ######################################################################## @@ -87,8 +77,7 @@ set_tests_properties(chest_test_sl_psbch PROPERTIES LABELS "lib;phy") add_executable(dmrs_pdsch_test dmrs_pdsch_test.c) target_link_libraries(dmrs_pdsch_test srslte_phy) -add_test(dmrs_pdsch_test dmrs_pdsch_test) -set_tests_properties(dmrs_pdsch_test PROPERTIES LABELS "lib;phy") +add_lte_test(dmrs_pdsch_test dmrs_pdsch_test) ######################################################################## @@ -98,8 +87,7 @@ set_tests_properties(dmrs_pdsch_test PROPERTIES LABELS "lib;phy") add_executable(dmrs_pdcch_test dmrs_pdcch_test.c) target_link_libraries(dmrs_pdcch_test srslte_phy) -add_test(dmrs_pdcch_test dmrs_pdcch_test) -set_tests_properties(dmrs_pdcch_test PROPERTIES LABELS "lib;phy") +add_lte_test(dmrs_pdcch_test dmrs_pdcch_test) ######################################################################## @@ -109,6 +97,5 @@ set_tests_properties(dmrs_pdcch_test PROPERTIES LABELS "lib;phy") add_executable(csi_rs_test csi_rs_test.c) target_link_libraries(csi_rs_test srslte_phy) -add_test(csi_rs_test csi_rs_test -o 3 -S 0 -L 150 -f 3 -p 15) -set_tests_properties(csi_rs_test PROPERTIES LABELS "lib;phy") +add_lte_test(csi_rs_test csi_rs_test -o 3 -S 0 -L 150 -f 3 -p 15) diff --git a/lib/src/phy/fec/ldpc/test/CMakeLists.txt b/lib/src/phy/fec/ldpc/test/CMakeLists.txt index 61df48210..fddf89616 100644 --- a/lib/src/phy/fec/ldpc/test/CMakeLists.txt +++ b/lib/src/phy/fec/ldpc/test/CMakeLists.txt @@ -6,6 +6,8 @@ # the distribution. # +set(CTEST_LABELS "lib;phy;fec;ldpc") + add_executable(ldpc_enc_test ldpc_enc_test.c) target_link_libraries(ldpc_enc_test srslte_phy) @@ -38,10 +40,9 @@ endif(HAVE_AVX2) ### Test LDPC libs function(ldpc_unit_tests) foreach(i IN LISTS ARGN) - add_test(NAME ${test_name}-LS${i} COMMAND ${test_command} -l${i} + add_nr_test(NAME ${test_name}-LS${i} COMMAND ${test_command} -l${i} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ ) - set_tests_properties(${test_name}-LS${i} PROPERTIES LABELS "lib;nr;phy") endforeach() endfunction() @@ -72,8 +73,7 @@ set(test_name LDPC-DEC-BG2) set(test_command ldpc_dec_test -b2) ldpc_unit_tests(${lifting_sizes}) -add_test(NAME LDPC-chain COMMAND ldpc_chain_test) -set_tests_properties(LDPC-chain PROPERTIES LABELS "lib;nr;phy") +add_nr_test(NAME LDPC-chain COMMAND ldpc_chain_test) ### Test LDPC Rate Matching UNIT tests set(mod_order @@ -110,44 +110,38 @@ function(ldpc_rm_unit_tests) math(EXPR tmpN "${N} - (${N} % ${Div})") math(EXPR E "${Ordval}*(${tmpN})/${Div}") #twice the rate - add_test(NAME ${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${N} COMMAND ${test_command} -b${bgval} -l${i} -e${E} -f10 -m${Modval} -r${rvval} -M${N} + add_nr_test(NAME ${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${N} COMMAND ${test_command} -b${bgval} -l${i} -e${E} -f10 -m${Modval} -r${rvval} -M${N} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ ) - set_tests_properties(${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${N} PROPERTIES LABELS "lib;nr;phy") math(EXPR M "${N} / 2") # Half size buffer - add_test(NAME ${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${M} COMMAND ${test_command} -b${bgval} -l${i} -e${E} -f10 -m${Modval} -r${rvval} -M${M} + add_nr_test(NAME ${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${M} COMMAND ${test_command} -b${bgval} -l${i} -e${E} -f10 -m${Modval} -r${rvval} -M${M} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ ) - set_tests_properties(${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${M} PROPERTIES LABELS "lib;nr;phy") math(EXPR Div "2*${Ordval}") math(EXPR tmpN "${N} - (${N} % ${Div})") math(EXPR E "${Ordval}*(${tmpN})/${Div}") #twice the rate - add_test(NAME ${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${N} COMMAND ${test_command} -b${bgval} -l${i} -e${E} -f10 -m${Modval} -r${rvval} -M${N} + add_nr_test(NAME ${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${N} COMMAND ${test_command} -b${bgval} -l${i} -e${E} -f10 -m${Modval} -r${rvval} -M${N} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ ) - set_tests_properties(${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${N} PROPERTIES LABELS "lib;nr;phy") math(EXPR M "${N}/ 2") # Half size buffer - add_test(NAME ${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${M} COMMAND ${test_command} -b${bgval} -l${i} -e${E} -f10 -m${Modval} -r${rvval} -M${M} + add_nr_test(NAME ${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${M} COMMAND ${test_command} -b${bgval} -l${i} -e${E} -f10 -m${Modval} -r${rvval} -M${M} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ ) - set_tests_properties(${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${M} PROPERTIES LABELS "lib;nr;phy") math(EXPR Div "${Ordval}") math(EXPR tmpN "2*${N} - (2*${N} % ${Div})") #Half the rate math(EXPR E "${Ordval}*(${tmpN})/${Div}") - add_test(NAME ${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${N} COMMAND ${test_command} -b${bgval} -l${i} -e${E} -f10 -m${Modval} -r${rvval} -M${N} + add_nr_test(NAME ${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${N} COMMAND ${test_command} -b${bgval} -l${i} -e${E} -f10 -m${Modval} -r${rvval} -M${N} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ ) - set_tests_properties(${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${N} PROPERTIES LABELS "lib;nr;phy") math(EXPR M "${N}/ 2") # Half size buffer - add_test(NAME ${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${M} COMMAND ${test_command} -b${bgval} -l${i} -e${E} -f10 -m${Modval} -r${rvval} -M${M} + add_nr_test(NAME ${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${M} COMMAND ${test_command} -b${bgval} -l${i} -e${E} -f10 -m${Modval} -r${rvval} -M${M} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ ) - set_tests_properties(${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${M} PROPERTIES LABELS "lib;nr;phy") endforeach() endforeach() endforeach() @@ -158,5 +152,4 @@ set(test_name LDPC-RM) set(test_command ldpc_rm_test) ldpc_rm_unit_tests(${lifting_sizes}) -add_test(NAME LDPC-RM-chain COMMAND ldpc_rm_chain_test -E 1 -B 1) -set_tests_properties(LDPC-RM-chain PROPERTIES LABELS "lib;nr;phy") +add_nr_test(NAME LDPC-RM-chain COMMAND ldpc_rm_chain_test -E 1 -B 1) diff --git a/lib/src/phy/fec/polar/test/CMakeLists.txt b/lib/src/phy/fec/polar/test/CMakeLists.txt index c2430a5e7..9f992fb2d 100644 --- a/lib/src/phy/fec/polar/test/CMakeLists.txt +++ b/lib/src/phy/fec/polar/test/CMakeLists.txt @@ -6,6 +6,8 @@ # the distribution. # +set(CTEST_LABELS "lib;phy;fec;polar") + add_library(polar_test_utils polar_sets.c subchannel_allocation.c) add_executable(polar_chain_test polar_chain_test.c) @@ -26,10 +28,9 @@ function(polar_tests_lite) list(GET listE ${num} eval) list(GET listK ${num} kval) list(GET listI ${num} ival) - add_test(NAME ${test_name}-s${S}-n${nval}-e${eval}-k${kval}-i${ival} + add_nr_test(NAME ${test_name}-s${S}-n${nval}-e${eval}-k${kval}-i${ival} COMMAND ${test_command} -s${S} -n${nval} -e${eval} -k${kval} -i${ival} ) - set_tests_properties(${test_name}-s${S}-n${nval}-e${eval}-k${kval}-i${ival} PROPERTIES LABELS "lib;nr;phy") endforeach() endfunction() @@ -41,10 +42,9 @@ function(polar_tests) foreach(Kval RANGE 36 164 32) math(EXPR Emin "${Kval} + 1") foreach(Eval RANGE ${Emin} 8192 128) - add_test(NAME ${test_name}-s${S}-k${Kval}-e${Eval}-n${nval}-i0 + add_nr_test(NAME ${test_name}-s${S}-k${Kval}-e${Eval}-n${nval}-i0 COMMAND ${test_command} -s${S} -k${Kval} -e${Eval} -n${nval} -i0 ) - set_tests_properties(${test_name}-s${S}-k${Kval}-e${Eval}-n${nval}-i0 PROPERTIES LABELS "lib;nr;phy") endforeach() endforeach() @@ -54,20 +54,18 @@ function(polar_tests) foreach(Kval RANGE 18 25) math(EXPR Emin "${Kval} + 3 + 1") foreach(Eval RANGE ${Emin} 8192 128) - add_test(NAME ${test_name}-s${S}-k${Kval}-e${Eval}-n${nval}-i1 + add_nr_test(NAME ${test_name}-s${S}-k${Kval}-e${Eval}-n${nval}-i1 COMMAND ${test_command} -s${S} -k${Kval} -e${Eval} -n${nval} -i1 ) - set_tests_properties(${test_name}-s${S}-k${Kval}-e${Eval}-n${nval}-i1 PROPERTIES LABELS "lib;nr;phy") endforeach() endforeach() foreach(Kval RANGE 32 1023 32) math(EXPR Emin "${Kval} + 1") foreach(Eval RANGE ${Emin} 8192 128) - add_test(NAME ${test_name}-s${S}-k${Kval}-e${Eval}-n${nval}-i1 + add_nr_test(NAME ${test_name}-s${S}-k${Kval}-e${Eval}-n${nval}-i1 COMMAND ${test_command} -s${S} -k${Kval} -e${Eval} -n${nval} -i1 ) - set_tests_properties(${test_name}-s${S}-k${Kval}-e${Eval}-n${nval}-i1 PROPERTIES LABELS "lib;nr;phy") endforeach() endforeach() @@ -94,5 +92,4 @@ polar_tests(101) # Polar inter-leaver test add_executable(polar_interleaver_test polar_interleaver_test.c) target_link_libraries(polar_interleaver_test srslte_phy) -add_test(polar_interleaver_test polar_interleaver_test) -set_tests_properties(polar_interleaver_test PROPERTIES LABELS "lib;nr;phy") +add_nr_test(polar_interleaver_test polar_interleaver_test) diff --git a/lib/src/phy/fec/turbo/test/CMakeLists.txt b/lib/src/phy/fec/turbo/test/CMakeLists.txt index 4fddcc65b..5163bc13e 100644 --- a/lib/src/phy/fec/turbo/test/CMakeLists.txt +++ b/lib/src/phy/fec/turbo/test/CMakeLists.txt @@ -6,6 +6,7 @@ # the distribution. # +set(CTEST_LABELS "lib;phy;fec;turbo") ######################################################################## # RATEMATCHING TEST @@ -17,11 +18,11 @@ target_link_libraries(rm_conv_test srslte_phy) add_executable(rm_turbo_test rm_turbo_test.c) target_link_libraries(rm_turbo_test srslte_phy) -add_test(rm_conv_test_1 rm_conv_test -t 480 -r 1920) -add_test(rm_conv_test_2 rm_conv_test -t 1920 -r 480) +add_lte_test(rm_conv_test_1 rm_conv_test -t 480 -r 1920) +add_lte_test(rm_conv_test_2 rm_conv_test -t 1920 -r 480) -add_test(rm_turbo_test_1 rm_turbo_test -e 1920) -add_test(rm_turbo_test_2 rm_turbo_test -e 8192) +add_lte_test(rm_turbo_test_1 rm_turbo_test -e 1920) +add_lte_test(rm_turbo_test_2 rm_turbo_test -e 8192) ######################################################################## # Turbo Coder TEST @@ -29,14 +30,11 @@ add_test(rm_turbo_test_2 rm_turbo_test -e 8192) add_executable(turbodecoder_test turbodecoder_test.c) target_link_libraries(turbodecoder_test srslte_phy) -add_test(turbodecoder_test_504_1 turbodecoder_test -n 100 -s 1 -l 504 -e 1.0 -t) -add_test(turbodecoder_test_504_2 turbodecoder_test -n 100 -s 1 -l 504 -e 2.0 -t) -add_test(turbodecoder_test_6114_1_5 turbodecoder_test -n 100 -s 1 -l 6144 -e 1.5 -t) -add_test(turbodecoder_test_known turbodecoder_test -n 1 -s 1 -k -e 0.5) +add_lte_test(turbodecoder_test_504_1 turbodecoder_test -n 100 -s 1 -l 504 -e 1.0 -t) +add_lte_test(turbodecoder_test_504_2 turbodecoder_test -n 100 -s 1 -l 504 -e 2.0 -t) +add_lte_test(turbodecoder_test_6114_1_5 turbodecoder_test -n 100 -s 1 -l 6144 -e 1.5 -t) +add_lte_test(turbodecoder_test_known turbodecoder_test -n 1 -s 1 -k -e 0.5) add_executable(turbocoder_test turbocoder_test.c) target_link_libraries(turbocoder_test srslte_phy) -add_test(turbocoder_test_all turbocoder_test) - -set_tests_properties(turbodecoder_test_504_1 turbodecoder_test_504_2 turbodecoder_test_6114_1_5 - turbodecoder_test_known turbocoder_test_all PROPERTIES LABELS "lib;phy") +add_lte_test(turbocoder_test_all turbocoder_test) diff --git a/lib/src/phy/phch/test/CMakeLists.txt b/lib/src/phy/phch/test/CMakeLists.txt index 7978d68ee..ae8febb8f 100644 --- a/lib/src/phy/phch/test/CMakeLists.txt +++ b/lib/src/phy/phch/test/CMakeLists.txt @@ -6,6 +6,8 @@ # the distribution. # +set(CTEST_LABELS "lib;phy;phch") + ######################################################################## # PBCH TEST ######################################################################## @@ -13,12 +15,12 @@ add_executable(pbch_test pbch_test.c) target_link_libraries(pbch_test srslte_phy) -add_test(pbch_test_6 pbch_test -p 1 -n 6 -c 100) -add_test(pbch_test_62 pbch_test -p 2 -n 6 -c 100) -add_test(pbch_test_64 pbch_test -p 4 -n 6 -c 100) -add_test(pbch_test_50 pbch_test -p 1 -n 50 -c 50) -add_test(pbch_test_502 pbch_test -p 2 -n 50 -c 50) -add_test(pbch_test_504 pbch_test -p 4 -n 50 -c 50) +add_lte_test(pbch_test_6 pbch_test -p 1 -n 6 -c 100) +add_lte_test(pbch_test_62 pbch_test -p 2 -n 6 -c 100) +add_lte_test(pbch_test_64 pbch_test -p 4 -n 6 -c 100) +add_lte_test(pbch_test_50 pbch_test -p 1 -n 50 -c 50) +add_lte_test(pbch_test_502 pbch_test -p 2 -n 50 -c 50) +add_lte_test(pbch_test_504 pbch_test -p 4 -n 50 -c 50) ######################################################################## # PSBCH TEST @@ -28,30 +30,30 @@ add_executable(psbch_test psbch_test.c) target_link_libraries(psbch_test srslte_phy) # TM2 self tests -add_test(psbch_test_self_test_tm2_p6_c168_self psbch_test -p 6 -c 168 -t 2) -add_test(psbch_test_self_test_tm2_p50_c168_self psbch_test -p 50 -c 252 -t 2) -add_test(psbch_test_self_test_tm2_p100_c168_self psbch_test -p 100 -c 335 -t 2) -add_test(psbch_test_self_test_tm2_p25_c168_ext_self psbch_test -p 25 -c 168 -e) -add_test(psbch_test_self_test_tm2_p100_c335_ext_self psbch_test -p 100 -c 335 -e) +add_lte_test(psbch_test_self_test_tm2_p6_c168_self psbch_test -p 6 -c 168 -t 2) +add_lte_test(psbch_test_self_test_tm2_p50_c168_self psbch_test -p 50 -c 252 -t 2) +add_lte_test(psbch_test_self_test_tm2_p100_c168_self psbch_test -p 100 -c 335 -t 2) +add_lte_test(psbch_test_self_test_tm2_p25_c168_ext_self psbch_test -p 25 -c 168 -e) +add_lte_test(psbch_test_self_test_tm2_p100_c335_ext_self psbch_test -p 100 -c 335 -e) # TM4 self tests -add_test(psbch_test_self_test_tm4_p6_c168_self psbch_test -p 6 -c 168 -t 4) -add_test(psbch_test_self_test_tm4_p50_c168_self psbch_test -p 50 -c 252 -t 4) -add_test(psbch_test_self_test_tm4_p100_c168_self psbch_test -p 100 -c 335 -t 4) +add_lte_test(psbch_test_self_test_tm4_p6_c168_self psbch_test -p 6 -c 168 -t 4) +add_lte_test(psbch_test_self_test_tm4_p50_c168_self psbch_test -p 50 -c 252 -t 4) +add_lte_test(psbch_test_self_test_tm4_p100_c168_self psbch_test -p 100 -c 335 -t 4) add_executable(psbch_file_test psbch_file_test.c) target_link_libraries(psbch_file_test srslte_phy) # TM2 file tests -add_test(psbch_file_test_ideal_tm2_p6_c0 psbch_file_test -p 6 -c 0 -d -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_ideal_tm2_p6_c0_s1.92e6.dat) -add_test(psbch_file_test_ideal_tm2_p15_c84 psbch_file_test -p 15 -c 84 -d -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_ideal_tm2_p15_c84_s3.84e6.dat) -add_test(psbch_file_test_ideal_tm2_p25_c168 psbch_file_test -p 25 -c 168 -d -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_ideal_tm2_p25_c168_s7.68e6.dat) -add_test(psbch_file_test_ideal_tm2_p50_c252 psbch_file_test -p 50 -c 252 -d -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_ideal_tm2_p50_c252_s15.36e6.dat) -add_test(psbch_file_test_ideal_tm2_p100_c335 psbch_file_test -p 100 -c 335 -d -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_ideal_tm2_p100_c335_s30.72e6.dat) -add_test(psbch_file_test_ideal_tm2_p50_c252_ext psbch_file_test -p 50 -c 252 -e -d -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_ideal_tm2_p50_c252_s15.36e6_ext.dat) +add_lte_test(psbch_file_test_ideal_tm2_p6_c0 psbch_file_test -p 6 -c 0 -d -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_ideal_tm2_p6_c0_s1.92e6.dat) +add_lte_test(psbch_file_test_ideal_tm2_p15_c84 psbch_file_test -p 15 -c 84 -d -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_ideal_tm2_p15_c84_s3.84e6.dat) +add_lte_test(psbch_file_test_ideal_tm2_p25_c168 psbch_file_test -p 25 -c 168 -d -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_ideal_tm2_p25_c168_s7.68e6.dat) +add_lte_test(psbch_file_test_ideal_tm2_p50_c252 psbch_file_test -p 50 -c 252 -d -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_ideal_tm2_p50_c252_s15.36e6.dat) +add_lte_test(psbch_file_test_ideal_tm2_p100_c335 psbch_file_test -p 100 -c 335 -d -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_ideal_tm2_p100_c335_s30.72e6.dat) +add_lte_test(psbch_file_test_ideal_tm2_p50_c252_ext psbch_file_test -p 50 -c 252 -e -d -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_ideal_tm2_p50_c252_s15.36e6_ext.dat) # TM4 file tests -add_test(psbch_file_test_cmw_tm4_p50_c169 psbch_file_test -p 50 -c 169 -t 4 -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_cmw500_f5.92e9_s11.52e6_50prb_slss_id169.dat) +add_lte_test(psbch_file_test_cmw_tm4_p50_c169 psbch_file_test -p 50 -c 169 -t 4 -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_cmw500_f5.92e9_s11.52e6_50prb_slss_id169.dat) ######################################################################## # PSCCH TEST @@ -61,20 +63,20 @@ add_executable(pscch_test pscch_test.c) target_link_libraries(pscch_test srslte_phy) # TM2 self tests -add_test(pscch_test_tm2_p6 pscch_test -p 6) -add_test(pscch_test_tm2_p15 pscch_test -p 15) -add_test(pscch_test_tm2_p25 pscch_test -p 25) -add_test(pscch_test_tm2_p50 pscch_test -p 50) -add_test(pscch_test_tm2_p75 pscch_test -p 75) -add_test(pscch_test_tm2_p100 pscch_test -p 100) +add_lte_test(pscch_test_tm2_p6 pscch_test -p 6) +add_lte_test(pscch_test_tm2_p15 pscch_test -p 15) +add_lte_test(pscch_test_tm2_p25 pscch_test -p 25) +add_lte_test(pscch_test_tm2_p50 pscch_test -p 50) +add_lte_test(pscch_test_tm2_p75 pscch_test -p 75) +add_lte_test(pscch_test_tm2_p100 pscch_test -p 100) # TM4 self tests -add_test(pscch_test_tm4_p6 pscch_test -p 6 -t 4) -add_test(pscch_test_tm4_p15 pscch_test -p 15 -t 4) -add_test(pscch_test_tm4_p25 pscch_test -p 25 -t 4) -add_test(pscch_test_tm4_p50 pscch_test -p 50 -t 4) -add_test(pscch_test_tm4_p75 pscch_test -p 75 -t 4) -add_test(pscch_test_tm4_p100 pscch_test -p 100 -t 4) +add_lte_test(pscch_test_tm4_p6 pscch_test -p 6 -t 4) +add_lte_test(pscch_test_tm4_p15 pscch_test -p 15 -t 4) +add_lte_test(pscch_test_tm4_p25 pscch_test -p 25 -t 4) +add_lte_test(pscch_test_tm4_p50 pscch_test -p 50 -t 4) +add_lte_test(pscch_test_tm4_p75 pscch_test -p 75 -t 4) +add_lte_test(pscch_test_tm4_p100 pscch_test -p 100 -t 4) ######################################################################## # PSSCH TEST @@ -84,26 +86,22 @@ add_executable(pssch_test pssch_test.c) target_link_libraries(pssch_test srslte_phy) # TM2 self tests -add_test(pssch_test_tm2_p6 pssch_test -p 6 -m 2) -add_test(pssch_test_tm2_p15 pssch_test -p 15 -m 6) -add_test(pssch_test_tm2_p25 pssch_test -p 25 -m 7) -add_test(pssch_test_tm2_p50 pssch_test -p 50 -m 9) -add_test(pssch_test_tm2_p50_ext pssch_test -p 50 -m 9 -e) -add_test(pssch_test_tm2_p75 pssch_test -p 75 -m 17) -add_test(pssch_test_tm2_p100 pssch_test -p 100 -m 21) -add_test(pssch_test_tm2_p100_ext pssch_test -p 100 -m 21 -e) -set_tests_properties(pssch_test_tm2_p6 pssch_test_tm2_p15 pssch_test_tm2_p25 pssch_test_tm2_p50 pssch_test_tm2_p50_ext - pssch_test_tm2_p75 pssch_test_tm2_p100 pssch_test_tm2_p100_ext PROPERTIES LABELS "lib;phy") +add_lte_test(pssch_test_tm2_p6 pssch_test -p 6 -m 2) +add_lte_test(pssch_test_tm2_p15 pssch_test -p 15 -m 6) +add_lte_test(pssch_test_tm2_p25 pssch_test -p 25 -m 7) +add_lte_test(pssch_test_tm2_p50 pssch_test -p 50 -m 9) +add_lte_test(pssch_test_tm2_p50_ext pssch_test -p 50 -m 9 -e) +add_lte_test(pssch_test_tm2_p75 pssch_test -p 75 -m 17) +add_lte_test(pssch_test_tm2_p100 pssch_test -p 100 -m 21) +add_lte_test(pssch_test_tm2_p100_ext pssch_test -p 100 -m 21 -e) # TM4 self tests -add_test(pssch_test_tm4_p6 pssch_test -p 6 -t 4 -m 2) -add_test(pssch_test_tm4_p15 pssch_test -p 15 -t 4 -m 6) -add_test(pssch_test_tm4_p25 pssch_test -p 25 -t 4 -m 7) -add_test(pssch_test_tm4_p50 pssch_test -p 50 -t 4 -m 9) -add_test(pssch_test_tm4_p75 pssch_test -p 75 -t 4 -m 17) -add_test(pssch_test_tm4_p100 pssch_test -p 100 -t 4 -m 21) -set_tests_properties(pssch_test_tm4_p6 pssch_test_tm4_p15 pssch_test_tm4_p25 pssch_test_tm4_p50 pssch_test_tm4_p75 - pssch_test_tm4_p100 PROPERTIES LABELS "lib;phy") +add_lte_test(pssch_test_tm4_p6 pssch_test -p 6 -t 4 -m 2) +add_lte_test(pssch_test_tm4_p15 pssch_test -p 15 -t 4 -m 6) +add_lte_test(pssch_test_tm4_p25 pssch_test -p 25 -t 4 -m 7) +add_lte_test(pssch_test_tm4_p50 pssch_test -p 50 -t 4 -m 9) +add_lte_test(pssch_test_tm4_p75 pssch_test -p 75 -t 4 -m 17) +add_lte_test(pssch_test_tm4_p100 pssch_test -p 100 -t 4 -m 21) ######################################################################## # PSCCH AND PSSCH FILE TEST @@ -113,38 +111,38 @@ add_executable(pssch_pscch_file_test pssch_pscch_file_test.c) target_link_libraries(pssch_pscch_file_test srslte_phy) # TM2 file tests -add_test(pssch_pscch_file_test_ideal_tm2_p100 pssch_pscch_file_test -p 100 -d -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_ideal_tm2_p100_c335_s30.72e6.dat) +add_lte_test(pssch_pscch_file_test_ideal_tm2_p100 pssch_pscch_file_test -p 100 -d -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_ideal_tm2_p100_c335_s30.72e6.dat) set_property(TEST pssch_pscch_file_test_ideal_tm2_p100 PROPERTY PASS_REGULAR_EXPRESSION "num_decoded_sci=2 num_decoded_tb=1") # TM4 file tests (first SF is sf_idx = 6 such that the PSSCH sf_idx=0) -add_test(pssch_pscch_file_test_ideal_tm4_p100 pssch_pscch_file_test -p 100 -t 4 -s 10 -n 10 -d -m 6 -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_ideal_tm4_p100_c335_size10_num10_cshift0_s30.72e6.dat) +add_lte_test(pssch_pscch_file_test_ideal_tm4_p100 pssch_pscch_file_test -p 100 -t 4 -s 10 -n 10 -d -m 6 -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_ideal_tm4_p100_c335_size10_num10_cshift0_s30.72e6.dat) set_property(TEST pssch_pscch_file_test_ideal_tm4_p100 PROPERTY PASS_REGULAR_EXPRESSION "num_decoded_sci=1") -add_test(pssch_pscch_test_tm4_p50_qc pssch_pscch_file_test -p 50 -t 4 -d -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_qc9150_f5.92e9_s15.36e6_50prb_20offset.dat) +add_lte_test(pssch_pscch_test_tm4_p50_qc pssch_pscch_file_test -p 50 -t 4 -d -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_qc9150_f5.92e9_s15.36e6_50prb_20offset.dat) set_property(TEST pssch_pscch_test_tm4_p50_qc PROPERTY PASS_REGULAR_EXPRESSION "num_decoded_sci=1 num_decoded_tb=1") # Capture has a SFO offset of ~64 samples, but offsetting by 20 is enough to decode it -add_test(pssch_pscch_test_tm4_p50_cmw pssch_pscch_file_test -p 50 -t 4 -o 20 -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_cmw500_f5.92e9_s11.52e6_50prb_0offset_1ms.dat) +add_lte_test(pssch_pscch_test_tm4_p50_cmw pssch_pscch_file_test -p 50 -t 4 -o 20 -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_cmw500_f5.92e9_s11.52e6_50prb_0offset_1ms.dat) set_property(TEST pssch_pscch_test_tm4_p50_cmw PROPERTY PASS_REGULAR_EXPRESSION "num_decoded_sci=1 num_decoded_tb=1") # With PHY retransmission (3 TTI offset) first SF at sf_idx=5 -add_test(pssch_pscch_test_tm4_p50_huawei pssch_pscch_file_test -p 50 -t 4 -m 5 -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_huawei_s11.52e6_50prb_10prb_offset_with_retx.dat) +add_lte_test(pssch_pscch_test_tm4_p50_huawei pssch_pscch_file_test -p 50 -t 4 -m 5 -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_huawei_s11.52e6_50prb_10prb_offset_with_retx.dat) set_property(TEST pssch_pscch_test_tm4_p50_huawei PROPERTY PASS_REGULAR_EXPRESSION "num_decoded_sci=2 num_decoded_tb=2") # With PHY ReTx (0 TTI offset?) -add_test(pssch_pscch_test_tm4_p50_uxm1 pssch_pscch_file_test -p 50 -d -t 4 -s 5 -n 10 -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_uxm_s15.36e6_50prb_0prb_offset_mcs12.dat) +add_lte_test(pssch_pscch_test_tm4_p50_uxm1 pssch_pscch_file_test -p 50 -d -t 4 -s 5 -n 10 -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_uxm_s15.36e6_50prb_0prb_offset_mcs12.dat) set_property(TEST pssch_pscch_test_tm4_p50_uxm1 PROPERTY PASS_REGULAR_EXPRESSION "mcs=12.*num_decoded_sci=2 num_decoded_tb=2") # 100 PRB startOffset 1 MCS12 MAC padding, first SF is index 0 -add_test(pssch_pscch_test_tm4_p100_uxm2 pssch_pscch_file_test -p 100 -t 4 -s 10 -n 10 -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_uxm_s23.04e6_100prb_1prb_offset_mcs12_padding.dat) +add_lte_test(pssch_pscch_test_tm4_p100_uxm2 pssch_pscch_file_test -p 100 -t 4 -s 10 -n 10 -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_uxm_s23.04e6_100prb_1prb_offset_mcs12_padding.dat) set_property(TEST pssch_pscch_test_tm4_p100_uxm2 PROPERTY PASS_REGULAR_EXPRESSION "mcs=12.*num_decoded_sci=4") # 100 PRB LTE sampling rate, startOffset1 MCS12 ITS data, first SF is index 6 -add_test(pssch_pscch_test_tm4_p100_uxm3 pssch_pscch_file_test -p 100 -d -t 4 -s 10 -n 10 -m 6 -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_uxm_s30.72e6_100prb_1prb_offset_mcs12_its.dat) +add_lte_test(pssch_pscch_test_tm4_p100_uxm3 pssch_pscch_file_test -p 100 -d -t 4 -s 10 -n 10 -m 6 -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_uxm_s30.72e6_100prb_1prb_offset_mcs12_its.dat) set_property(TEST pssch_pscch_test_tm4_p100_uxm3 PROPERTY PASS_REGULAR_EXPRESSION "mcs=12.*num_decoded_sci=1") # 50 PRB LTE sampling rate, startOffset0 MCS28 MAC padding, first SF is index 1 -add_test(pssch_pscch_test_tm4_p50_uxm4 pssch_pscch_file_test -p 50 -d -t 4 -s 5 -n 10 -m 1 -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_uxm_s15.36e6_50prb_0prb_offset_mcs28_padding_5ms.dat) +add_lte_test(pssch_pscch_test_tm4_p50_uxm4 pssch_pscch_file_test -p 50 -d -t 4 -s 5 -n 10 -m 1 -i ${CMAKE_HOME_DIRECTORY}/lib/src/phy/phch/test/signal_sidelink_uxm_s15.36e6_50prb_0prb_offset_mcs28_padding_5ms.dat) set_property(TEST pssch_pscch_test_tm4_p50_uxm4 PROPERTY PASS_REGULAR_EXPRESSION "mcs=28.*num_decoded_sci=5") ######################################################################## @@ -153,12 +151,12 @@ set_property(TEST pssch_pscch_test_tm4_p50_uxm4 PROPERTY PASS_REGULAR_EXPRESSION add_executable(npbch_test npbch_test.c) target_link_libraries(npbch_test srslte_phy) -add_test(npbch_test npbch_test) +add_lte_test(npbch_test npbch_test) -add_test(npbch_file_test_r13 npbch_file_test -i ${CMAKE_CURRENT_SOURCE_DIR}/signal_nbiot_amari_nid0_sfn514_sib2.bin) -add_test(npbch_file_test_r14 npbch_file_test -l 256 -R -r 0 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal_nbiot_nid256_r14_sf0.bin) -add_test(npbch_file_test_nid257_r13 npbch_file_test -l 257 -r 4 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal_nbiot_nid257_r13_sf0.bin) -add_test(npbch_file_test_nid257_r14 npbch_file_test -l 257 -R -r 7 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal_nbiot_nid257_r14_sf0.bin) +add_lte_test(npbch_file_test_r13 npbch_file_test -i ${CMAKE_CURRENT_SOURCE_DIR}/signal_nbiot_amari_nid0_sfn514_sib2.bin) +add_lte_test(npbch_file_test_r14 npbch_file_test -l 256 -R -r 0 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal_nbiot_nid256_r14_sf0.bin) +add_lte_test(npbch_file_test_nid257_r13 npbch_file_test -l 257 -r 4 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal_nbiot_nid257_r13_sf0.bin) +add_lte_test(npbch_file_test_nid257_r14 npbch_file_test -l 257 -R -r 7 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal_nbiot_nid257_r14_sf0.bin) ######################################################################## # PCFICH TEST @@ -167,12 +165,12 @@ add_test(npbch_file_test_nid257_r14 npbch_file_test -l 257 -R -r 7 -i ${CMAKE_CU add_executable(pcfich_test pcfich_test.c) target_link_libraries(pcfich_test srslte_phy) -add_test(pcfich_test_6 pcfich_test -p 1 -n 6) -add_test(pcfich_test_62 pcfich_test -p 2 -n 6) -add_test(pcfich_test_64 pcfich_test -p 4 -n 6) -add_test(pcfich_test_10 pcfich_test -p 1 -n 10) -add_test(pcfich_test_102 pcfich_test -p 2 -n 10) -add_test(pcfich_test_104 pcfich_test -p 4 -n 10) +add_lte_test(pcfich_test_6 pcfich_test -p 1 -n 6) +add_lte_test(pcfich_test_62 pcfich_test -p 2 -n 6) +add_lte_test(pcfich_test_64 pcfich_test -p 4 -n 6) +add_lte_test(pcfich_test_10 pcfich_test -p 1 -n 10) +add_lte_test(pcfich_test_102 pcfich_test -p 2 -n 10) +add_lte_test(pcfich_test_104 pcfich_test -p 4 -n 10) ######################################################################## # PHICH TEST @@ -181,17 +179,17 @@ add_test(pcfich_test_104 pcfich_test -p 4 -n 10) add_executable(phich_test phich_test.c) target_link_libraries(phich_test srslte_phy) -add_test(phich_test_6 phich_test -p 1 -n 6) -add_test(phich_test_62 phich_test -p 2 -n 6) -add_test(phich_test_64 phich_test -p 4 -n 6 -g 1/6) +add_lte_test(phich_test_6 phich_test -p 1 -n 6) +add_lte_test(phich_test_62 phich_test -p 2 -n 6) +add_lte_test(phich_test_64 phich_test -p 4 -n 6 -g 1/6) -add_test(phich_test_6e phich_test -p 1 -n 6 -e) -add_test(phich_test_62e phich_test -p 2 -n 6 -e -l) -add_test(phich_test_64e phich_test -p 4 -n 6 -e -l -g 2) +add_lte_test(phich_test_6e phich_test -p 1 -n 6 -e) +add_lte_test(phich_test_62e phich_test -p 2 -n 6 -e -l) +add_lte_test(phich_test_64e phich_test -p 4 -n 6 -e -l -g 2) -add_test(phich_test_10 phich_test -p 1 -n 10 -e) -add_test(phich_test_102 phich_test -p 2 -n 10 -g 2) -add_test(phich_test_104 phich_test -p 4 -n 10 -e -l -g 1/2) +add_lte_test(phich_test_10 phich_test -p 1 -n 10 -e) +add_lte_test(phich_test_102 phich_test -p 2 -n 10 -g 2) +add_lte_test(phich_test_104 phich_test -p 4 -n 10 -e -l -g 1/2) ######################################################################## # PDCCH TEST @@ -200,19 +198,19 @@ add_test(phich_test_104 phich_test -p 4 -n 10 -e -l -g 1/2) add_executable(pdcch_test pdcch_test.c) target_link_libraries(pdcch_test srslte_phy) -add_test(pdcch_test_6 pdcch_test -n 6) -add_test(pdcch_test_15 pdcch_test -n 15) -add_test(pdcch_test_25 pdcch_test -n 25) -add_test(pdcch_test_50 pdcch_test -n 50) -add_test(pdcch_test_75 pdcch_test -n 75) -add_test(pdcch_test_100 pdcch_test -n 100) -add_test(pdcch_test_6_mimo pdcch_test -n 6 -p 2) -add_test(pdcch_test_15_mimo pdcch_test -n 15 -p 2) -add_test(pdcch_test_25_mimo pdcch_test -n 25 -p 2) -add_test(pdcch_test_50_mimo pdcch_test -n 50 -p 2) -add_test(pdcch_test_75_mimo pdcch_test -n 75 -p 2) -add_test(pdcch_test_100_mimo pdcch_test -n 100 -p 2) -#add_test(pdcch_test_crosscarrier pdcch_test -x) +add_lte_test(pdcch_test_6 pdcch_test -n 6) +add_lte_test(pdcch_test_15 pdcch_test -n 15) +add_lte_test(pdcch_test_25 pdcch_test -n 25) +add_lte_test(pdcch_test_50 pdcch_test -n 50) +add_lte_test(pdcch_test_75 pdcch_test -n 75) +add_lte_test(pdcch_test_100 pdcch_test -n 100) +add_lte_test(pdcch_test_6_mimo pdcch_test -n 6 -p 2) +add_lte_test(pdcch_test_15_mimo pdcch_test -n 15 -p 2) +add_lte_test(pdcch_test_25_mimo pdcch_test -n 25 -p 2) +add_lte_test(pdcch_test_50_mimo pdcch_test -n 50 -p 2) +add_lte_test(pdcch_test_75_mimo pdcch_test -n 75 -p 2) +add_lte_test(pdcch_test_100_mimo pdcch_test -n 100 -p 2) +#add_lte_test(pdcch_test_crosscarrier pdcch_test -x) ######################################################################## # PDSCH TEST @@ -221,106 +219,106 @@ add_test(pdcch_test_100_mimo pdcch_test -n 100 -p 2) add_executable(pdsch_test pdsch_test.c) target_link_libraries(pdsch_test srslte_phy) -add_test(pdsch_test_qpsk pdsch_test -m 10 -n 50 -r 1) -add_test(pdsch_test_qam16 pdsch_test -m 20 -n 100) -add_test(pdsch_test_qam16 pdsch_test -m 20 -n 100 -r 2) -add_test(pdsch_test_qam64 pdsch_test -n 100) +add_lte_test(pdsch_test_qpsk pdsch_test -m 10 -n 50 -r 1) +add_lte_test(pdsch_test_qam16 pdsch_test -m 20 -n 100) +add_lte_test(pdsch_test_qam16 pdsch_test -m 20 -n 100 -r 2) +add_lte_test(pdsch_test_qam64 pdsch_test -n 100) # PDSCH test for 1 transmision mode and 2 Rx antennas -add_test(pdsch_test_sin_6 pdsch_test -x 1 -a 2 -n 6) -add_test(pdsch_test_sin_12 pdsch_test -x 1 -a 2 -n 12) -add_test(pdsch_test_sin_25 pdsch_test -x 1 -a 2 -n 25) -add_test(pdsch_test_sin_50 pdsch_test -x 1 -a 2 -n 50) -add_test(pdsch_test_sin_75 pdsch_test -x 1 -a 2 -n 75) -add_test(pdsch_test_sin_100 pdsch_test -x 1 -a 2 -n 100) +add_lte_test(pdsch_test_sin_6 pdsch_test -x 1 -a 2 -n 6) +add_lte_test(pdsch_test_sin_12 pdsch_test -x 1 -a 2 -n 12) +add_lte_test(pdsch_test_sin_25 pdsch_test -x 1 -a 2 -n 25) +add_lte_test(pdsch_test_sin_50 pdsch_test -x 1 -a 2 -n 50) +add_lte_test(pdsch_test_sin_75 pdsch_test -x 1 -a 2 -n 75) +add_lte_test(pdsch_test_sin_100 pdsch_test -x 1 -a 2 -n 100) # PDSCH test for transmit 2 transmision mode (1 codeword) -add_test(pdsch_test_div_6 pdsch_test -x 2 -a 2 -n 6) -add_test(pdsch_test_div_12 pdsch_test -x 2 -a 2 -n 12) -add_test(pdsch_test_div_25 pdsch_test -x 2 -a 2 -n 25) -add_test(pdsch_test_div_50 pdsch_test -x 2 -a 2 -n 50) -add_test(pdsch_test_div_75 pdsch_test -x 2 -a 2 -n 75) -add_test(pdsch_test_div_100 pdsch_test -x 2 -a 2 -n 100) +add_lte_test(pdsch_test_div_6 pdsch_test -x 2 -a 2 -n 6) +add_lte_test(pdsch_test_div_12 pdsch_test -x 2 -a 2 -n 12) +add_lte_test(pdsch_test_div_25 pdsch_test -x 2 -a 2 -n 25) +add_lte_test(pdsch_test_div_50 pdsch_test -x 2 -a 2 -n 50) +add_lte_test(pdsch_test_div_75 pdsch_test -x 2 -a 2 -n 75) +add_lte_test(pdsch_test_div_100 pdsch_test -x 2 -a 2 -n 100) # PDSCH test for CDD transmision mode (2 codeword) -add_test(pdsch_test_cdd_6 pdsch_test -x 3 -a 2 -t 0 -n 6) -add_test(pdsch_test_cdd_12 pdsch_test -x 3 -a 2 -t 0 -n 12) -add_test(pdsch_test_cdd_25 pdsch_test -x 3 -a 2 -t 0 -n 25) -add_test(pdsch_test_cdd_50 pdsch_test -x 3 -a 2 -t 0 -n 50) -add_test(pdsch_test_cdd_75 pdsch_test -x 3 -a 2 -t 0 -n 75) -add_test(pdsch_test_cdd_100 pdsch_test -x 3 -a 2 -t 0 -n 100) +add_lte_test(pdsch_test_cdd_6 pdsch_test -x 3 -a 2 -t 0 -n 6) +add_lte_test(pdsch_test_cdd_12 pdsch_test -x 3 -a 2 -t 0 -n 12) +add_lte_test(pdsch_test_cdd_25 pdsch_test -x 3 -a 2 -t 0 -n 25) +add_lte_test(pdsch_test_cdd_50 pdsch_test -x 3 -a 2 -t 0 -n 50) +add_lte_test(pdsch_test_cdd_75 pdsch_test -x 3 -a 2 -t 0 -n 75) +add_lte_test(pdsch_test_cdd_100 pdsch_test -x 3 -a 2 -t 0 -n 100) # PDSCH test for CDD transmision mode (2 codeword) and 256QAM -add_test(pdsch_test_cdd_6 pdsch_test -x 3 -a 2 -t 0 -m 27 -M 27 -n 6 -q) -add_test(pdsch_test_cdd_12 pdsch_test -x 3 -a 2 -t 0 -m 27 -M 27 -n 12 -q) -add_test(pdsch_test_cdd_25 pdsch_test -x 3 -a 2 -t 0 -m 27 -M 27 -n 25 -q) -add_test(pdsch_test_cdd_50 pdsch_test -x 3 -a 2 -t 0 -m 27 -M 27 -n 50 -q) -add_test(pdsch_test_cdd_75 pdsch_test -x 3 -a 2 -t 0 -m 27 -M 27 -n 75 -q) -add_test(pdsch_test_cdd_100 pdsch_test -x 3 -a 2 -t 0 -m 27 -M 27 -n 100 -q) +add_lte_test(pdsch_test_cdd_6 pdsch_test -x 3 -a 2 -t 0 -m 27 -M 27 -n 6 -q) +add_lte_test(pdsch_test_cdd_12 pdsch_test -x 3 -a 2 -t 0 -m 27 -M 27 -n 12 -q) +add_lte_test(pdsch_test_cdd_25 pdsch_test -x 3 -a 2 -t 0 -m 27 -M 27 -n 25 -q) +add_lte_test(pdsch_test_cdd_50 pdsch_test -x 3 -a 2 -t 0 -m 27 -M 27 -n 50 -q) +add_lte_test(pdsch_test_cdd_75 pdsch_test -x 3 -a 2 -t 0 -m 27 -M 27 -n 75 -q) +add_lte_test(pdsch_test_cdd_100 pdsch_test -x 3 -a 2 -t 0 -m 27 -M 27 -n 100 -q) # PDSCH test for Spatial Multiplex transmision mode with PMI = 0 (1 codeword) -add_test(pdsch_test_multiplex1cw_p0_6 pdsch_test -x 4 -a 2 -p 0 -n 6) -add_test(pdsch_test_multiplex1cw_p0_12 pdsch_test -x 4 -a 2 -p 0 -n 12) -add_test(pdsch_test_multiplex1cw_p0_25 pdsch_test -x 4 -a 2 -p 0 -n 25) -add_test(pdsch_test_multiplex1cw_p0_50 pdsch_test -x 4 -a 2 -p 0 -n 50) -add_test(pdsch_test_multiplex1cw_p0_75 pdsch_test -x 4 -a 2 -p 0 -n 75) -add_test(pdsch_test_multiplex1cw_p0_100 pdsch_test -x 4 -a 2 -p 0 -n 100) +add_lte_test(pdsch_test_multiplex1cw_p0_6 pdsch_test -x 4 -a 2 -p 0 -n 6) +add_lte_test(pdsch_test_multiplex1cw_p0_12 pdsch_test -x 4 -a 2 -p 0 -n 12) +add_lte_test(pdsch_test_multiplex1cw_p0_25 pdsch_test -x 4 -a 2 -p 0 -n 25) +add_lte_test(pdsch_test_multiplex1cw_p0_50 pdsch_test -x 4 -a 2 -p 0 -n 50) +add_lte_test(pdsch_test_multiplex1cw_p0_75 pdsch_test -x 4 -a 2 -p 0 -n 75) +add_lte_test(pdsch_test_multiplex1cw_p0_100 pdsch_test -x 4 -a 2 -p 0 -n 100) # PDSCH test for Spatial Multiplex transmision mode with PMI = 0 (1 codeword, swapped) -add_test(pdsch_test_multiplex1cw_p0_swap_6 pdsch_test -x 4 -a 2 -p 0 -w -n 6) -add_test(pdsch_test_multiplex1cw_p0_swap_12 pdsch_test -x 4 -a 2 -p 0 -w -n 12) -add_test(pdsch_test_multiplex1cw_p0_swap_25 pdsch_test -x 4 -a 2 -p 0 -w -n 25) -add_test(pdsch_test_multiplex1cw_p0_swap_50 pdsch_test -x 4 -a 2 -p 0 -w -n 50) -add_test(pdsch_test_multiplex1cw_p0_swap_75 pdsch_test -x 4 -a 2 -p 0 -w -n 75) -add_test(pdsch_test_multiplex1cw_p0_swap_100 pdsch_test -x 4 -a 2 -p 0 -w -n 100) +add_lte_test(pdsch_test_multiplex1cw_p0_swap_6 pdsch_test -x 4 -a 2 -p 0 -w -n 6) +add_lte_test(pdsch_test_multiplex1cw_p0_swap_12 pdsch_test -x 4 -a 2 -p 0 -w -n 12) +add_lte_test(pdsch_test_multiplex1cw_p0_swap_25 pdsch_test -x 4 -a 2 -p 0 -w -n 25) +add_lte_test(pdsch_test_multiplex1cw_p0_swap_50 pdsch_test -x 4 -a 2 -p 0 -w -n 50) +add_lte_test(pdsch_test_multiplex1cw_p0_swap_75 pdsch_test -x 4 -a 2 -p 0 -w -n 75) +add_lte_test(pdsch_test_multiplex1cw_p0_swap_100 pdsch_test -x 4 -a 2 -p 0 -w -n 100) # PDSCH test for Spatial Multiplex transmision mode with PMI = 1 (1 codeword) -add_test(pdsch_test_multiplex1cw_p1_6 pdsch_test -x 4 -a 2 -p 1 -n 6) -add_test(pdsch_test_multiplex1cw_p1_12 pdsch_test -x 4 -a 2 -p 1 -n 12) -add_test(pdsch_test_multiplex1cw_p1_25 pdsch_test -x 4 -a 2 -p 1 -n 25) -add_test(pdsch_test_multiplex1cw_p1_50 pdsch_test -x 4 -a 2 -p 1 -n 50) -add_test(pdsch_test_multiplex1cw_p1_75 pdsch_test -x 4 -a 2 -p 1 -n 75) -add_test(pdsch_test_multiplex1cw_p1_100 pdsch_test -x 4 -a 2 -p 1 -n 100) +add_lte_test(pdsch_test_multiplex1cw_p1_6 pdsch_test -x 4 -a 2 -p 1 -n 6) +add_lte_test(pdsch_test_multiplex1cw_p1_12 pdsch_test -x 4 -a 2 -p 1 -n 12) +add_lte_test(pdsch_test_multiplex1cw_p1_25 pdsch_test -x 4 -a 2 -p 1 -n 25) +add_lte_test(pdsch_test_multiplex1cw_p1_50 pdsch_test -x 4 -a 2 -p 1 -n 50) +add_lte_test(pdsch_test_multiplex1cw_p1_75 pdsch_test -x 4 -a 2 -p 1 -n 75) +add_lte_test(pdsch_test_multiplex1cw_p1_100 pdsch_test -x 4 -a 2 -p 1 -n 100) # PDSCH test for Spatial Multiplex transmision mode with PMI = 2 (1 codeword) -add_test(pdsch_test_multiplex1cw_p2_6 pdsch_test -x 4 -a 2 -p 2 -n 6) -add_test(pdsch_test_multiplex1cw_p2_12 pdsch_test -x 4 -a 2 -p 2 -n 12) -add_test(pdsch_test_multiplex1cw_p2_25 pdsch_test -x 4 -a 2 -p 2 -n 25) -add_test(pdsch_test_multiplex1cw_p2_50 pdsch_test -x 4 -a 2 -p 2 -n 50) -add_test(pdsch_test_multiplex1cw_p2_75 pdsch_test -x 4 -a 2 -p 2 -n 75) -add_test(pdsch_test_multiplex1cw_p2_100 pdsch_test -x 4 -a 2 -p 2 -n 100) +add_lte_test(pdsch_test_multiplex1cw_p2_6 pdsch_test -x 4 -a 2 -p 2 -n 6) +add_lte_test(pdsch_test_multiplex1cw_p2_12 pdsch_test -x 4 -a 2 -p 2 -n 12) +add_lte_test(pdsch_test_multiplex1cw_p2_25 pdsch_test -x 4 -a 2 -p 2 -n 25) +add_lte_test(pdsch_test_multiplex1cw_p2_50 pdsch_test -x 4 -a 2 -p 2 -n 50) +add_lte_test(pdsch_test_multiplex1cw_p2_75 pdsch_test -x 4 -a 2 -p 2 -n 75) +add_lte_test(pdsch_test_multiplex1cw_p2_100 pdsch_test -x 4 -a 2 -p 2 -n 100) # PDSCH test for Spatial Multiplex transmision mode with PMI = 3 (1 codeword) -add_test(pdsch_test_multiplex1cw_p3_6 pdsch_test -x 4 -a 2 -p 3 -n 6) -add_test(pdsch_test_multiplex1cw_p3_12 pdsch_test -x 4 -a 2 -p 3 -n 12) -add_test(pdsch_test_multiplex1cw_p3_25 pdsch_test -x 4 -a 2 -p 3 -n 25) -add_test(pdsch_test_multiplex1cw_p3_50 pdsch_test -x 4 -a 2 -p 3 -n 50) -add_test(pdsch_test_multiplex1cw_p3_75 pdsch_test -x 4 -a 2 -p 3 -n 75) -add_test(pdsch_test_multiplex1cw_p3_100 pdsch_test -x 4 -a 2 -p 3 -n 100) +add_lte_test(pdsch_test_multiplex1cw_p3_6 pdsch_test -x 4 -a 2 -p 3 -n 6) +add_lte_test(pdsch_test_multiplex1cw_p3_12 pdsch_test -x 4 -a 2 -p 3 -n 12) +add_lte_test(pdsch_test_multiplex1cw_p3_25 pdsch_test -x 4 -a 2 -p 3 -n 25) +add_lte_test(pdsch_test_multiplex1cw_p3_50 pdsch_test -x 4 -a 2 -p 3 -n 50) +add_lte_test(pdsch_test_multiplex1cw_p3_75 pdsch_test -x 4 -a 2 -p 3 -n 75) +add_lte_test(pdsch_test_multiplex1cw_p3_100 pdsch_test -x 4 -a 2 -p 3 -n 100) # PDSCH test for Spatial Multiplex transmision mode with PMI = 0 (2 codeword) -add_test(pdsch_test_multiplex2cw_p0_6 pdsch_test -x 4 -a 2 -t 0 -p 0 -n 6) -add_test(pdsch_test_multiplex2cw_p0_12 pdsch_test -x 4 -a 2 -t 0 -p 0 -n 12) -add_test(pdsch_test_multiplex2cw_p0_25 pdsch_test -x 4 -a 2 -t 0 -p 0 -n 25) -add_test(pdsch_test_multiplex2cw_p0_50 pdsch_test -x 4 -a 2 -t 0 -p 0 -n 50) -add_test(pdsch_test_multiplex2cw_p0_75 pdsch_test -x 4 -a 2 -t 0 -p 0 -n 75) -add_test(pdsch_test_multiplex2cw_p0_100 pdsch_test -x 4 -a 2 -t 0 -p 0 -n 100) +add_lte_test(pdsch_test_multiplex2cw_p0_6 pdsch_test -x 4 -a 2 -t 0 -p 0 -n 6) +add_lte_test(pdsch_test_multiplex2cw_p0_12 pdsch_test -x 4 -a 2 -t 0 -p 0 -n 12) +add_lte_test(pdsch_test_multiplex2cw_p0_25 pdsch_test -x 4 -a 2 -t 0 -p 0 -n 25) +add_lte_test(pdsch_test_multiplex2cw_p0_50 pdsch_test -x 4 -a 2 -t 0 -p 0 -n 50) +add_lte_test(pdsch_test_multiplex2cw_p0_75 pdsch_test -x 4 -a 2 -t 0 -p 0 -n 75) +add_lte_test(pdsch_test_multiplex2cw_p0_100 pdsch_test -x 4 -a 2 -t 0 -p 0 -n 100) # PDSCH test for Spatial Multiplex transmision mode with PMI = 0 (2 codeword, swapped) -add_test(pdsch_test_multiplex2cw_p0_6_swap pdsch_test -x 4 -a 2 -t 0 -p 0 -M 28 -n 6 -w -F 1) -add_test(pdsch_test_multiplex2cw_p0_12_swap pdsch_test -x 4 -a 2 -t 0 -p 0 -m 28 -n 12 -w) -add_test(pdsch_test_multiplex2cw_p0_25_swap pdsch_test -x 4 -a 2 -t 0 -p 0 -M 28 -n 25 -w) -add_test(pdsch_test_multiplex2cw_p0_50_swap pdsch_test -x 4 -a 2 -t 0 -p 0 -m 28 -n 50 -w) -add_test(pdsch_test_multiplex2cw_p0_75_swap pdsch_test -x 4 -a 2 -t 0 -p 0 -M 28 -n 75 -w) -add_test(pdsch_test_multiplex2cw_p0_100_swap pdsch_test -x 4 -a 2 -t 0 -p 0 -m 28 -n 100 -w) +add_lte_test(pdsch_test_multiplex2cw_p0_6_swap pdsch_test -x 4 -a 2 -t 0 -p 0 -M 28 -n 6 -w -F 1) +add_lte_test(pdsch_test_multiplex2cw_p0_12_swap pdsch_test -x 4 -a 2 -t 0 -p 0 -m 28 -n 12 -w) +add_lte_test(pdsch_test_multiplex2cw_p0_25_swap pdsch_test -x 4 -a 2 -t 0 -p 0 -M 28 -n 25 -w) +add_lte_test(pdsch_test_multiplex2cw_p0_50_swap pdsch_test -x 4 -a 2 -t 0 -p 0 -m 28 -n 50 -w) +add_lte_test(pdsch_test_multiplex2cw_p0_75_swap pdsch_test -x 4 -a 2 -t 0 -p 0 -M 28 -n 75 -w) +add_lte_test(pdsch_test_multiplex2cw_p0_100_swap pdsch_test -x 4 -a 2 -t 0 -p 0 -m 28 -n 100 -w) # PDSCH test for Spatial Multiplex transmision mode with PMI = 1 (2 codeword) -add_test(pdsch_test_multiplex2cw_p1_6 pdsch_test -x 4 -a 2 -t 0 -p 1 -n 6) -add_test(pdsch_test_multiplex2cw_p1_12 pdsch_test -x 4 -a 2 -t 0 -p 1 -n 12) -add_test(pdsch_test_multiplex2cw_p1_25 pdsch_test -x 4 -a 2 -t 0 -p 1 -n 25) -add_test(pdsch_test_multiplex2cw_p1_50 pdsch_test -x 4 -a 2 -t 0 -p 1 -n 50) -add_test(pdsch_test_multiplex2cw_p1_75 pdsch_test -x 4 -a 2 -t 0 -p 1 -n 75) -add_test(pdsch_test_multiplex2cw_p1_100 pdsch_test -x 4 -a 2 -t 0 -p 1 -n 100) +add_lte_test(pdsch_test_multiplex2cw_p1_6 pdsch_test -x 4 -a 2 -t 0 -p 1 -n 6) +add_lte_test(pdsch_test_multiplex2cw_p1_12 pdsch_test -x 4 -a 2 -t 0 -p 1 -n 12) +add_lte_test(pdsch_test_multiplex2cw_p1_25 pdsch_test -x 4 -a 2 -t 0 -p 1 -n 25) +add_lte_test(pdsch_test_multiplex2cw_p1_50 pdsch_test -x 4 -a 2 -t 0 -p 1 -n 50) +add_lte_test(pdsch_test_multiplex2cw_p1_75 pdsch_test -x 4 -a 2 -t 0 -p 1 -n 75) +add_lte_test(pdsch_test_multiplex2cw_p1_100 pdsch_test -x 4 -a 2 -t 0 -p 1 -n 100) ######################################################################## # PMCH TEST @@ -329,9 +327,9 @@ add_test(pdsch_test_multiplex2cw_p1_100 pdsch_test -x 4 -a 2 -t 0 -p 1 -n 100) add_executable(pmch_test pmch_test.c) target_link_libraries(pmch_test srslte_phy) -add_test(pmch_test_qpsk pmch_test -m 6 -n 50) -add_test(pmch_test_qam16 pmch_test -m 15 -n 100) -add_test(pmch_test_qam64 pmch_test -m 25 -n 100) +add_lte_test(pmch_test_qpsk pmch_test -m 6 -n 50) +add_lte_test(pmch_test_qam16 pmch_test -m 15 -n 100) +add_lte_test(pmch_test_qam64 pmch_test -m 25 -n 100) ######################################################################## @@ -341,51 +339,51 @@ add_test(pmch_test_qam64 pmch_test -m 25 -n 100) add_executable(npdsch_test npdsch_test.c) target_link_libraries(npdsch_test srslte_phy) -add_test(npdsch_test_tbs208 npdsch_test -m 12) -add_test(npdsch_test_tbs104 npdsch_test -m 7) -add_test(npdsch_test_tbs40 npdsch_test -m 3) -add_test(npdsch_test_tbs16 npdsch_test -m 0) +add_lte_test(npdsch_test_tbs208 npdsch_test -m 12) +add_lte_test(npdsch_test_tbs104 npdsch_test -m 7) +add_lte_test(npdsch_test_tbs40 npdsch_test -m 3) +add_lte_test(npdsch_test_tbs16 npdsch_test -m 0) # Resource element extraction for different operation modes and cell configuration # Standalone mode with one Tx port gives maximum number of NPDSCH symbols -add_test(npdsch_test_cellid0_standalone_1port npdsch_test -l 0 -M 3 -x 160) -add_test(npdsch_test_cellid1_standalone_1port npdsch_test -l 1 -M 3 -x 160) -add_test(npdsch_test_cellid2_standalone_1port npdsch_test -l 2 -M 3 -x 160) -add_test(npdsch_test_cellid3_standalone_1port npdsch_test -l 3 -M 3 -x 160) -add_test(npdsch_test_cellid4_standalone_1port npdsch_test -l 4 -M 3 -x 160) -add_test(npdsch_test_cellid5_standalone_1port npdsch_test -l 5 -M 3 -x 160) +add_lte_test(npdsch_test_cellid0_standalone_1port npdsch_test -l 0 -M 3 -x 160) +add_lte_test(npdsch_test_cellid1_standalone_1port npdsch_test -l 1 -M 3 -x 160) +add_lte_test(npdsch_test_cellid2_standalone_1port npdsch_test -l 2 -M 3 -x 160) +add_lte_test(npdsch_test_cellid3_standalone_1port npdsch_test -l 3 -M 3 -x 160) +add_lte_test(npdsch_test_cellid4_standalone_1port npdsch_test -l 4 -M 3 -x 160) +add_lte_test(npdsch_test_cellid5_standalone_1port npdsch_test -l 5 -M 3 -x 160) # Standalone mode with two Tx ports -add_test(npdsch_test_cellid0_standalone_2port npdsch_test -l 0 -M 3 -P 2 -x 152) -add_test(npdsch_test_cellid1_standalone_2port npdsch_test -l 1 -M 3 -P 2 -x 152) -add_test(npdsch_test_cellid2_standalone_2port npdsch_test -l 2 -M 3 -P 2 -x 152) -add_test(npdsch_test_cellid3_standalone_2port npdsch_test -l 3 -M 3 -P 2 -x 152) -add_test(npdsch_test_cellid4_standalone_2port npdsch_test -l 4 -M 3 -P 2 -x 152) -add_test(npdsch_test_cellid5_standalone_2port npdsch_test -l 5 -M 3 -P 2 -x 152) +add_lte_test(npdsch_test_cellid0_standalone_2port npdsch_test -l 0 -M 3 -P 2 -x 152) +add_lte_test(npdsch_test_cellid1_standalone_2port npdsch_test -l 1 -M 3 -P 2 -x 152) +add_lte_test(npdsch_test_cellid2_standalone_2port npdsch_test -l 2 -M 3 -P 2 -x 152) +add_lte_test(npdsch_test_cellid3_standalone_2port npdsch_test -l 3 -M 3 -P 2 -x 152) +add_lte_test(npdsch_test_cellid4_standalone_2port npdsch_test -l 4 -M 3 -P 2 -x 152) +add_lte_test(npdsch_test_cellid5_standalone_2port npdsch_test -l 5 -M 3 -P 2 -x 152) # Inband same PCI with 1 LTE antenna port and two NB-IoT ports -add_test(npdsch_test_cellid0_inband_1port_2port npdsch_test -l 0 -M 0 -p 1 -P 2 -x 144) -add_test(npdsch_test_cellid1_inband_1port_2port npdsch_test -l 1 -M 0 -p 1 -P 2 -x 144) -add_test(npdsch_test_cellid2_inband_1port_2port npdsch_test -l 2 -M 0 -p 1 -P 2 -x 144) -add_test(npdsch_test_cellid3_inband_1port_2port npdsch_test -l 3 -M 0 -p 1 -P 2 -x 144) -add_test(npdsch_test_cellid4_inband_1port_2port npdsch_test -l 4 -M 0 -p 1 -P 2 -x 144) -add_test(npdsch_test_cellid5_inband_1port_2port npdsch_test -l 5 -M 0 -p 1 -P 2 -x 144) +add_lte_test(npdsch_test_cellid0_inband_1port_2port npdsch_test -l 0 -M 0 -p 1 -P 2 -x 144) +add_lte_test(npdsch_test_cellid1_inband_1port_2port npdsch_test -l 1 -M 0 -p 1 -P 2 -x 144) +add_lte_test(npdsch_test_cellid2_inband_1port_2port npdsch_test -l 2 -M 0 -p 1 -P 2 -x 144) +add_lte_test(npdsch_test_cellid3_inband_1port_2port npdsch_test -l 3 -M 0 -p 1 -P 2 -x 144) +add_lte_test(npdsch_test_cellid4_inband_1port_2port npdsch_test -l 4 -M 0 -p 1 -P 2 -x 144) +add_lte_test(npdsch_test_cellid5_inband_1port_2port npdsch_test -l 5 -M 0 -p 1 -P 2 -x 144) # Inband same PCI with 2 antenna ports each -add_test(npdsch_test_cellid0_inband_2port_2port npdsch_test -l 0 -M 0 -p 2 -P 2 -x 136) -add_test(npdsch_test_cellid1_inband_2port_2port npdsch_test -l 1 -M 0 -p 2 -P 2 -x 136) -add_test(npdsch_test_cellid2_inband_2port_2port npdsch_test -l 2 -M 0 -p 2 -P 2 -x 136) -add_test(npdsch_test_cellid3_inband_2port_2port npdsch_test -l 3 -M 0 -p 2 -P 2 -x 136) -add_test(npdsch_test_cellid4_inband_2port_2port npdsch_test -l 4 -M 0 -p 2 -P 2 -x 136) -add_test(npdsch_test_cellid5_inband_2port_2port npdsch_test -l 5 -M 0 -p 2 -P 2 -x 136) +add_lte_test(npdsch_test_cellid0_inband_2port_2port npdsch_test -l 0 -M 0 -p 2 -P 2 -x 136) +add_lte_test(npdsch_test_cellid1_inband_2port_2port npdsch_test -l 1 -M 0 -p 2 -P 2 -x 136) +add_lte_test(npdsch_test_cellid2_inband_2port_2port npdsch_test -l 2 -M 0 -p 2 -P 2 -x 136) +add_lte_test(npdsch_test_cellid3_inband_2port_2port npdsch_test -l 3 -M 0 -p 2 -P 2 -x 136) +add_lte_test(npdsch_test_cellid4_inband_2port_2port npdsch_test -l 4 -M 0 -p 2 -P 2 -x 136) +add_lte_test(npdsch_test_cellid5_inband_2port_2port npdsch_test -l 5 -M 0 -p 2 -P 2 -x 136) # Inband different PCI with 2 antenna ports each -add_test(npdsch_test_cellid0_inband_diffpci_2port_2port npdsch_test -l 0 -M 1 -p 2 -P 2 -x 136) -add_test(npdsch_test_cellid1_inband_diffpci_2port_2port npdsch_test -l 1 -M 1 -p 2 -P 2 -x 136) -add_test(npdsch_test_cellid2_inband_diffpci_2port_2port npdsch_test -l 2 -M 1 -p 2 -P 2 -x 136) -add_test(npdsch_test_cellid3_inband_diffpci_2port_2port npdsch_test -l 3 -M 1 -p 2 -P 2 -x 136) -add_test(npdsch_test_cellid4_inband_diffpci_2port_2port npdsch_test -l 4 -M 1 -p 2 -P 2 -x 136) -add_test(npdsch_test_cellid5_inband_diffpci_2port_2port npdsch_test -l 5 -M 1 -p 2 -P 2 -x 136) +add_lte_test(npdsch_test_cellid0_inband_diffpci_2port_2port npdsch_test -l 0 -M 1 -p 2 -P 2 -x 136) +add_lte_test(npdsch_test_cellid1_inband_diffpci_2port_2port npdsch_test -l 1 -M 1 -p 2 -P 2 -x 136) +add_lte_test(npdsch_test_cellid2_inband_diffpci_2port_2port npdsch_test -l 2 -M 1 -p 2 -P 2 -x 136) +add_lte_test(npdsch_test_cellid3_inband_diffpci_2port_2port npdsch_test -l 3 -M 1 -p 2 -P 2 -x 136) +add_lte_test(npdsch_test_cellid4_inband_diffpci_2port_2port npdsch_test -l 4 -M 1 -p 2 -P 2 -x 136) +add_lte_test(npdsch_test_cellid5_inband_diffpci_2port_2port npdsch_test -l 5 -M 1 -p 2 -P 2 -x 136) ######################################################################## # NB-IoT DCI TEST @@ -393,7 +391,7 @@ add_test(npdsch_test_cellid5_inband_diffpci_2port_2port npdsch_test -l 5 -M 1 -p add_executable(dci_nbiot_test dci_nbiot_test.c) target_link_libraries(dci_nbiot_test srslte_phy) -add_test(dci_nbiot_test dci_nbiot_test) +add_lte_test(dci_nbiot_test dci_nbiot_test) ######################################################################## # FILE TEST @@ -420,17 +418,17 @@ target_link_libraries(npbch_file_test srslte_phy) add_executable(npdsch_npdcch_file_test npdsch_npdcch_file_test.c) target_link_libraries(npdsch_npdcch_file_test srslte_phy) -add_test(pbch_file_test pbch_file_test -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.1.92M.dat) +add_lte_test(pbch_file_test pbch_file_test -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.1.92M.dat) add_executable(pmch_file_test pmch_file_test.c) target_link_libraries(pmch_file_test srslte_phy) -add_test(pbch_file_test pbch_file_test -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.1.92M.dat) -add_test(pcfich_file_test pcfich_file_test -c 150 -n 50 -p 2 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.10M.dat) -add_test(phich_file_test phich_file_test -c 150 -n 50 -p 2 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.10M.dat) -add_test(pdcch_file_test pdcch_file_test -c 1 -f 3 -n 6 -p 1 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.1.92M.amar.dat) -add_test(pdsch_pdcch_file_test pdsch_pdcch_file_test -c 1 -f 3 -n 6 -p 1 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.1.92M.amar.dat) -add_test(pmch_file_test pmch_file_test -i ${CMAKE_CURRENT_SOURCE_DIR}/pmch_100prbs_MCS2_SR0.bin) +add_lte_test(pbch_file_test pbch_file_test -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.1.92M.dat) +add_lte_test(pcfich_file_test pcfich_file_test -c 150 -n 50 -p 2 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.10M.dat) +add_lte_test(phich_file_test phich_file_test -c 150 -n 50 -p 2 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.10M.dat) +add_lte_test(pdcch_file_test pdcch_file_test -c 1 -f 3 -n 6 -p 1 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.1.92M.amar.dat) +add_lte_test(pdsch_pdcch_file_test pdsch_pdcch_file_test -c 1 -f 3 -n 6 -p 1 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.1.92M.amar.dat) +add_lte_test(pmch_file_test pmch_file_test -i ${CMAKE_CURRENT_SOURCE_DIR}/pmch_100prbs_MCS2_SR0.bin) ######################################################################## # NPDCCH TEST @@ -438,15 +436,15 @@ add_test(pmch_file_test pmch_file_test -i ${CMAKE_CURRENT_SOURCE_DIR}/pmch_100p add_executable(npdcch_test npdcch_test.c) target_link_libraries(npdcch_test srslte_phy) -add_test(npdcch_formatN1_test npdcch_test -o FormatN1) +add_lte_test(npdcch_formatN1_test npdcch_test -o FormatN1) add_executable(npdcch_file_test npdcch_file_test.c) target_link_libraries(npdcch_file_test srslte_phy) -add_test(npdcch_formatN0_file_test npdcch_file_test -c 0 -t 8624 -r 258 -L 1 -l 0 -v -o FormatN0 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal_nbiot_dci_formatN0_L_1_nid0_tti_8624_rnti_0x102.bin) -add_test(npdcch_formatN1_file_test npdcch_file_test -c 0 -t 5461 -r 137 -L 2 -l 0 -v -o FormatN1 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal_nbiot_dci_formatN1_nid0_tti_5461_rnti_0x89.bin) +add_lte_test(npdcch_formatN0_file_test npdcch_file_test -c 0 -t 8624 -r 258 -L 1 -l 0 -v -o FormatN0 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal_nbiot_dci_formatN0_L_1_nid0_tti_8624_rnti_0x102.bin) +add_lte_test(npdcch_formatN1_file_test npdcch_file_test -c 0 -t 5461 -r 137 -L 2 -l 0 -v -o FormatN1 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal_nbiot_dci_formatN1_nid0_tti_5461_rnti_0x89.bin) -add_test(npdsch_npdcch_dci_formatN0_test npdsch_npdcch_file_test -c 0 -s 4 -w 862 -r 0x102 -v -o FormatN0 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal_nbiot_dci_formatN0_L_1_nid0_tti_8624_rnti_0x102.bin) -add_test(npdsch_npdcch_dci_formatN1_test npdsch_npdcch_file_test -c 0 -s 1 -w 546 -r 0x89 -v -o FormatN1 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal_nbiot_dci_formatN1_nid0_tti_5461_rnti_0x89.bin) +add_lte_test(npdsch_npdcch_dci_formatN0_test npdsch_npdcch_file_test -c 0 -s 4 -w 862 -r 0x102 -v -o FormatN0 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal_nbiot_dci_formatN0_L_1_nid0_tti_8624_rnti_0x102.bin) +add_lte_test(npdsch_npdcch_dci_formatN1_test npdsch_npdcch_file_test -c 0 -s 1 -w 546 -r 0x89 -v -o FormatN1 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal_nbiot_dci_formatN1_nid0_tti_5461_rnti_0x89.bin) ######################################################################## # PUSCH TEST @@ -523,7 +521,7 @@ foreach (cell_n_prb 6 15 25 50 75 100) string(REGEX REPLACE "\ " "" test_name_args ${pusch_test_args}) - add_test(pusch_test${test_name_args} pusch_test ${pusch_test_args}) + add_lte_test(pusch_test${test_name_args} pusch_test ${pusch_test_args}) endforeach (cqi) endforeach (ack) endforeach (mcs) @@ -537,8 +535,8 @@ endforeach (cell_n_prb) add_executable(pucch_test pucch_test.c) target_link_libraries(pucch_test srslte_phy) -add_test(pucch_test pucch_test) -add_test(pucch_test_uci_cqi_decoder pucch_test -q) +add_lte_test(pucch_test pucch_test) +add_lte_test(pucch_test_uci_cqi_decoder pucch_test -q) ######################################################################## # PRACH TEST @@ -547,67 +545,67 @@ add_test(pucch_test_uci_cqi_decoder pucch_test -q) add_executable(prach_test prach_test.c) target_link_libraries(prach_test srslte_phy) -add_test(prach prach_test) +add_lte_test(prach prach_test) -add_test(prach_256 prach_test -n 15) -add_test(prach_512 prach_test -n 25) -add_test(prach_1024 prach_test -n 50) -add_test(prach_1536 prach_test -n 75) -add_test(prach_2048 prach_test -n 100) +add_lte_test(prach_256 prach_test -n 15) +add_lte_test(prach_512 prach_test -n 25) +add_lte_test(prach_1024 prach_test -n 50) +add_lte_test(prach_1536 prach_test -n 75) +add_lte_test(prach_2048 prach_test -n 100) -add_test(prach_f0 prach_test -f 0) -add_test(prach_f1 prach_test -f 1) -add_test(prach_f2 prach_test -f 2) -add_test(prach_f3 prach_test -f 3) +add_lte_test(prach_f0 prach_test -f 0) +add_lte_test(prach_f1 prach_test -f 1) +add_lte_test(prach_f2 prach_test -f 2) +add_lte_test(prach_f3 prach_test -f 3) -add_test(prach_rs1 prach_test -r 1) -add_test(prach_rs2 prach_test -r 2) -add_test(prach_rs3 prach_test -r 3) +add_lte_test(prach_rs1 prach_test -r 1) +add_lte_test(prach_rs2 prach_test -r 2) +add_lte_test(prach_rs3 prach_test -r 3) -add_test(prach_zc0 prach_test -z 0) -add_test(prach_zc2 prach_test -z 2) -add_test(prach_zc3 prach_test -z 3) +add_lte_test(prach_zc0 prach_test -z 0) +add_lte_test(prach_zc2 prach_test -z 2) +add_lte_test(prach_zc3 prach_test -z 3) add_executable(prach_test_multi prach_test_multi.c) target_link_libraries(prach_test_multi srslte_phy) -add_test(prach_test_multi prach_test_multi) +add_lte_test(prach_test_multi prach_test_multi) -add_test(prach_test_multi_n32 prach_test_multi -n 32) -add_test(prach_test_multi_n16 prach_test_multi -n 16) -add_test(prach_test_multi_n8 prach_test_multi -n 8) -add_test(prach_test_multi_n4 prach_test_multi -n 4) +add_lte_test(prach_test_multi_n32 prach_test_multi -n 32) +add_lte_test(prach_test_multi_n16 prach_test_multi -n 16) +add_lte_test(prach_test_multi_n8 prach_test_multi -n 8) +add_lte_test(prach_test_multi_n4 prach_test_multi -n 4) -add_test(prach_test_multi_stagger_power prach_test_multi -s -S) -add_test(prach_test_multi_stagger_power prach_test_multi -s -S -N 50) +add_lte_test(prach_test_multi_stagger_power prach_test_multi -s -S) +add_lte_test(prach_test_multi_stagger_power prach_test_multi -s -S -N 50) -add_test(prach_test_multi_offset_test prach_test_multi -O) -add_test(prach_test_multi_offset_test_50 prach_test_multi -O -N 50) +add_lte_test(prach_test_multi_offset_test prach_test_multi -O) +add_lte_test(prach_test_multi_offset_test_50 prach_test_multi -O -N 50) -add_test(prach_test_multi_freq_offset_test_n1_o100_prb6 prach_test_multi -n 1 -F -z 0 -o 100) -add_test(prach_test_multi_freq_offset_test_n1_o500_prb6 prach_test_multi -n 1 -F -z 0 -o 500) -add_test(prach_test_multi_freq_offset_test_n1_o800_prb6 prach_test_multi -n 1 -F -z 0 -o 800) +add_lte_test(prach_test_multi_freq_offset_test_n1_o100_prb6 prach_test_multi -n 1 -F -z 0 -o 100) +add_lte_test(prach_test_multi_freq_offset_test_n1_o500_prb6 prach_test_multi -n 1 -F -z 0 -o 500) +add_lte_test(prach_test_multi_freq_offset_test_n1_o800_prb6 prach_test_multi -n 1 -F -z 0 -o 800) -add_test(prach_test_multi_freq_offset_test_n1_o100_prb50 prach_test_multi -n 1 -F -z 0 -o 100 -N 50) -add_test(prach_test_multi_freq_offset_test_n1_o500_prb50 prach_test_multi -n 1 -F -z 0 -o 500 -N 50) -add_test(prach_test_multi_freq_offset_test_n1_o800_prb50 prach_test_multi -n 1 -F -z 0 -o 800 -N 50) +add_lte_test(prach_test_multi_freq_offset_test_n1_o100_prb50 prach_test_multi -n 1 -F -z 0 -o 100 -N 50) +add_lte_test(prach_test_multi_freq_offset_test_n1_o500_prb50 prach_test_multi -n 1 -F -z 0 -o 500 -N 50) +add_lte_test(prach_test_multi_freq_offset_test_n1_o800_prb50 prach_test_multi -n 1 -F -z 0 -o 800 -N 50) -add_test(prach_test_multi_freq_offset_test_n2_o100_prb6 prach_test_multi -n 2 -F -z 0 -o 100) -add_test(prach_test_multi_freq_offset_test_n2_o500_prb6 prach_test_multi -n 2 -F -z 0 -o 500) -add_test(prach_test_multi_freq_offset_test_n2_o800_prb6 prach_test_multi -n 2 -F -z 0 -o 800) +add_lte_test(prach_test_multi_freq_offset_test_n2_o100_prb6 prach_test_multi -n 2 -F -z 0 -o 100) +add_lte_test(prach_test_multi_freq_offset_test_n2_o500_prb6 prach_test_multi -n 2 -F -z 0 -o 500) +add_lte_test(prach_test_multi_freq_offset_test_n2_o800_prb6 prach_test_multi -n 2 -F -z 0 -o 800) -add_test(prach_test_multi_freq_offset_test_n2_o100_prb50 prach_test_multi -n 2 -F -z 0 -o 100 -N 50) -add_test(prach_test_multi_freq_offset_test_n2_o500_prb50 prach_test_multi -n 2 -F -z 0 -o 500 -N 50) -add_test(prach_test_multi_freq_offset_test_n2_o800_prb50 prach_test_multi -n 2 -F -z 0 -o 800 -N 50) +add_lte_test(prach_test_multi_freq_offset_test_n2_o100_prb50 prach_test_multi -n 2 -F -z 0 -o 100 -N 50) +add_lte_test(prach_test_multi_freq_offset_test_n2_o500_prb50 prach_test_multi -n 2 -F -z 0 -o 500 -N 50) +add_lte_test(prach_test_multi_freq_offset_test_n2_o800_prb50 prach_test_multi -n 2 -F -z 0 -o 800 -N 50) -add_test(prach_test_multi_freq_offset_test_n4_o100_prb6 prach_test_multi -n 4 -F -z 0 -o 100) -add_test(prach_test_multi_freq_offset_test_n4_o500_prb6 prach_test_multi -n 4 -F -z 0 -o 500) -add_test(prach_test_multi_freq_offset_test_n4_o800_prb6 prach_test_multi -n 4 -F -z 0 -o 800) +add_lte_test(prach_test_multi_freq_offset_test_n4_o100_prb6 prach_test_multi -n 4 -F -z 0 -o 100) +add_lte_test(prach_test_multi_freq_offset_test_n4_o500_prb6 prach_test_multi -n 4 -F -z 0 -o 500) +add_lte_test(prach_test_multi_freq_offset_test_n4_o800_prb6 prach_test_multi -n 4 -F -z 0 -o 800) -add_test(prach_test_multi_freq_offset_test_n4_o100_prb50 prach_test_multi -n 4 -F -z 0 -o 100 -N 50) -add_test(prach_test_multi_freq_offset_test_n4_o500_prb50 prach_test_multi -n 4 -F -z 0 -o 500 -N 50) -add_test(prach_test_multi_freq_offset_test_n4_o800_prb50 prach_test_multi -n 4 -F -z 0 -o 800 -N 50) +add_lte_test(prach_test_multi_freq_offset_test_n4_o100_prb50 prach_test_multi -n 4 -F -z 0 -o 100 -N 50) +add_lte_test(prach_test_multi_freq_offset_test_n4_o500_prb50 prach_test_multi -n 4 -F -z 0 -o 500 -N 50) +add_lte_test(prach_test_multi_freq_offset_test_n4_o800_prb50 prach_test_multi -n 4 -F -z 0 -o 800 -N 50) if(RF_FOUND) add_executable(prach_test_usrp prach_test_usrp.c) @@ -620,20 +618,20 @@ endif(RF_FOUND) add_executable(pucch_nr_test pucch_nr_test.c) target_link_libraries(pucch_nr_test srslte_phy) -add_test(pucch_nr_test pucch_nr_test) +add_nr_test(pucch_nr_test pucch_nr_test) add_executable(sch_nr_test sch_nr_test.c) target_link_libraries(sch_nr_test srslte_phy) -add_test(sch_nr_test sch_nr_test -m 0 -p 1) +add_nr_test(sch_nr_test sch_nr_test -m 0 -p 1) add_executable(pdsch_nr_test pdsch_nr_test.c) target_link_libraries(pdsch_nr_test srslte_phy) -add_test(pdsch_nr_test pdsch_nr_test -p 6 -m 20) +add_nr_test(pdsch_nr_test pdsch_nr_test -p 6 -m 20) add_executable(pusch_nr_test pusch_nr_test.c) target_link_libraries(pusch_nr_test srslte_phy) -add_test(pusch_nr_test pusch_nr_test -p 6 -m 20) +add_nr_test(pusch_nr_test pusch_nr_test -p 6 -m 20) add_executable(pdcch_nr_test pdcch_nr_test.c) target_link_libraries(pdcch_nr_test srslte_phy) -add_test(pdcch_nr_test pdcch_nr_test) +add_nr_test(pdcch_nr_test pdcch_nr_test) diff --git a/lib/test/phy/CMakeLists.txt b/lib/test/phy/CMakeLists.txt index da276c07a..bd4872614 100644 --- a/lib/test/phy/CMakeLists.txt +++ b/lib/test/phy/CMakeLists.txt @@ -9,6 +9,8 @@ ####################################################################### # PHY TESTS ####################################################################### +set(CTEST_LABELS "lib;phy") + add_executable(phy_dl_test phy_dl_test.c) target_link_libraries(phy_dl_test srslte_phy srslte_common srslte_phy ${SEC_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) @@ -38,8 +40,7 @@ foreach (cell_n_prb 6 15 25 50 75 100) endif (${allow_256}) set(phy_dl_test_args ${phy_dl_test_args} -m ${ue_dl_mcs}) string(REGEX REPLACE "\ " "" test_name_args ${phy_dl_test_args}) - add_test(phy_dl_test${test_name_args} phy_dl_test ${phy_dl_test_args}) - set_tests_properties(phy_dl_test${test_name_args} PROPERTIES LABELS "long;phy") + add_lte_test(phy_dl_test${test_name_args} phy_dl_test ${phy_dl_test_args}) endforeach (ue_dl_mcs) endforeach (ue_dl_tm) endforeach (allow_256 0 1) @@ -47,9 +48,8 @@ endforeach (cell_n_prb) add_executable(pucch_ca_test pucch_ca_test.c) target_link_libraries(pucch_ca_test srslte_phy srslte_common srslte_phy ${SEC_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) -add_test(pucch_ca_test pucch_ca_test) -set_tests_properties(pucch_ca_test PROPERTIES LABELS "long;phy") +add_lte_test(pucch_ca_test pucch_ca_test) add_executable(phy_dl_nr_test phy_dl_nr_test.c) target_link_libraries(phy_dl_nr_test srslte_phy srslte_common srslte_phy ${SEC_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) -add_test(phy_dl_nr_test phy_dl_nr_test -p 100 -m 28) \ No newline at end of file +add_nr_test(phy_dl_nr_test phy_dl_nr_test -p 100 -m 28) \ No newline at end of file diff --git a/lib/test/upper/CMakeLists.txt b/lib/test/upper/CMakeLists.txt index 00fcd20a9..cd0ac0034 100644 --- a/lib/test/upper/CMakeLists.txt +++ b/lib/test/upper/CMakeLists.txt @@ -6,36 +6,34 @@ # the distribution. # +set(CTEST_LABELS "lib;upper") + add_executable(rlc_am_data_test rlc_am_data_test.cc) target_link_libraries(rlc_am_data_test srslte_upper srslte_phy srslte_common) -add_test(rlc_am_data_test rlc_am_data_test) +add_lte_test(rlc_am_data_test rlc_am_data_test) add_executable(rlc_am_control_test rlc_am_control_test.cc) target_link_libraries(rlc_am_control_test srslte_upper srslte_phy) -add_test(rlc_am_control_test rlc_am_control_test) +add_lte_test(rlc_am_control_test rlc_am_control_test) add_executable(rlc_am_test rlc_am_test.cc) target_link_libraries(rlc_am_test srslte_upper srslte_phy srslte_common) -add_test(rlc_am_test rlc_am_test) +add_lte_test(rlc_am_test rlc_am_test) if (ENABLE_5GNR) add_executable(rlc_am_nr_pdu_test rlc_am_nr_pdu_test.cc) target_link_libraries(rlc_am_nr_pdu_test srslte_upper srslte_phy) - add_test(rlc_am_nr_pdu_test rlc_am_nr_pdu_test) + add_nr_test(rlc_am_nr_pdu_test rlc_am_nr_pdu_test) endif(ENABLE_5GNR) add_executable(rlc_stress_test rlc_stress_test.cc) target_link_libraries(rlc_stress_test srslte_upper srslte_mac srslte_phy srslte_common ${Boost_LIBRARIES}) -add_test(rlc_am_stress_test rlc_stress_test --mode=AM --loglevel 1 --sdu_gen_delay 250) -add_test(rlc_um_stress_test rlc_stress_test --mode=UM --loglevel 1) -add_test(rlc_tm_stress_test rlc_stress_test --mode=TM --loglevel 1 --random_opp=false) +add_lte_test(rlc_am_stress_test rlc_stress_test --mode=AM --loglevel 1 --sdu_gen_delay 250) +add_lte_test(rlc_um_stress_test rlc_stress_test --mode=UM --loglevel 1) +add_lte_test(rlc_tm_stress_test rlc_stress_test --mode=TM --loglevel 1 --random_opp=false) if (ENABLE_5GNR) - add_test(rlc_um_nr_stress_test rlc_stress_test --rat NR --mode=UM --loglevel 1) - set_tests_properties(rlc_um_nr_stress_test PROPERTIES LABELS "long;upper;lib;nr") + add_nr_test(rlc_um_nr_stress_test rlc_stress_test --rat NR --mode=UM --loglevel 1) endif(ENABLE_5GNR) -set_tests_properties(rlc_am_stress_test PROPERTIES TIMEOUT 3000) -set_tests_properties(rlc_um_stress_test PROPERTIES TIMEOUT 3000) -set_tests_properties(rlc_tm_stress_test PROPERTIES TIMEOUT 3000) add_executable(rlc_um_data_test rlc_um_data_test.cc) target_link_libraries(rlc_um_data_test srslte_upper srslte_phy srslte_common) @@ -52,24 +50,23 @@ add_test(rlc_common_test rlc_common_test) if (ENABLE_5GNR) add_executable(rlc_um_nr_pdu_test rlc_um_nr_pdu_test.cc) target_link_libraries(rlc_um_nr_pdu_test srslte_upper srslte_phy) - add_test(rlc_um_nr_pdu_test rlc_um_nr_pdu_test) + add_nr_test(rlc_um_nr_pdu_test rlc_um_nr_pdu_test) add_executable(rlc_um_nr_test rlc_um_nr_test.cc) target_link_libraries(rlc_um_nr_test srslte_upper srslte_phy) - add_test(rlc_um_nr_test rlc_um_nr_test) + add_nr_test(rlc_um_nr_test rlc_um_nr_test) add_executable(pdcp_nr_test_tx pdcp_nr_test_tx.cc) target_link_libraries(pdcp_nr_test_tx srslte_upper srslte_common) - add_test(pdcp_nr_test_tx pdcp_nr_test_tx) - set_tests_properties(pdcp_nr_test_tx PROPERTIES LABELS "long;upper") + add_nr_test(pdcp_nr_test_tx pdcp_nr_test_tx) add_executable(pdcp_nr_test_rx pdcp_nr_test_rx.cc) target_link_libraries(pdcp_nr_test_rx srslte_upper srslte_common) - add_test(pdcp_nr_test_rx pdcp_nr_test_rx) + add_nr_test(pdcp_nr_test_rx pdcp_nr_test_rx) add_executable(pdcp_nr_test_discard_sdu pdcp_nr_test_discard_sdu.cc) target_link_libraries(pdcp_nr_test_discard_sdu srslte_upper srslte_common) - add_test(pdcp_nr_test_discard_sdu pdcp_nr_test_discard_sdu) + add_nr_test(pdcp_nr_test_discard_sdu pdcp_nr_test_discard_sdu) endif(ENABLE_5GNR) add_executable(pdcp_lte_test_rx pdcp_lte_test_rx.cc) diff --git a/srsenb/test/phy/CMakeLists.txt b/srsenb/test/phy/CMakeLists.txt index 7482a16b9..e106f9312 100644 --- a/srsenb/test/phy/CMakeLists.txt +++ b/srsenb/test/phy/CMakeLists.txt @@ -6,6 +6,8 @@ # the distribution. # +set(CTEST_LABELS "srsenb;phy") + add_executable(enb_phy_test enb_phy_test.cc) target_link_libraries(enb_phy_test srsenb_phy @@ -21,32 +23,28 @@ set(ENB_PHY_TEST_DURATION 128) # - Transmission Mode 1 # - 1 eNb cell/carrier (no carrier aggregation) # - 100 PRB -add_test(enb_phy_test_tm1 enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --cell.nof_prb=100 --tm=1) -set_tests_properties(enb_phy_test_tm1 PROPERTIES LABELS "long;phy;srsenb") +add_lte_test(enb_phy_test_tm1 enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --cell.nof_prb=100 --tm=1) # Single carrier TM2 eNb PHY test: # - Single carrier # - Transmission Mode 2 # - 1 eNb cell/carrier (no carrier aggregation) # - 100 PRB -add_test(enb_phy_test_tm2 enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --cell.nof_prb=100 --tm=2) -set_tests_properties(enb_phy_test_tm2 PROPERTIES LABELS "long;phy;srsenb") +add_lte_test(enb_phy_test_tm2 enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --cell.nof_prb=100 --tm=2) # Single carrier TM3 eNb PHY test: # - Single carrier # - Transmission Mode 3 # - 1 eNb cell/carrier (no carrier aggregation) # - 100 PRB -add_test(enb_phy_test_tm3 enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --cell.nof_prb=100 --tm=3) -set_tests_properties(enb_phy_test_tm3 PROPERTIES LABELS "long;phy;srsenb") +add_lte_test(enb_phy_test_tm3 enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --cell.nof_prb=100 --tm=3) # Single carrier eNb PHY test: # - Single carrier # - Transmission Mode 4 # - 1 eNb cell/carrier (no carrier aggregation) # - 100 PRB -add_test(enb_phy_test_tm4 enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --cell.nof_prb=100 --tm=4) -set_tests_properties(enb_phy_test_tm4 PROPERTIES LABELS "long;phy;srsenb") +add_lte_test(enb_phy_test_tm4 enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --cell.nof_prb=100 --tm=4) # Five carrier aggregation using PUCCH3: # - 6 eNb cell/carrier @@ -54,7 +52,7 @@ set_tests_properties(enb_phy_test_tm4 PROPERTIES LABELS "long;phy;srsenb") # - 5 Aggregated carriers # - 6 PRB # - PUCCH format 3 ACK/NACK feedback mode and more than 2 ACK/NACK bits in PUSCH -add_test(enb_phy_test_tm1_ca_pucch3 enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --nof_enb_cells=6 --ue_cell_list=3,4,0,1,2 --ack_mode=pucch3 --cell.nof_prb=6 --tm=1) +add_lte_test(enb_phy_test_tm1_ca_pucch3 enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --nof_enb_cells=6 --ue_cell_list=3,4,0,1,2 --ack_mode=pucch3 --cell.nof_prb=6 --tm=1) # Five carrier aggregation using PUCCH3: # - 6 eNb cell/carrier @@ -62,7 +60,7 @@ add_test(enb_phy_test_tm1_ca_pucch3 enb_phy_test --duration=${ENB_PHY_TEST_DURAT # - 5 Aggregated carriers # - 6 PRB # - PUCCH format 3 ACK/NACK feedback mode and more than 2 ACK/NACK bits in PUSCH -add_test(enb_phy_test_tm4_ca_pucch3 enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --nof_enb_cells=6 --ue_cell_list=0,4,3,1,2 --ack_mode=pucch3 --cell.nof_prb=6 --tm=4) +add_lte_test(enb_phy_test_tm4_ca_pucch3 enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --nof_enb_cells=6 --ue_cell_list=0,4,3,1,2 --ack_mode=pucch3 --cell.nof_prb=6 --tm=4) # Two carrier aggregation using Channel Selection: # - 6 eNb cell/carrier @@ -70,7 +68,7 @@ add_test(enb_phy_test_tm4_ca_pucch3 enb_phy_test --duration=${ENB_PHY_TEST_DURAT # - 2 Aggregated carriers # - 6 PRB # - PUCCH format 1b with Channel selection ACK/NACK feedback mode -add_test(enb_phy_test_tm1_ca_cs enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --nof_enb_cells=6 --ue_cell_list=5,4 --ack_mode=cs --cell.nof_prb=6 --tm=1) +add_lte_test(enb_phy_test_tm1_ca_cs enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --nof_enb_cells=6 --ue_cell_list=5,4 --ack_mode=cs --cell.nof_prb=6 --tm=1) # Two carrier aggregation using Channel Selection: # - 6 eNb cell/carrier @@ -78,7 +76,7 @@ add_test(enb_phy_test_tm1_ca_cs enb_phy_test --duration=${ENB_PHY_TEST_DURATION} # - 2 Aggregated carriers # - 6 PRB # - PUCCH format 1b with Channel selection ACK/NACK feedback mode -add_test(enb_phy_test_tm4_ca_cs enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --nof_enb_cells=6 --ue_cell_list=1,5 --ack_mode=cs --cell.nof_prb=6 --tm=4) +add_lte_test(enb_phy_test_tm4_ca_cs enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --nof_enb_cells=6 --ue_cell_list=1,5 --ack_mode=cs --cell.nof_prb=6 --tm=4) # Two carrier aggregation using Channel Selection and HO: # - 3 eNb cell/carrier @@ -86,5 +84,4 @@ add_test(enb_phy_test_tm4_ca_cs enb_phy_test --duration=${ENB_PHY_TEST_DURATION} # - 2 Aggregated carriers # - 100 PRB # - PUCCH format 1b with Channel selection ACK/NACK feedback mode -add_test(enb_phy_test_tm1_ca_cs_ho enb_phy_test --duration=1000 --nof_enb_cells=3 --ue_cell_list=2,0 --ack_mode=cs --cell.nof_prb=100 --tm=1 --rotation=100) -set_tests_properties(enb_phy_test_tm1_ca_cs_ho PROPERTIES LABELS "long;phy;srsenb") +add_lte_test(enb_phy_test_tm1_ca_cs_ho enb_phy_test --duration=1000 --nof_enb_cells=3 --ue_cell_list=2,0 --ack_mode=cs --cell.nof_prb=100 --tm=1 --rotation=100) diff --git a/srsue/test/phy/CMakeLists.txt b/srsue/test/phy/CMakeLists.txt index 74a75bd5a..e53a43ab3 100644 --- a/srsue/test/phy/CMakeLists.txt +++ b/srsue/test/phy/CMakeLists.txt @@ -6,6 +6,8 @@ # the distribution. # +set(CTEST_LABELS "srsue;phy") + include_directories( ${Boost_INCLUDE_DIRS} ${SEC_INCLUDE_DIRS} @@ -36,5 +38,4 @@ target_link_libraries(scell_search_test srslte_radio ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES}) -add_test(scell_search_test scell_search_test --duration=5 --cell.nof_prb=6 --active_cell_list=2,3,4,5,6 --simulation_cell_list=1,2,3,4,5,6 --channel_period_s=30 --channel.hst.fd=750 --channel.delay_max=10000) -set_tests_properties(scell_search_test PROPERTIES LABELS "long;phy;srsue") +add_lte_test(scell_search_test scell_search_test --duration=5 --cell.nof_prb=6 --active_cell_list=2,3,4,5,6 --simulation_cell_list=1,2,3,4,5,6 --channel_period_s=30 --channel.hst.fd=750 --channel.delay_max=10000)