Commit 5191cd95 authored by Rohit Gupta's avatar Rohit Gupta

Merge branch 'feature-34-test_framework' into develop

parents a05cdce1 95e43d4b
...@@ -1414,12 +1414,12 @@ for oai in oai_list: ...@@ -1414,12 +1414,12 @@ for oai in oai_list:
cmd = cmd + 'echo \"Installing core OAI dependencies...Start\" \n' cmd = cmd + 'echo \"Installing core OAI dependencies...Start\" \n'
cmd = cmd + '$OPENAIR_DIR/cmake_targets/build_oai -I --install-optional-packages \n' cmd = cmd + '$OPENAIR_DIR/cmake_targets/build_oai -I --install-optional-packages \n'
cmd = cmd + 'echo \"Installing core OAI dependencies...Finished\" \n' cmd = cmd + 'echo \"Installing core OAI dependencies...Finished\" \n'
cmd = cmd + 'echo \"Installing BLADERF OAI dependencies...Start\" \n' #cmd = cmd + 'echo \"Installing BLADERF OAI dependencies...Start\" \n'
cmd = cmd + 'check_install_bladerf_driver \n' #cmd = cmd + 'check_install_bladerf_driver \n'
cmd = cmd + 'echo \"Installing BLADERF OAI dependencies...Finished\" \n' #cmd = cmd + 'echo \"Installing BLADERF OAI dependencies...Finished\" \n'
cmd = cmd + 'echo \"Installing USRP OAI dependencies...Start\" \n' #cmd = cmd + 'echo \"Installing USRP OAI dependencies...Start\" \n'
cmd = cmd + 'check_install_usrp_uhd_driver \n' #cmd = cmd + 'check_install_usrp_uhd_driver \n'
cmd = cmd + 'echo \"Installing USRP OAI dependencies...Finished\" \n' #cmd = cmd + 'echo \"Installing USRP OAI dependencies...Finished\" \n'
cmd = cmd + 'cd ' + logdirOpenaircnRepo + '\n' cmd = cmd + 'cd ' + logdirOpenaircnRepo + '\n'
cmd = cmd + 'git checkout ' + GitOpenaircnRepoBranch + '\n' cmd = cmd + 'git checkout ' + GitOpenaircnRepoBranch + '\n'
cmd = cmd + 'env |grep OPENAIR' + '\n' cmd = cmd + 'env |grep OPENAIR' + '\n'
...@@ -1476,7 +1476,8 @@ status, out = commands.getstatusoutput('grep ' + ' -il \'error\' ' + locallogdi ...@@ -1476,7 +1476,8 @@ status, out = commands.getstatusoutput('grep ' + ' -il \'error\' ' + locallogdi
if (out != '') : if (out != '') :
print "There is error in setup of machines" print "There is error in setup of machines"
print "status = " + str(status) + "\n Check files for error = " + out print "status = " + str(status) + "\n Check files for error = " + out
print "Continuing..." print "Exiting now..."
sys.exit(1)
cleanOldProgramsAllMachines(oai_list, CleanUpOldProgs, CleanUpAluLteBox, ExmimoRfStop) cleanOldProgramsAllMachines(oai_list, CleanUpOldProgs, CleanUpAluLteBox, ExmimoRfStop)
if cleanUpRemoteMachines == True: if cleanUpRemoteMachines == True:
......
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