diff --git a/openair1/SIMULATION/LTE_PHY/ulsim.c b/openair1/SIMULATION/LTE_PHY/ulsim.c index b0ac8150630f99590a9152a5d9c689a016708568..de550c9d697165734aa1fd34ac23864162967680 100644 --- a/openair1/SIMULATION/LTE_PHY/ulsim.c +++ b/openair1/SIMULATION/LTE_PHY/ulsim.c @@ -1245,7 +1245,7 @@ int main(int argc, char **argv) { #endif } //trials - printf("\n**********rb> %d ***mcs : %d *********SNR = %f dB (%f): TX %d dB (gain %f dB), N0W %f dB, I0 %d dB [ (%d,%d) dB / (%d,%d) dB ]**************************\n", + printf("\n**********rb: %d ***mcs : %d *********SNR = %f dB (%f): TX %d dB (gain %f dB), N0W %f dB, I0 %d dB [ (%d,%d) dB / (%d,%d) dB ]**************************\n", nb_rb,mcs,SNR,SNR2, tx_lev_dB, 20*log10(tx_gain), diff --git a/targets/TEST/OAI/case11.py b/targets/TEST/OAI/case11.py index e8da76b3be210c793b51a7105a32e80e3c068ad6..372bbc3e8e9e7456be2f054abcab22c2878826b0 100644 --- a/targets/TEST/OAI/case11.py +++ b/targets/TEST/OAI/case11.py @@ -56,7 +56,7 @@ def execute(oai, user, pw, logfile,logdir,debug): trace = logdir + '/log_' + case + test + '.txt;' tee = ' 2>&1 | tee ' + trace diag = 'check the compilation errors for dlsim in $OPENAIR1_DIR/SIMULATION/LTE_PHY' - oai.send('make clean;') + oai.send('make cleanall;') oai.send('rm -f ./dlsim.rel8;') oai.send_expect_false('make dlsim -j4' + tee, makerr1, 1500) oai.send('cp ./dlsim ./dlsim.rel8;') @@ -73,7 +73,7 @@ def execute(oai, user, pw, logfile,logdir,debug): trace = logdir + '/log_' + case + test + '.txt;' tee = ' 2>&1 | tee ' + trace diag = 'check the compilation errors for ulsim in $OPENAIR1_DIR/SIMULATION/LTE_PHY' - oai.send('make clean;') + oai.send('make cleanall;') oai.send('rm -f ./ulsim.rel8;') oai.send_expect_false('make ulsim -j4' + tee, makerr1, 1500) oai.send('cp ./ulsim ./ulsim.rel8;') diff --git a/targets/TEST/OAI/case12.py b/targets/TEST/OAI/case12.py index aae71c8fdab545f89b2fc83bdf95475bc0adabb9..29017385d5931f505866d74e4e3c11a803c99b60 100644 --- a/targets/TEST/OAI/case12.py +++ b/targets/TEST/OAI/case12.py @@ -93,7 +93,7 @@ def execute(oai, user, pw, logfile,logdir,debug): try: test = 1 - MIN_SNR = 2 + MIN_SNR = 0 name = 'Run oai.dlsim.perf.'+str(PERF)+'%' diag = 'no diagnostic is available, check the log file' for i in range(len(PRB)): diff --git a/targets/TEST/OAI/openair.py b/targets/TEST/OAI/openair.py index 84e09ac41b8fd76f1be08005ad12adc75df670e0..62b7d82c7b97dfde0cb1b7344292b249c05e58a3 100644 --- a/targets/TEST/OAI/openair.py +++ b/targets/TEST/OAI/openair.py @@ -184,3 +184,10 @@ class openair(core): os.remove(filepath) #print 'Could not remove the filepath'+ filepath + ' with error ' + OSError + def create_dir(self,dirname,debug) : + if not os.path.exists(dirname) : + try: + os.makedirs(dirname) + except OSError: + # There was an error on creation, so make sure we know about it + raise