NR_RLC: CMakeLists.txt in own subdirectory, with tests

openair2/CMakeLists.txt

@@ -3,6 +3,7 @@ if(E2_AGENT)
   add_subdirectory(E2AP)
 endif()
 add_subdirectory(F1AP)
+add_subdirectory(LAYER2)
 add_subdirectory(M2AP)
 add_subdirectory(X2AP)
 add_subdirectory(RRC)

openair2/LAYER2/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(nr_rlc)

openair2/LAYER2/nr_rlc/CMakeLists.txt

@@ -0,0 +1,22 @@
+add_library(nr_rlc_core OBJECT
+            nr_rlc_entity.c
+            nr_rlc_entity_am.c
+            nr_rlc_entity_tm.c
+            nr_rlc_entity_um.c
+            nr_rlc_pdu.c
+            nr_rlc_sdu.c)
+target_include_directories(nr_rlc_core PRIVATE ../../..)
+target_link_libraries(nr_rlc_core PRIVATE ${T_LIB})
+add_library(nr_rlc STATIC
+            asn1_utils.c
+            nr_rlc_oai_api.c
+            nr_rlc_ue_manager.c
+)
+# L2_NR: for PDCP
+target_link_libraries(nr_rlc PUBLIC pthread f1ap nr_rlc_core UTIL ${T_LIB})
+target_include_directories(nr_rlc PRIVATE ../../..)
+target_link_libraries(nr_rlc PRIVATE asn1_lte_rrc asn1_nr_rrc)
+
+if(ENABLE_TESTS)
+  add_subdirectory(tests)
+endif()

openair2/LAYER2/nr_rlc/tests/CMakeLists.txt

@@ -0,0 +1,14 @@
+
+foreach(TESTNUM RANGE 1 17)
+  add_executable(nr_rlc_test_${TESTNUM} test.c)
+  target_link_libraries(nr_rlc_test_${TESTNUM} PRIVATE nr_rlc_core pthread UTIL ${T_LIB})
+  target_compile_definitions(nr_rlc_test_${TESTNUM} PRIVATE TEST="test${TESTNUM}.h")
+  #target_include_directories(nr_rlc_test_${TESTNUM} PRIVATE LOG)
+  #target_compile_options(nr_rlc_test_${TESTNUM} PRIVATE -g --coverage -Wall)
+  add_dependencies(tests nr_rlc_test_${TESTNUM})
+endforeach()
+
+add_test(NAME nr_rlc_tests
+  COMMAND exec_nr_rlc_test.sh ${CMAKE_CURRENT_BINARY_DIR}
+         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+

openair2/LAYER2/nr_rlc/tests/exec_nr_rlc_test.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# this script is to be executed in the current folder. It takes one argument,
+# which is the directory in which the executables are.
+
+if [ $# -ne 1 ]; then
+  echo "usage: $0 <directory-of-execs>"
+  exit 1
+fi
+
+EXEC_DIR=$1
+
+for i in {1..17}; do
+  diff \
+      <($EXEC_DIR/nr_rlc_test_$i | \grep ^TEST) \
+      <(gunzip -c test$i.txt.gz) \
+    || exit 1
+done

openair2/LAYER2/nr_rlc/tests/test.c

@@ -12,7 +12,6 @@
 
 #include "common/utils/LOG/log.h"
 
-int oai_exit;
 /*
  * GNB_AM <rx_maxsize> <tx_maxsize> <t_poll_retransmit> <t_reassembly>
  *       <t_status_prohibit> <poll_pdu> <poll_byte> <max_retx_threshold>