From 94959b531815e35bca465e9b19724792c3114833 Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Thu, 10 Jun 2021 10:47:32 +0200 Subject: [PATCH] srsue,test: reorganize test folders and move to components like we in PHY --- srsue/CMakeLists.txt | 1 - srsue/src/CMakeLists.txt | 1 + srsue/src/phy/CMakeLists.txt | 2 + .../{test/phy => src/phy/test}/CMakeLists.txt | 0 .../phy => src/phy/test}/nr_cell_search_rf.cc | 0 .../phy/test}/nr_cell_search_test.cc | 0 .../phy => src/phy/test}/scell_search_test.cc | 0 .../{test/phy => src/phy/test}/ue_phy_test.cc | 0 srsue/src/stack/mac/CMakeLists.txt | 2 + srsue/{ => src/stack/mac}/test/CMakeLists.txt | 11 ------ srsue/{ => src/stack/mac}/test/mac_test.cc | 0 srsue/src/stack/rrc/CMakeLists.txt | 2 + .../stack/rrc/test}/CMakeLists.txt | 24 +----------- .../stack/rrc/test}/rrc_cell_test.cc | 0 .../stack/rrc/test}/rrc_meas_test.cc | 0 .../stack/rrc/test}/rrc_phy_ctrl_test.cc | 0 .../stack/rrc/test}/rrc_reconfig_test.cc | 0 .../stack/rrc/test}/ue_rrc_nr_test.cc | 0 srsue/src/stack/upper/CMakeLists.txt | 2 + srsue/src/stack/upper/test/CMakeLists.txt | 39 +++++++++++++++++++ .../upper => src/stack/upper/test}/gw_test.cc | 0 .../stack/upper/test}/nas_test.cc | 0 .../stack/upper/test}/pcsc_usim_test.cc | 0 .../stack/upper/test}/tft_test.cc | 0 .../stack/upper/test}/usim_test.cc | 0 srsue/src/test/CMakeLists.txt | 15 +++++++ srsue/{ => src}/test/metrics_test.cc | 0 srsue/{ => src}/test/ttcn3/CMakeLists.txt | 0 srsue/{ => src}/test/ttcn3/README.md | 0 srsue/{ => src}/test/ttcn3/hdr/dut_utils.h | 0 .../{ => src}/test/ttcn3/hdr/lte_ttcn3_phy.h | 0 .../{ => src}/test/ttcn3/hdr/swappable_sink.h | 0 srsue/{ => src}/test/ttcn3/hdr/ttcn3_common.h | 0 .../test/ttcn3/hdr/ttcn3_drb_interface.h | 0 .../{ => src}/test/ttcn3/hdr/ttcn3_helpers.h | 0 .../test/ttcn3/hdr/ttcn3_interfaces.h | 0 .../test/ttcn3/hdr/ttcn3_ip_ctrl_interface.h | 0 .../test/ttcn3/hdr/ttcn3_ip_sock_interface.h | 0 .../test/ttcn3/hdr/ttcn3_port_handler.h | 0 .../test/ttcn3/hdr/ttcn3_srb_interface.h | 0 .../test/ttcn3/hdr/ttcn3_sys_interface.h | 0 srsue/{ => src}/test/ttcn3/hdr/ttcn3_syssim.h | 0 srsue/{ => src}/test/ttcn3/hdr/ttcn3_ue.h | 0 .../test/ttcn3/hdr/ttcn3_ut_interface.h | 0 srsue/{ => src}/test/ttcn3/src/CMakeLists.txt | 2 +- .../{ => src}/test/ttcn3/src/lte_ttcn3_phy.cc | 0 srsue/{ => src}/test/ttcn3/src/ttcn3_dut.cc | 0 .../{ => src}/test/ttcn3/src/ttcn3_syssim.cc | 2 +- srsue/{ => src}/test/ttcn3/src/ttcn3_ue.cc | 2 +- .../{ => src}/test/ttcn3/test/CMakeLists.txt | 2 +- .../test/ttcn3/test/rapidjson_test.cc | 1 - .../test/ttcn3/test/ttcn3_if_handler_test.cc | 0 52 files changed, 68 insertions(+), 40 deletions(-) rename srsue/{test/phy => src/phy/test}/CMakeLists.txt (100%) rename srsue/{test/phy => src/phy/test}/nr_cell_search_rf.cc (100%) rename srsue/{test/phy => src/phy/test}/nr_cell_search_test.cc (100%) rename srsue/{test/phy => src/phy/test}/scell_search_test.cc (100%) rename srsue/{test/phy => src/phy/test}/ue_phy_test.cc (100%) rename srsue/{ => src/stack/mac}/test/CMakeLists.txt (52%) rename srsue/{ => src/stack/mac}/test/mac_test.cc (100%) rename srsue/{test/upper => src/stack/rrc/test}/CMakeLists.txt (68%) rename srsue/{test/upper => src/stack/rrc/test}/rrc_cell_test.cc (100%) rename srsue/{test/upper => src/stack/rrc/test}/rrc_meas_test.cc (100%) rename srsue/{test/upper => src/stack/rrc/test}/rrc_phy_ctrl_test.cc (100%) rename srsue/{test/upper => src/stack/rrc/test}/rrc_reconfig_test.cc (100%) rename srsue/{test/upper => src/stack/rrc/test}/ue_rrc_nr_test.cc (100%) create mode 100644 srsue/src/stack/upper/test/CMakeLists.txt rename srsue/{test/upper => src/stack/upper/test}/gw_test.cc (100%) rename srsue/{test/upper => src/stack/upper/test}/nas_test.cc (100%) rename srsue/{test/upper => src/stack/upper/test}/pcsc_usim_test.cc (100%) rename srsue/{test/upper => src/stack/upper/test}/tft_test.cc (100%) rename srsue/{test/upper => src/stack/upper/test}/usim_test.cc (100%) create mode 100644 srsue/src/test/CMakeLists.txt rename srsue/{ => src}/test/metrics_test.cc (100%) rename srsue/{ => src}/test/ttcn3/CMakeLists.txt (100%) rename srsue/{ => src}/test/ttcn3/README.md (100%) rename srsue/{ => src}/test/ttcn3/hdr/dut_utils.h (100%) rename srsue/{ => src}/test/ttcn3/hdr/lte_ttcn3_phy.h (100%) rename srsue/{ => src}/test/ttcn3/hdr/swappable_sink.h (100%) rename srsue/{ => src}/test/ttcn3/hdr/ttcn3_common.h (100%) rename srsue/{ => src}/test/ttcn3/hdr/ttcn3_drb_interface.h (100%) rename srsue/{ => src}/test/ttcn3/hdr/ttcn3_helpers.h (100%) rename srsue/{ => src}/test/ttcn3/hdr/ttcn3_interfaces.h (100%) rename srsue/{ => src}/test/ttcn3/hdr/ttcn3_ip_ctrl_interface.h (100%) rename srsue/{ => src}/test/ttcn3/hdr/ttcn3_ip_sock_interface.h (100%) rename srsue/{ => src}/test/ttcn3/hdr/ttcn3_port_handler.h (100%) rename srsue/{ => src}/test/ttcn3/hdr/ttcn3_srb_interface.h (100%) rename srsue/{ => src}/test/ttcn3/hdr/ttcn3_sys_interface.h (100%) rename srsue/{ => src}/test/ttcn3/hdr/ttcn3_syssim.h (100%) rename srsue/{ => src}/test/ttcn3/hdr/ttcn3_ue.h (100%) rename srsue/{ => src}/test/ttcn3/hdr/ttcn3_ut_interface.h (100%) rename srsue/{ => src}/test/ttcn3/src/CMakeLists.txt (93%) rename srsue/{ => src}/test/ttcn3/src/lte_ttcn3_phy.cc (100%) rename srsue/{ => src}/test/ttcn3/src/ttcn3_dut.cc (100%) rename srsue/{ => src}/test/ttcn3/src/ttcn3_syssim.cc (99%) rename srsue/{ => src}/test/ttcn3/src/ttcn3_ue.cc (99%) rename srsue/{ => src}/test/ttcn3/test/CMakeLists.txt (80%) rename srsue/{ => src}/test/ttcn3/test/rapidjson_test.cc (98%) rename srsue/{ => src}/test/ttcn3/test/ttcn3_if_handler_test.cc (100%) diff --git a/srsue/CMakeLists.txt b/srsue/CMakeLists.txt index 60f3376a0..76bb4503a 100644 --- a/srsue/CMakeLists.txt +++ b/srsue/CMakeLists.txt @@ -31,7 +31,6 @@ link_directories( # Add subdirectories ######################################################################## add_subdirectory(src) -add_subdirectory(test) ######################################################################## # Default configuration files diff --git a/srsue/src/CMakeLists.txt b/srsue/src/CMakeLists.txt index aa6809c9f..1bd3e1725 100644 --- a/srsue/src/CMakeLists.txt +++ b/srsue/src/CMakeLists.txt @@ -8,6 +8,7 @@ add_subdirectory(phy) add_subdirectory(stack) +add_subdirectory(test) # Link libstdc++ and libgcc if(BUILD_STATIC) diff --git a/srsue/src/phy/CMakeLists.txt b/srsue/src/phy/CMakeLists.txt index bc668bb57..d1e45cdaf 100644 --- a/srsue/src/phy/CMakeLists.txt +++ b/srsue/src/phy/CMakeLists.txt @@ -6,6 +6,8 @@ # the distribution. # +add_subdirectory(test) + file(GLOB_RECURSE SOURCES "*.cc") add_library(srsue_phy STATIC ${SOURCES}) diff --git a/srsue/test/phy/CMakeLists.txt b/srsue/src/phy/test/CMakeLists.txt similarity index 100% rename from srsue/test/phy/CMakeLists.txt rename to srsue/src/phy/test/CMakeLists.txt diff --git a/srsue/test/phy/nr_cell_search_rf.cc b/srsue/src/phy/test/nr_cell_search_rf.cc similarity index 100% rename from srsue/test/phy/nr_cell_search_rf.cc rename to srsue/src/phy/test/nr_cell_search_rf.cc diff --git a/srsue/test/phy/nr_cell_search_test.cc b/srsue/src/phy/test/nr_cell_search_test.cc similarity index 100% rename from srsue/test/phy/nr_cell_search_test.cc rename to srsue/src/phy/test/nr_cell_search_test.cc diff --git a/srsue/test/phy/scell_search_test.cc b/srsue/src/phy/test/scell_search_test.cc similarity index 100% rename from srsue/test/phy/scell_search_test.cc rename to srsue/src/phy/test/scell_search_test.cc diff --git a/srsue/test/phy/ue_phy_test.cc b/srsue/src/phy/test/ue_phy_test.cc similarity index 100% rename from srsue/test/phy/ue_phy_test.cc rename to srsue/src/phy/test/ue_phy_test.cc diff --git a/srsue/src/stack/mac/CMakeLists.txt b/srsue/src/stack/mac/CMakeLists.txt index 66bdb43c9..1670ce449 100644 --- a/srsue/src/stack/mac/CMakeLists.txt +++ b/srsue/src/stack/mac/CMakeLists.txt @@ -6,6 +6,8 @@ # the distribution. # +add_subdirectory(test) + set(SOURCES demux.cc dl_harq.cc mac.cc mux.cc proc_bsr.cc proc_phr.cc proc_ra.cc proc_sr.cc ul_harq.cc) add_library(srsue_mac STATIC ${SOURCES}) target_link_libraries(srsue_mac srsue_mac_common ${ATOMIC_LIBS}) \ No newline at end of file diff --git a/srsue/test/CMakeLists.txt b/srsue/src/stack/mac/test/CMakeLists.txt similarity index 52% rename from srsue/test/CMakeLists.txt rename to srsue/src/stack/mac/test/CMakeLists.txt index 28af94179..d9008b75c 100644 --- a/srsue/test/CMakeLists.txt +++ b/srsue/src/stack/mac/test/CMakeLists.txt @@ -6,17 +6,6 @@ # the distribution. # -add_subdirectory(phy) -add_subdirectory(upper) - -if (ENABLE_TTCN3) - add_subdirectory(ttcn3) -endif (ENABLE_TTCN3) - -add_executable(metrics_test metrics_test.cc ../src/metrics_stdout.cc ../src/metrics_csv.cc) -target_link_libraries(metrics_test srsran_phy srsran_common) -add_test(metrics_test metrics_test -o ${CMAKE_CURRENT_BINARY_DIR}/ue_metrics.csv) - add_executable(mac_test mac_test.cc) target_link_libraries(mac_test srsue_mac srsue_phy srsran_common srsran_mac srsran_phy srsran_radio srsran_asn1 rrc_asn1 ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES}) add_test(mac_test mac_test) \ No newline at end of file diff --git a/srsue/test/mac_test.cc b/srsue/src/stack/mac/test/mac_test.cc similarity index 100% rename from srsue/test/mac_test.cc rename to srsue/src/stack/mac/test/mac_test.cc diff --git a/srsue/src/stack/rrc/CMakeLists.txt b/srsue/src/stack/rrc/CMakeLists.txt index 25ff70553..c73e0f1e3 100644 --- a/srsue/src/stack/rrc/CMakeLists.txt +++ b/srsue/src/stack/rrc/CMakeLists.txt @@ -6,6 +6,8 @@ # the distribution. # +add_subdirectory(test) + set(SOURCES rrc.cc rrc_procedures.cc rrc_meas.cc rrc_cell.cc phy_controller.cc) add_library(srsue_rrc STATIC ${SOURCES}) diff --git a/srsue/test/upper/CMakeLists.txt b/srsue/src/stack/rrc/test/CMakeLists.txt similarity index 68% rename from srsue/test/upper/CMakeLists.txt rename to srsue/src/stack/rrc/test/CMakeLists.txt index f3e3cc3db..9a79ce608 100644 --- a/srsue/test/upper/CMakeLists.txt +++ b/srsue/src/stack/rrc/test/CMakeLists.txt @@ -6,15 +6,6 @@ # the distribution. # -add_executable(usim_test usim_test.cc) -target_link_libraries(usim_test srsue_upper srsran_upper srsran_phy rrc_asn1) -add_test(usim_test usim_test) - -if(HAVE_PCSC) - add_executable(pcsc_usim_test pcsc_usim_test.cc) - target_link_libraries(pcsc_usim_test srsue_upper srsran_upper srsran_phy) -endif(HAVE_PCSC) - add_executable(rrc_reconfig_test rrc_reconfig_test.cc) target_link_libraries(rrc_reconfig_test srsue_upper srsran_upper srsran_phy rrc_asn1) add_test(rrc_reconfig_test rrc_reconfig_test) @@ -23,18 +14,6 @@ add_executable(rrc_meas_test rrc_meas_test.cc) target_link_libraries(rrc_meas_test srsue_rrc srsue_upper srsran_upper srsran_phy rrc_asn1 rrc_nr_asn1) add_test(rrc_meas_test rrc_meas_test) -add_executable(nas_test nas_test.cc) -target_link_libraries(nas_test srsue_upper srsran_upper srsran_phy rrc_asn1) -add_test(nas_test nas_test) - -add_executable(gw_test gw_test.cc) -target_link_libraries(gw_test srsue_upper srsran_upper srsran_phy) -add_test(gw_test gw_test) - -add_executable(tft_test tft_test.cc) -target_link_libraries(tft_test srsue_upper srsran_upper srsran_phy) -add_test(tft_test tft_test) - add_executable(rrc_phy_ctrl_test rrc_phy_ctrl_test.cc) target_link_libraries(rrc_phy_ctrl_test srsran_common srsue_rrc ${ATOMIC_LIBS}) add_test(rrc_phy_ctrl_test rrc_phy_ctrl_test) @@ -54,5 +33,4 @@ if (NOT ${BUILD_CMD} STREQUAL "") add_custom_command(TARGET ip_test POST_BUILD COMMAND ${BUILD_CMD}) else(NOT ${BUILD_CMD} STREQUAL "") message(STATUS "No post-build command defined") -endif (NOT ${BUILD_CMD} STREQUAL "") - +endif (NOT ${BUILD_CMD} STREQUAL "") \ No newline at end of file diff --git a/srsue/test/upper/rrc_cell_test.cc b/srsue/src/stack/rrc/test/rrc_cell_test.cc similarity index 100% rename from srsue/test/upper/rrc_cell_test.cc rename to srsue/src/stack/rrc/test/rrc_cell_test.cc diff --git a/srsue/test/upper/rrc_meas_test.cc b/srsue/src/stack/rrc/test/rrc_meas_test.cc similarity index 100% rename from srsue/test/upper/rrc_meas_test.cc rename to srsue/src/stack/rrc/test/rrc_meas_test.cc diff --git a/srsue/test/upper/rrc_phy_ctrl_test.cc b/srsue/src/stack/rrc/test/rrc_phy_ctrl_test.cc similarity index 100% rename from srsue/test/upper/rrc_phy_ctrl_test.cc rename to srsue/src/stack/rrc/test/rrc_phy_ctrl_test.cc diff --git a/srsue/test/upper/rrc_reconfig_test.cc b/srsue/src/stack/rrc/test/rrc_reconfig_test.cc similarity index 100% rename from srsue/test/upper/rrc_reconfig_test.cc rename to srsue/src/stack/rrc/test/rrc_reconfig_test.cc diff --git a/srsue/test/upper/ue_rrc_nr_test.cc b/srsue/src/stack/rrc/test/ue_rrc_nr_test.cc similarity index 100% rename from srsue/test/upper/ue_rrc_nr_test.cc rename to srsue/src/stack/rrc/test/ue_rrc_nr_test.cc diff --git a/srsue/src/stack/upper/CMakeLists.txt b/srsue/src/stack/upper/CMakeLists.txt index d027ba02c..9d814f985 100644 --- a/srsue/src/stack/upper/CMakeLists.txt +++ b/srsue/src/stack/upper/CMakeLists.txt @@ -6,6 +6,8 @@ # the distribution. # +add_subdirectory(test) + set(SOURCES nas.cc nas_emm_state.cc nas_idle_procedures.cc gw.cc usim_base.cc usim.cc tft_packet_filter.cc) if(HAVE_PCSC) diff --git a/srsue/src/stack/upper/test/CMakeLists.txt b/srsue/src/stack/upper/test/CMakeLists.txt new file mode 100644 index 000000000..54f6b5b83 --- /dev/null +++ b/srsue/src/stack/upper/test/CMakeLists.txt @@ -0,0 +1,39 @@ +# +# Copyright 2013-2021 Software Radio Systems Limited +# +# By using this file, you agree to the terms and conditions set +# forth in the LICENSE file which can be found at the top level of +# the distribution. +# + +add_executable(usim_test usim_test.cc) +target_link_libraries(usim_test srsue_upper srsran_upper srsran_phy rrc_asn1) +add_test(usim_test usim_test) + +if(HAVE_PCSC) + add_executable(pcsc_usim_test pcsc_usim_test.cc) + target_link_libraries(pcsc_usim_test srsue_upper srsran_upper srsran_phy) +endif(HAVE_PCSC) + +add_executable(nas_test nas_test.cc) +target_link_libraries(nas_test srsue_upper srsran_upper srsran_phy rrc_asn1) +add_test(nas_test nas_test) + +add_executable(gw_test gw_test.cc) +target_link_libraries(gw_test srsue_upper srsran_upper srsran_phy) +add_test(gw_test gw_test) + +add_executable(tft_test tft_test.cc) +target_link_libraries(tft_test srsue_upper srsran_upper srsran_phy) +add_test(tft_test tft_test) + +######################################################################## +# Option to run command after build (useful for remote builds) +######################################################################## +if (NOT ${BUILD_CMD} STREQUAL "") + message(STATUS "Added custom post-build command: ${BUILD_CMD}") + add_custom_command(TARGET ip_test POST_BUILD COMMAND ${BUILD_CMD}) +else(NOT ${BUILD_CMD} STREQUAL "") + message(STATUS "No post-build command defined") +endif (NOT ${BUILD_CMD} STREQUAL "") + diff --git a/srsue/test/upper/gw_test.cc b/srsue/src/stack/upper/test/gw_test.cc similarity index 100% rename from srsue/test/upper/gw_test.cc rename to srsue/src/stack/upper/test/gw_test.cc diff --git a/srsue/test/upper/nas_test.cc b/srsue/src/stack/upper/test/nas_test.cc similarity index 100% rename from srsue/test/upper/nas_test.cc rename to srsue/src/stack/upper/test/nas_test.cc diff --git a/srsue/test/upper/pcsc_usim_test.cc b/srsue/src/stack/upper/test/pcsc_usim_test.cc similarity index 100% rename from srsue/test/upper/pcsc_usim_test.cc rename to srsue/src/stack/upper/test/pcsc_usim_test.cc diff --git a/srsue/test/upper/tft_test.cc b/srsue/src/stack/upper/test/tft_test.cc similarity index 100% rename from srsue/test/upper/tft_test.cc rename to srsue/src/stack/upper/test/tft_test.cc diff --git a/srsue/test/upper/usim_test.cc b/srsue/src/stack/upper/test/usim_test.cc similarity index 100% rename from srsue/test/upper/usim_test.cc rename to srsue/src/stack/upper/test/usim_test.cc diff --git a/srsue/src/test/CMakeLists.txt b/srsue/src/test/CMakeLists.txt new file mode 100644 index 000000000..c0289e189 --- /dev/null +++ b/srsue/src/test/CMakeLists.txt @@ -0,0 +1,15 @@ +# +# Copyright 2013-2021 Software Radio Systems Limited +# +# By using this file, you agree to the terms and conditions set +# forth in the LICENSE file which can be found at the top level of +# the distribution. +# + +if (ENABLE_TTCN3) + add_subdirectory(ttcn3) +endif (ENABLE_TTCN3) + +add_executable(metrics_test metrics_test.cc ../metrics_stdout.cc ../metrics_csv.cc) +target_link_libraries(metrics_test srsran_phy srsran_common) +add_test(metrics_test metrics_test -o ${CMAKE_CURRENT_BINARY_DIR}/ue_metrics.csv) \ No newline at end of file diff --git a/srsue/test/metrics_test.cc b/srsue/src/test/metrics_test.cc similarity index 100% rename from srsue/test/metrics_test.cc rename to srsue/src/test/metrics_test.cc diff --git a/srsue/test/ttcn3/CMakeLists.txt b/srsue/src/test/ttcn3/CMakeLists.txt similarity index 100% rename from srsue/test/ttcn3/CMakeLists.txt rename to srsue/src/test/ttcn3/CMakeLists.txt diff --git a/srsue/test/ttcn3/README.md b/srsue/src/test/ttcn3/README.md similarity index 100% rename from srsue/test/ttcn3/README.md rename to srsue/src/test/ttcn3/README.md diff --git a/srsue/test/ttcn3/hdr/dut_utils.h b/srsue/src/test/ttcn3/hdr/dut_utils.h similarity index 100% rename from srsue/test/ttcn3/hdr/dut_utils.h rename to srsue/src/test/ttcn3/hdr/dut_utils.h diff --git a/srsue/test/ttcn3/hdr/lte_ttcn3_phy.h b/srsue/src/test/ttcn3/hdr/lte_ttcn3_phy.h similarity index 100% rename from srsue/test/ttcn3/hdr/lte_ttcn3_phy.h rename to srsue/src/test/ttcn3/hdr/lte_ttcn3_phy.h diff --git a/srsue/test/ttcn3/hdr/swappable_sink.h b/srsue/src/test/ttcn3/hdr/swappable_sink.h similarity index 100% rename from srsue/test/ttcn3/hdr/swappable_sink.h rename to srsue/src/test/ttcn3/hdr/swappable_sink.h diff --git a/srsue/test/ttcn3/hdr/ttcn3_common.h b/srsue/src/test/ttcn3/hdr/ttcn3_common.h similarity index 100% rename from srsue/test/ttcn3/hdr/ttcn3_common.h rename to srsue/src/test/ttcn3/hdr/ttcn3_common.h diff --git a/srsue/test/ttcn3/hdr/ttcn3_drb_interface.h b/srsue/src/test/ttcn3/hdr/ttcn3_drb_interface.h similarity index 100% rename from srsue/test/ttcn3/hdr/ttcn3_drb_interface.h rename to srsue/src/test/ttcn3/hdr/ttcn3_drb_interface.h diff --git a/srsue/test/ttcn3/hdr/ttcn3_helpers.h b/srsue/src/test/ttcn3/hdr/ttcn3_helpers.h similarity index 100% rename from srsue/test/ttcn3/hdr/ttcn3_helpers.h rename to srsue/src/test/ttcn3/hdr/ttcn3_helpers.h diff --git a/srsue/test/ttcn3/hdr/ttcn3_interfaces.h b/srsue/src/test/ttcn3/hdr/ttcn3_interfaces.h similarity index 100% rename from srsue/test/ttcn3/hdr/ttcn3_interfaces.h rename to srsue/src/test/ttcn3/hdr/ttcn3_interfaces.h diff --git a/srsue/test/ttcn3/hdr/ttcn3_ip_ctrl_interface.h b/srsue/src/test/ttcn3/hdr/ttcn3_ip_ctrl_interface.h similarity index 100% rename from srsue/test/ttcn3/hdr/ttcn3_ip_ctrl_interface.h rename to srsue/src/test/ttcn3/hdr/ttcn3_ip_ctrl_interface.h diff --git a/srsue/test/ttcn3/hdr/ttcn3_ip_sock_interface.h b/srsue/src/test/ttcn3/hdr/ttcn3_ip_sock_interface.h similarity index 100% rename from srsue/test/ttcn3/hdr/ttcn3_ip_sock_interface.h rename to srsue/src/test/ttcn3/hdr/ttcn3_ip_sock_interface.h diff --git a/srsue/test/ttcn3/hdr/ttcn3_port_handler.h b/srsue/src/test/ttcn3/hdr/ttcn3_port_handler.h similarity index 100% rename from srsue/test/ttcn3/hdr/ttcn3_port_handler.h rename to srsue/src/test/ttcn3/hdr/ttcn3_port_handler.h diff --git a/srsue/test/ttcn3/hdr/ttcn3_srb_interface.h b/srsue/src/test/ttcn3/hdr/ttcn3_srb_interface.h similarity index 100% rename from srsue/test/ttcn3/hdr/ttcn3_srb_interface.h rename to srsue/src/test/ttcn3/hdr/ttcn3_srb_interface.h diff --git a/srsue/test/ttcn3/hdr/ttcn3_sys_interface.h b/srsue/src/test/ttcn3/hdr/ttcn3_sys_interface.h similarity index 100% rename from srsue/test/ttcn3/hdr/ttcn3_sys_interface.h rename to srsue/src/test/ttcn3/hdr/ttcn3_sys_interface.h diff --git a/srsue/test/ttcn3/hdr/ttcn3_syssim.h b/srsue/src/test/ttcn3/hdr/ttcn3_syssim.h similarity index 100% rename from srsue/test/ttcn3/hdr/ttcn3_syssim.h rename to srsue/src/test/ttcn3/hdr/ttcn3_syssim.h diff --git a/srsue/test/ttcn3/hdr/ttcn3_ue.h b/srsue/src/test/ttcn3/hdr/ttcn3_ue.h similarity index 100% rename from srsue/test/ttcn3/hdr/ttcn3_ue.h rename to srsue/src/test/ttcn3/hdr/ttcn3_ue.h diff --git a/srsue/test/ttcn3/hdr/ttcn3_ut_interface.h b/srsue/src/test/ttcn3/hdr/ttcn3_ut_interface.h similarity index 100% rename from srsue/test/ttcn3/hdr/ttcn3_ut_interface.h rename to srsue/src/test/ttcn3/hdr/ttcn3_ut_interface.h diff --git a/srsue/test/ttcn3/src/CMakeLists.txt b/srsue/src/test/ttcn3/src/CMakeLists.txt similarity index 93% rename from srsue/test/ttcn3/src/CMakeLists.txt rename to srsue/src/test/ttcn3/src/CMakeLists.txt index 943df04fb..6fc2619c6 100644 --- a/srsue/test/ttcn3/src/CMakeLists.txt +++ b/srsue/src/test/ttcn3/src/CMakeLists.txt @@ -29,4 +29,4 @@ set(LINK_LIBRARIES srsue_stack target_link_libraries(ttcn3_dut ${LINK_LIBRARIES}) -include_directories(${PROJECT_SOURCE_DIR}/srsue/test/ttcn3/hdr) +include_directories(${PROJECT_SOURCE_DIR}/srsue/src/test/ttcn3/hdr) diff --git a/srsue/test/ttcn3/src/lte_ttcn3_phy.cc b/srsue/src/test/ttcn3/src/lte_ttcn3_phy.cc similarity index 100% rename from srsue/test/ttcn3/src/lte_ttcn3_phy.cc rename to srsue/src/test/ttcn3/src/lte_ttcn3_phy.cc diff --git a/srsue/test/ttcn3/src/ttcn3_dut.cc b/srsue/src/test/ttcn3/src/ttcn3_dut.cc similarity index 100% rename from srsue/test/ttcn3/src/ttcn3_dut.cc rename to srsue/src/test/ttcn3/src/ttcn3_dut.cc diff --git a/srsue/test/ttcn3/src/ttcn3_syssim.cc b/srsue/src/test/ttcn3/src/ttcn3_syssim.cc similarity index 99% rename from srsue/test/ttcn3/src/ttcn3_syssim.cc rename to srsue/src/test/ttcn3/src/ttcn3_syssim.cc index 5c9b81d50..ab6c51fe3 100644 --- a/srsue/test/ttcn3/src/ttcn3_syssim.cc +++ b/srsue/src/test/ttcn3/src/ttcn3_syssim.cc @@ -10,7 +10,7 @@ * */ -#include "srsue/test/ttcn3/hdr/ttcn3_syssim.h" +#include "ttcn3_syssim.h" #include "dut_utils.h" #include "srsran/mac/pdu_queue.h" #include "srsran/srslog/srslog.h" diff --git a/srsue/test/ttcn3/src/ttcn3_ue.cc b/srsue/src/test/ttcn3/src/ttcn3_ue.cc similarity index 99% rename from srsue/test/ttcn3/src/ttcn3_ue.cc rename to srsue/src/test/ttcn3/src/ttcn3_ue.cc index adf274da0..f6ebabd9b 100644 --- a/srsue/test/ttcn3/src/ttcn3_ue.cc +++ b/srsue/src/test/ttcn3/src/ttcn3_ue.cc @@ -10,7 +10,7 @@ * */ -#include "srsue/test/ttcn3/hdr/ttcn3_ue.h" +#include "ttcn3_ue.h" #include "lte_ttcn3_phy.h" #include "srsue/hdr/stack/ue_stack_lte.h" #include diff --git a/srsue/test/ttcn3/test/CMakeLists.txt b/srsue/src/test/ttcn3/test/CMakeLists.txt similarity index 80% rename from srsue/test/ttcn3/test/CMakeLists.txt rename to srsue/src/test/ttcn3/test/CMakeLists.txt index 2e46bd4f1..92dd6a4c5 100644 --- a/srsue/test/ttcn3/test/CMakeLists.txt +++ b/srsue/src/test/ttcn3/test/CMakeLists.txt @@ -6,7 +6,7 @@ # the distribution. # -include_directories(${PROJECT_SOURCE_DIR}/srsue/test/ttcn3/hdr) +include_directories(${PROJECT_SOURCE_DIR}/srsue/src/test/ttcn3/hdr) add_executable(rapidjson_test rapidjson_test.cc) target_link_libraries(rapidjson_test srsran_common) diff --git a/srsue/test/ttcn3/test/rapidjson_test.cc b/srsue/src/test/ttcn3/test/rapidjson_test.cc similarity index 98% rename from srsue/test/ttcn3/test/rapidjson_test.cc rename to srsue/src/test/ttcn3/test/rapidjson_test.cc index e7c56060f..5bb0e2155 100644 --- a/srsue/test/ttcn3/test/rapidjson_test.cc +++ b/srsue/src/test/ttcn3/test/rapidjson_test.cc @@ -13,7 +13,6 @@ #include "srsran/common/test_common.h" #include "ttcn3_helpers.h" #include -#include #include #include diff --git a/srsue/test/ttcn3/test/ttcn3_if_handler_test.cc b/srsue/src/test/ttcn3/test/ttcn3_if_handler_test.cc similarity index 100% rename from srsue/test/ttcn3/test/ttcn3_if_handler_test.cc rename to srsue/src/test/ttcn3/test/ttcn3_if_handler_test.cc