Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into develop
This commit is contained in:
@@ -126,6 +126,7 @@ endmacro(add_list_string_option)
|
|||||||
if (CMAKE_BUILD_TYPE STREQUAL "")
|
if (CMAKE_BUILD_TYPE STREQUAL "")
|
||||||
set(CMAKE_BUILD_TYPE "RelWithDebInfo")
|
set(CMAKE_BUILD_TYPE "RelWithDebInfo")
|
||||||
endif()
|
endif()
|
||||||
|
message("CMAKE_BUILD_TYPE is ${CMAKE_BUILD_TYPE}")
|
||||||
add_list_string_option(CMAKE_BUILD_TYPE "RelWithDebInfo" "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." Debug Release RelWithDebInfo MinSizeRel)
|
add_list_string_option(CMAKE_BUILD_TYPE "RelWithDebInfo" "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." Debug Release RelWithDebInfo MinSizeRel)
|
||||||
|
|
||||||
Message("Architecture is ${CMAKE_SYSTEM_PROCESSOR}")
|
Message("Architecture is ${CMAKE_SYSTEM_PROCESSOR}")
|
||||||
|
|||||||
@@ -1020,6 +1020,13 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
|
|||||||
run_result=0
|
run_result=0
|
||||||
run_result_string = ' RUN_'+str(run) + ' = FAIL(Thread_Busy)'
|
run_result_string = ' RUN_'+str(run) + ' = FAIL(Thread_Busy)'
|
||||||
|
|
||||||
|
#If there is Segmentation fault, we mark the test case as failure as most likely eNB crashed
|
||||||
|
cmd = "grep -ilr \"segmentation fault\" " + logdir_local_testcase + " | cat "
|
||||||
|
cmd_out = subprocess.check_output ([cmd], shell=True)
|
||||||
|
if len(cmd_out) !=0:
|
||||||
|
run_result=0
|
||||||
|
run_result_string = ' RUN_'+str(run) + ' = FAIL(SEGFAULT)'
|
||||||
|
|
||||||
run_result_string = run_result_string + tput_run_string
|
run_result_string = run_result_string + tput_run_string
|
||||||
|
|
||||||
test_result=test_result & run_result
|
test_result=test_result & run_result
|
||||||
|
|||||||
@@ -35,6 +35,10 @@ $SUDO echo "set pagination off" >> $gdb_file
|
|||||||
$SUDO echo "handle SIG33 pass nostop noprint" >> $gdb_file
|
$SUDO echo "handle SIG33 pass nostop noprint" >> $gdb_file
|
||||||
$SUDO echo "echo backtrace:\n" >> $gdb_file
|
$SUDO echo "echo backtrace:\n" >> $gdb_file
|
||||||
$SUDO echo "backtrace full" >> $gdb_file
|
$SUDO echo "backtrace full" >> $gdb_file
|
||||||
|
$SUDO echo "echo \n\nVariables:\n" >> $gdb_file
|
||||||
|
$SUDO echo "info variables" >> $gdb_file
|
||||||
|
$SUDO echo "echo \n\nlocals:\n" >> $gdb_file
|
||||||
|
$SUDO echo "info locals" >> $gdb_file
|
||||||
$SUDO echo "echo \n\nregisters:\n" >> $gdb_file
|
$SUDO echo "echo \n\nregisters:\n" >> $gdb_file
|
||||||
$SUDO echo "info registers" >> $gdb_file
|
$SUDO echo "info registers" >> $gdb_file
|
||||||
$SUDO echo "echo \n\ncurrent instructions:\n" >> $gdb_file
|
$SUDO echo "echo \n\ncurrent instructions:\n" >> $gdb_file
|
||||||
|
|||||||
+20
-12
@@ -61,6 +61,7 @@ TEST_CASE_GROUP=""
|
|||||||
BUILD_DOXYGEN=0
|
BUILD_DOXYGEN=0
|
||||||
T_TRACER="False"
|
T_TRACER="False"
|
||||||
DISABLE_HARDWARE_DEPENDENCY="False"
|
DISABLE_HARDWARE_DEPENDENCY="False"
|
||||||
|
CMAKE_BUILD_TYPE=""
|
||||||
trap handle_ctrl_c INT
|
trap handle_ctrl_c INT
|
||||||
|
|
||||||
function print_help() {
|
function print_help() {
|
||||||
@@ -82,7 +83,7 @@ Options
|
|||||||
--install-optional-packages
|
--install-optional-packages
|
||||||
Install useful but not mandatory packages such as valgrind
|
Install useful but not mandatory packages such as valgrind
|
||||||
-g | --run-with-gdb
|
-g | --run-with-gdb
|
||||||
Add debugging symbols to compilation directives
|
Add debugging symbols to compilation directives. It also disables any compiler optimization.
|
||||||
-h | --help
|
-h | --help
|
||||||
Print this help
|
Print this help
|
||||||
--eNB
|
--eNB
|
||||||
@@ -170,7 +171,8 @@ function main() {
|
|||||||
shift;;
|
shift;;
|
||||||
-g | --run-with-gdb)
|
-g | --run-with-gdb)
|
||||||
GDB=1
|
GDB=1
|
||||||
echo_info "Will Compile with gdb symbols"
|
CMAKE_BUILD_TYPE="Debug"
|
||||||
|
echo_info "Will Compile with gdb symbols and disable compiler optimization"
|
||||||
shift;;
|
shift;;
|
||||||
--eNB)
|
--eNB)
|
||||||
eNB=1
|
eNB=1
|
||||||
@@ -446,6 +448,7 @@ function main() {
|
|||||||
if [ "$NOS1" = "1" ] ; then
|
if [ "$NOS1" = "1" ] ; then
|
||||||
cat $DIR/$lte_build_dir/CMakeLists.template >> $cmake_file
|
cat $DIR/$lte_build_dir/CMakeLists.template >> $cmake_file
|
||||||
fi
|
fi
|
||||||
|
echo "set ( CMAKE_BUILD_TYPE $CMAKE_BUILD_TYPE )" >> $cmake_file
|
||||||
echo "set ( CFLAGS_PROCESSOR_USER \"$CFLAGS_PROCESSOR_USER\" )" >> $cmake_file
|
echo "set ( CFLAGS_PROCESSOR_USER \"$CFLAGS_PROCESSOR_USER\" )" >> $cmake_file
|
||||||
echo "set ( XFORMS $XFORMS )" >> $cmake_file
|
echo "set ( XFORMS $XFORMS )" >> $cmake_file
|
||||||
echo "set ( RRC_ASN1_VERSION \"${REL}\")" >> $cmake_file
|
echo "set ( RRC_ASN1_VERSION \"${REL}\")" >> $cmake_file
|
||||||
@@ -571,6 +574,8 @@ function main() {
|
|||||||
cp $OPENAIR_DIR/cmake_targets/tools/init_exmimo2 $dbin
|
cp $OPENAIR_DIR/cmake_targets/tools/init_exmimo2 $dbin
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# oaisim compilation
|
||||||
|
###############
|
||||||
if [ "$oaisim" = "1" ] ; then
|
if [ "$oaisim" = "1" ] ; then
|
||||||
dconf=$OPENAIR_DIR/targets/bin
|
dconf=$OPENAIR_DIR/targets/bin
|
||||||
if [ "$NOS1" = "1" ] ; then
|
if [ "$NOS1" = "1" ] ; then
|
||||||
@@ -584,6 +589,7 @@ function main() {
|
|||||||
echo_info "Compiling $oaisim_exec ($oaisim_build_dir)"
|
echo_info "Compiling $oaisim_exec ($oaisim_build_dir)"
|
||||||
cmake_file=$DIR/$oaisim_build_dir/CMakeLists.txt
|
cmake_file=$DIR/$oaisim_build_dir/CMakeLists.txt
|
||||||
cp $DIR/$oaisim_build_dir/CMakeLists.template $cmake_file
|
cp $DIR/$oaisim_build_dir/CMakeLists.template $cmake_file
|
||||||
|
echo "set ( CMAKE_BUILD_TYPE $CMAKE_BUILD_TYPE )" >> $cmake_file
|
||||||
echo "set ( CFLAGS_PROCESSOR_USER \"$CFLAGS_PROCESSOR_USER\" )" >> $cmake_file
|
echo "set ( CFLAGS_PROCESSOR_USER \"$CFLAGS_PROCESSOR_USER\" )" >> $cmake_file
|
||||||
echo "set ( XFORMS $XFORMS )" >> $cmake_file
|
echo "set ( XFORMS $XFORMS )" >> $cmake_file
|
||||||
echo "set ( PRINT_STATS $PRINT_STATS )" >> $cmake_file
|
echo "set ( PRINT_STATS $PRINT_STATS )" >> $cmake_file
|
||||||
@@ -652,9 +658,10 @@ function main() {
|
|||||||
|
|
||||||
cmake_file=$DIR/oaisim_mme_build_oai/CMakeLists.txt
|
cmake_file=$DIR/oaisim_mme_build_oai/CMakeLists.txt
|
||||||
cp $DIR/oaisim_mme_build_oai/CMakeLists.template $cmake_file
|
cp $DIR/oaisim_mme_build_oai/CMakeLists.template $cmake_file
|
||||||
echo "set(XFORMS $XFORMS )" >> $cmake_file
|
echo "set ( CMAKE_BUILD_TYPE $CMAKE_BUILD_TYPE )" >> $cmake_file
|
||||||
echo "set(RRC_ASN1_VERSION \"${REL}\")" >> $cmake_file
|
echo "set ( XFORMS $XFORMS )" >> $cmake_file
|
||||||
echo "set(ENABLE_VCD_FIFO $VCD_TIMING )" >> $cmake_file
|
echo "set ( RRC_ASN1_VERSION \"${REL}\")" >> $cmake_file
|
||||||
|
echo "set ( ENABLE_VCD_FIFO $VCD_TIMING )" >> $cmake_file
|
||||||
echo "set ( T_TRACER $T_TRACER )" >> $cmake_file
|
echo "set ( T_TRACER $T_TRACER )" >> $cmake_file
|
||||||
echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
|
echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
|
||||||
#[ "$CLEAN" = "1" ] && rm -rf $DIR/oaisim_mme_build_oai/build
|
#[ "$CLEAN" = "1" ] && rm -rf $DIR/oaisim_mme_build_oai/build
|
||||||
@@ -679,13 +686,14 @@ function main() {
|
|||||||
mkdir -p $DIR/$rrh_build_dir/build
|
mkdir -p $DIR/$rrh_build_dir/build
|
||||||
cmake_file=$DIR/$rrh_build_dir/CMakeLists.txt
|
cmake_file=$DIR/$rrh_build_dir/CMakeLists.txt
|
||||||
echo "cmake_minimum_required(VERSION 2.8)" > $cmake_file
|
echo "cmake_minimum_required(VERSION 2.8)" > $cmake_file
|
||||||
echo "set(ENABLE_VCD_FIFO $VCD_TIMING )" >> $cmake_file
|
echo "set ( CMAKE_BUILD_TYPE $CMAKE_BUILD_TYPE )" >> $cmake_file
|
||||||
echo "set(ENABLE_ITTI False )" >> $cmake_file
|
echo "set ( ENABLE_VCD_FIFO $VCD_TIMING )" >> $cmake_file
|
||||||
echo "set(RF_BOARD \"${HW}\")" >> $cmake_file
|
echo "set ( ENABLE_ITTI False )" >> $cmake_file
|
||||||
echo "set(TRANSP_PRO \"${TP}\")" >> $cmake_file
|
echo "set ( RF_BOARD \"${HW}\")" >> $cmake_file
|
||||||
echo 'set(PACKAGE_NAME "\"rrh_gw\"")' >> $cmake_file
|
echo "set ( TRANSP_PRO \"${TP}\")" >> $cmake_file
|
||||||
echo "set (DEADLINE_SCHEDULER \"${DEADLINE_SCHEDULER_FLAG_USER}\" )" >>$cmake_file
|
echo 'set ( PACKAGE_NAME "\"rrh_gw\"")' >> $cmake_file
|
||||||
echo "set (CPU_AFFINITY \"${CPU_AFFINITY_FLAG_USER}\" )" >>$cmake_file
|
echo "set ( DEADLINE_SCHEDULER \"${DEADLINE_SCHEDULER_FLAG_USER}\" )" >>$cmake_file
|
||||||
|
echo "set ( CPU_AFFINITY \"${CPU_AFFINITY_FLAG_USER}\" )" >>$cmake_file
|
||||||
echo "set ( T_TRACER $T_TRACER )" >> $cmake_file
|
echo "set ( T_TRACER $T_TRACER )" >> $cmake_file
|
||||||
echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
|
echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
|
||||||
cd $DIR/$rrh_build_dir/build
|
cd $DIR/$rrh_build_dir/build
|
||||||
|
|||||||
Reference in New Issue
Block a user