From 95e43d4ba34e6a119844375e59d1a57d86b2d3e4 Mon Sep 17 00:00:00 2001
From: Rohit Gupta <rohit.gupta@eurecom.fr>
Date: Fri, 4 Mar 2016 16:47:28 +0100
Subject: [PATCH] exit on setup error and disable USRP/BladeRF driver
 installation

---
 .../autotests/run_exec_lte-softmodem_tests.py     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/cmake_targets/autotests/run_exec_lte-softmodem_tests.py b/cmake_targets/autotests/run_exec_lte-softmodem_tests.py
index 8ffb593cec..3418798954 100755
--- a/cmake_targets/autotests/run_exec_lte-softmodem_tests.py
+++ b/cmake_targets/autotests/run_exec_lte-softmodem_tests.py
@@ -1414,12 +1414,12 @@ for oai in oai_list:
          cmd = cmd + 'echo \"Installing core OAI dependencies...Start\" \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 BLADERF OAI dependencies...Start\" \n'
-         cmd = cmd + 'check_install_bladerf_driver \n'
-         cmd = cmd + 'echo \"Installing BLADERF OAI dependencies...Finished\" \n'
-         cmd = cmd + 'echo \"Installing USRP OAI dependencies...Start\" \n'
-         cmd = cmd + 'check_install_usrp_uhd_driver \n'
-         cmd = cmd + 'echo \"Installing USRP OAI dependencies...Finished\" \n'
+         #cmd = cmd + 'echo \"Installing BLADERF OAI dependencies...Start\" \n'
+         #cmd = cmd + 'check_install_bladerf_driver \n'
+         #cmd = cmd + 'echo \"Installing BLADERF OAI dependencies...Finished\" \n'
+         #cmd = cmd + 'echo \"Installing USRP OAI dependencies...Start\" \n'
+         #cmd = cmd + 'check_install_usrp_uhd_driver \n'
+         #cmd = cmd + 'echo \"Installing USRP OAI dependencies...Finished\" \n'
       cmd = cmd +  'cd ' + logdirOpenaircnRepo  + '\n'
       cmd = cmd +  'git checkout ' + GitOpenaircnRepoBranch  + '\n'
       cmd = cmd +  'env |grep OPENAIR'  + '\n'
@@ -1476,7 +1476,8 @@ status, out = commands.getstatusoutput('grep ' +  ' -il \'error\' ' + locallogdi
 if (out != '') :
   print "There is error in setup of machines"
   print "status  = " + str(status) + "\n Check files for error = " + out
-  print "Continuing..."
+  print "Exiting now..."
+  sys.exit(1)
 
 cleanOldProgramsAllMachines(oai_list, CleanUpOldProgs, CleanUpAluLteBox, ExmimoRfStop)
 if cleanUpRemoteMachines == True:
-- 
2.26.2