From 84f34bc736e4dd0caaca825e3e4a9854ab71fdb3 Mon Sep 17 00:00:00 2001 From: Francisco Paisana Date: Wed, 1 Jul 2020 11:51:49 +0100 Subject: [PATCH] changed to a label filtering approach for ctest --- lib/src/phy/ch_estimation/test/CMakeLists.txt | 3 ++- lib/test/phy/CMakeLists.txt | 4 +++- lib/test/upper/CMakeLists.txt | 4 +++- srsenb/test/phy/CMakeLists.txt | 7 ++++++- srsue/test/phy/CMakeLists.txt | 3 ++- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/lib/src/phy/ch_estimation/test/CMakeLists.txt b/lib/src/phy/ch_estimation/test/CMakeLists.txt index 9a41aad68..849c64d37 100644 --- a/lib/src/phy/ch_estimation/test/CMakeLists.txt +++ b/lib/src/phy/ch_estimation/test/CMakeLists.txt @@ -56,7 +56,8 @@ 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(long_chest_test_srs_${cell_n_prb} chest_test_srs -c 2 -r ${cell_n_prb}) + 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 "long;phy") endforeach(cell_n_prb 6 15 25 50 75 100) diff --git a/lib/test/phy/CMakeLists.txt b/lib/test/phy/CMakeLists.txt index 5b462ec32..c65d18ede 100644 --- a/lib/test/phy/CMakeLists.txt +++ b/lib/test/phy/CMakeLists.txt @@ -52,6 +52,7 @@ foreach (cell_n_prb 6 15 25 50 75 100) 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") endforeach (ue_dl_mcs) endforeach (ue_dl_tm) endforeach (allow_256 0 1) @@ -59,5 +60,6 @@ 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(long_pucch_ca_test pucch_ca_test) +add_test(pucch_ca_test pucch_ca_test) +set_tests_properties(pucch_ca_test PROPERTIES LABELS "long;phy") diff --git a/lib/test/upper/CMakeLists.txt b/lib/test/upper/CMakeLists.txt index b2b4b7a1f..9f59f8414 100644 --- a/lib/test/upper/CMakeLists.txt +++ b/lib/test/upper/CMakeLists.txt @@ -43,6 +43,7 @@ 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) 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") endif(ENABLE_5GNR) set_tests_properties(rlc_am_stress_test PROPERTIES TIMEOUT 3000) set_tests_properties(rlc_um_stress_test PROPERTIES TIMEOUT 3000) @@ -71,7 +72,8 @@ if (ENABLE_5GNR) add_executable(pdcp_nr_test_tx pdcp_nr_test_tx.cc) target_link_libraries(pdcp_nr_test_tx srslte_upper srslte_common) - add_test(long_pdcp_nr_test_tx pdcp_nr_test_tx) + add_test(pdcp_nr_test_tx pdcp_nr_test_tx) + set_tests_properties(pdcp_nr_test_tx PROPERTIES LABELS "long;upper") add_executable(pdcp_nr_test_rx pdcp_nr_test_rx.cc) target_link_libraries(pdcp_nr_test_rx srslte_upper srslte_common) diff --git a/srsenb/test/phy/CMakeLists.txt b/srsenb/test/phy/CMakeLists.txt index be74e287a..993a72729 100644 --- a/srsenb/test/phy/CMakeLists.txt +++ b/srsenb/test/phy/CMakeLists.txt @@ -41,6 +41,7 @@ set(ENB_PHY_TEST_DURATION 128) # - 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") # Single carrier TM2 eNb PHY test: # - Single carrier @@ -48,6 +49,7 @@ add_test(enb_phy_test_tm1 enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --cel # - 1 eNb cell/carrier (no carrier aggregation) # - 6 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") # Single carrier TM3 eNb PHY test: # - Single carrier @@ -55,6 +57,7 @@ add_test(enb_phy_test_tm2 enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --cel # - 1 eNb cell/carrier (no carrier aggregation) # - 6 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") # Single carrier eNb PHY test: # - Single carrier @@ -62,6 +65,7 @@ add_test(enb_phy_test_tm3 enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --cel # - 1 eNb cell/carrier (no carrier aggregation) # - 6 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") # Five carrier aggregation using PUCCH3: # - 6 eNb cell/carrier @@ -101,4 +105,5 @@ 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(long_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) +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") diff --git a/srsue/test/phy/CMakeLists.txt b/srsue/test/phy/CMakeLists.txt index ef12b3ea1..8e41dceb9 100644 --- a/srsue/test/phy/CMakeLists.txt +++ b/srsue/test/phy/CMakeLists.txt @@ -59,4 +59,5 @@ target_link_libraries(scell_search_test rrc_asn1 ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES}) -add_test(long_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) +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")