Commit 1ee0fe7b authored by Rohit Gupta's avatar Rohit Gupta
Browse files

updated build script for removing build files, updating log files

parent a725a3a8
...@@ -14,8 +14,8 @@ source $OPENAIR_DIR/cmake_targets/tools/test_helper ...@@ -14,8 +14,8 @@ source $OPENAIR_DIR/cmake_targets/tools/test_helper
#SUDO="sudo -E " #SUDO="sudo -E "
tdir=$OPENAIR_DIR/cmake_targets/autotests tdir=$OPENAIR_DIR/cmake_targets/autotests
rm -fr $tdir/bin $tdir/log rm -fr $tdir/bin
mkdir -p $tdir/bin $tdir/log mkdir -p $tdir/bin
results_file="$tdir/log/results_autotests.xml" results_file="$tdir/log/results_autotests.xml"
updated=$(svn st -q $OPENAIR_DIR) updated=$(svn st -q $OPENAIR_DIR)
...@@ -277,6 +277,7 @@ function test_compile_and_run() { ...@@ -277,6 +277,7 @@ function test_compile_and_run() {
let "tags_array_index++" let "tags_array_index++"
done # End of for loop (nindex) done # End of for loop (nindex)
fi fi
rm -fr $build_dir
} }
dbin=$OPENAIR_DIR/cmake_targets/autotests/bin dbin=$OPENAIR_DIR/cmake_targets/autotests/bin
......
...@@ -753,18 +753,18 @@ ...@@ -753,18 +753,18 @@
<EPC>nano</EPC> <EPC>nano</EPC>
<cleanupScript>oaisim* oaisim_nos1* lte-softmodem* lte-softmodem-nos1* mme_gw* run_epc* run_hss* iperf* ltebox*</cleanupScript> <cleanupScript>oaisim* oaisim_nos1* lte-softmodem* lte-softmodem-nos1* mme_gw* run_epc* run_hss* iperf* ltebox*</cleanupScript>
<TimeOut_cmd>300</TimeOut_cmd> <TimeOut_cmd>300</TimeOut_cmd>
<eNB_working_dir>/tmp</eNB_working_dir> <eNB_working_dir>/tmp</eNB_working_dir>
<eNB_config_file>targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.local.conf tracking_area_code 1 <eNB_config_file>targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.local.conf tracking_area_code 1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.local.conf mobile_country_code 2 targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.local.conf mobile_country_code 2
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.local.conf mobile_network_code 9</eNB_config_file> targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.local.conf mobile_network_code 9</eNB_config_file>
<eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai </eNB_compile_prog> <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
<eNB_compile_prog_args>--eNB -w USRP</eNB_compile_prog_args> <eNB_compile_prog_args>--eNB -w USRP</eNB_compile_prog_args>
<eNB_pre_exec>iperf</eNB_pre_exec> <eNB_pre_exec></eNB_pre_exec>
<eNB_pre_exec_args></eNB_pre_exec_args> <eNB_pre_exec_args></eNB_pre_exec_args>
<eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec> <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
<eNB_main_exec_args></eNB_main_exec_args> <eNB_main_exec_args></eNB_main_exec_args>
<eNB_post_exec></eNB_post_exec> <eNB_traffic_exec>iperf</eNB_traffic_exec>
<eNB_traffic_exec_args></eNB_traffic_exec_args>
<eNB_search_expr_true></eNB_search_expr_true> <eNB_search_expr_true></eNB_search_expr_true>
<eNB_search_expr_false></eNB_search_expr_false> <eNB_search_expr_false></eNB_search_expr_false>
...@@ -774,10 +774,12 @@ ...@@ -774,10 +774,12 @@
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.local.conf mobile_network_code 6</UE_config_file> targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.local.conf mobile_network_code 6</UE_config_file>
<UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</UE_compile_prog> <UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</UE_compile_prog>
<UE_compile_prog_args>--eNB -w USRP</UE_compile_prog_args> <UE_compile_prog_args>--eNB -w USRP</UE_compile_prog_args>
<UE_pre_exec>iperf </UE_pre_exec> <UE_pre_exec></UE_pre_exec>
<UE_pre_exec_args></UE_pre_exec_args> <UE_pre_exec_args></UE_pre_exec_args>
<UE_main_exec>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</UE_main_exec> <UE_main_exec>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</UE_main_exec>
<UE_main_exec_args></UE_main_exec_args> <UE_main_exec_args></UE_main_exec_args>
<UE_traffic_exec>iperf</UE_traffic_exec>
<UE_traffic_exec_args></UE_traffic_exec_args>
<UE_search_expr_true></UE_search_expr_true> <UE_search_expr_true></UE_search_expr_true>
<UE_search_expr_false></UE_search_expr_false> <UE_search_expr_false></UE_search_expr_false>
...@@ -785,12 +787,19 @@ ...@@ -785,12 +787,19 @@
<EPC_config_file>BUILD/EPC/epc.local.enb.conf.in MCC 7 <EPC_config_file>BUILD/EPC/epc.local.enb.conf.in MCC 7
BUILD/EPC/epc.local.enb.conf.in MNC 8 BUILD/EPC/epc.local.enb.conf.in MNC 8
BUILD/EPC/epc.local.enb.conf.in TAC 9</EPC_config_file> BUILD/EPC/epc.local.enb.conf.in TAC 9</EPC_config_file>
<EPC_compile_prog>SCRIPTS/build_epc -c -SCRIPTS/build_hss -c -l </EPC_compile_prog> <EPC_compile_prog>SCRIPTS/build_epc</EPC_compile_prog>
<EPC_compile_prog_args></EPC_compile_prog_args> <EPC_compile_prog_args>-c -l</EPC_compile_prog_args>
<EPC_pre_exec>iperf </EPC_pre_exec> <HSS_compile_prog>SCRIPTS/build_hss</HSS_compile_prog>
<HSS_compile_prog_args> -c -l </HSS_compile_prog_args>
<EPC_pre_exec></EPC_pre_exec>
<EPC_pre_exec_args></EPC_pre_exec_args> <EPC_pre_exec_args></EPC_pre_exec_args>
<EPC_main_exec>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</EPC_main_exec> <EPC_main_exec>SCRITPTS/run_epc -l </EPC_main_exec>
<EPC_main_exec_args></EPC_main_exec_args> <EPC_main_exec_args></EPC_main_exec_args>
<HSS_main_exec>SCRIPTS/run_hss -l</HSS_main_exec>
<HSS_main_exec_args></HSS_main_exec_args>
<EPC_traffic_exec>iperf</EPC_traffic_exec>
<EPC_traffic_exec_args></EPC_traffic_exec_args>
<EPC_search_expr_true></EPC_search_expr_true> <EPC_search_expr_true></EPC_search_expr_true>
<EPC_search_expr_false></EPC_search_expr_false> <EPC_search_expr_false></EPC_search_expr_false>
<nruns>2</nruns> <nruns>2</nruns>
......
...@@ -585,14 +585,17 @@ function main() { ...@@ -585,14 +585,17 @@ function main() {
##################### #####################
if [ "$OAI_TEST" = "1" ]; then if [ "$OAI_TEST" = "1" ]; then
echo_info "10. Running OAI pre commit tests (pre-ci) ..." echo_info "10. Running OAI pre commit tests (pre-ci) ..."
echo_info "The log file for the autotests is located here: $OPENAIR_DIR/cmake_targets/autotests/log/autotests.log " read -s -p "Enter Password: " mypassword
echo -e "\n"
echo_info "The log file for the autotest script for debugging is located here: $OPENAIR_DIR/cmake_targets/autotests/log/autotests.log "
echo_info "The results of autotests results is located here: $OPENAIR_DIR/cmake_targets/autotests/log/results_autotests.xml "
echo_info "You can hit CTRL-C any time to terminate the autotests..." echo_info "You can hit CTRL-C any time to terminate the autotests..."
rm -fr $OPENAIR_DIR/cmake_targets/autotests/log rm -fr $OPENAIR_DIR/cmake_targets/autotests/log
mkdir -p $OPENAIR_DIR/cmake_targets/autotests/log mkdir -p $OPENAIR_DIR/cmake_targets/autotests/log
if [ "$RUN_GROUP" -eq "1" ]; then if [ "$RUN_GROUP" -eq "1" ]; then
$OPENAIR_DIR/cmake_targets/autotests/run_exec_autotests.bash -g "$TEST_CASE_GROUP" >& $OPENAIR_DIR/cmake_targets/autotests/log/autotests.log & echo '$mypassword' | $OPENAIR_DIR/cmake_targets/autotests/run_exec_autotests.bash -g "$TEST_CASE_GROUP" >& $OPENAIR_DIR/cmake_targets/autotests/log/autotests.log &
else else
$OPENAIR_DIR/cmake_targets/autotests/run_exec_autotests.bash >& $OPENAIR_DIR/cmake_targets/autotests/log/autotests.log & echo '$mypassword' | $OPENAIR_DIR/cmake_targets/autotests/run_exec_autotests.bash >& $OPENAIR_DIR/cmake_targets/autotests/log/autotests.log &
fi fi
wait wait
else else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment