diff --git a/cmake_targets/autotests/run_exec_lte-softmodem_tests.py b/cmake_targets/autotests/run_exec_lte-softmodem_tests.py index faa4f573b2096d23f0dea083024857718678844b..ea43ffd5ff71b203ec1294b756b9c97caf35f286 100644 --- a/cmake_targets/autotests/run_exec_lte-softmodem_tests.py +++ b/cmake_targets/autotests/run_exec_lte-softmodem_tests.py @@ -840,7 +840,11 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo , #This function searches if test case is present in list of test cases that need to be executed by user -def search_test_case_group(testcasename, testcasegroup): +def search_test_case_group(testcasename, testcasegroup, search_test_case_group): + + if search_test_case_group.find(testcasename) >=0: + print "\nSkipping test case as it is found in black list: " + testcasename + return False if testcasegroup == '': return True testcaselist = testcasegroup.split() @@ -980,6 +984,7 @@ CleanUpOldProgs = xmlRoot.findtext('CleanUpOldProgs',default='') CleanUpAluLteBox = xmlRoot.findtext('CleanUpAluLteBox',default='') Timeout_execution = int (xmlRoot.findtext('Timeout_execution')) MachineListGeneric = xmlRoot.findtext('MachineListGeneric',default='') +TestCaseExclusionList = xmlRoot.findtext('TestCaseExclusionList',default='') print "MachineList = " + MachineList print "GitOpenair-cnRepo = " + GitOpenaircnRepo print "GitOAI5GRepo = " + GitOAI5GRepo @@ -1211,7 +1216,7 @@ for testcase in testcaseList: testcaseclass = testcase.findtext('class',default='') desc = testcase.findtext('desc',default='') #print "Machine list top level = " + ','.join(MachineList) - if search_test_case_group(testcasename, testcasegroup) == True: + if search_test_case_group(testcasename, testcasegroup, TestCaseExclusionList) == True: if testcaseclass == 'lte-softmodem' : eNBMachine = testcase.findtext('eNB',default='') UEMachine = testcase.findtext('UE',default='') diff --git a/cmake_targets/autotests/test_case_list.xml b/cmake_targets/autotests/test_case_list.xml index 450b659464d441a45de19dec8a9fe7b469893466..bb3b19497a094f912b9ee5b15f492fc25cb7b0ad 100644 --- a/cmake_targets/autotests/test_case_list.xml +++ b/cmake_targets/autotests/test_case_list.xml @@ -4,12 +4,12 @@ <NFSResultsShare>/mnt/sradio/TEST_RESULTS</NFSResultsShare> <GitOAI5GRepo>https://gitlab.eurecom.fr/oai/openairinterface5g.git</GitOAI5GRepo> <GitOpenair-cnRepo>https://gitlab.eurecom.fr/oai/openair-cn.git</GitOpenair-cnRepo> - <GitOAI5GRepoBranch>bugfix-56-UE_category3_throughput</GitOAI5GRepoBranch> + <GitOAI5GRepoBranch>enhancement-60-exmimo-tdd</GitOAI5GRepoBranch> <GitOpenair-cnRepoBranch>feature-17-test_framework</GitOpenair-cnRepoBranch> <CleanUpOldProgs>oaisim* oaisim_nos1* lte-softmodem* lte-softmodem-nos1* mme_gw* run_epc* run_hss* iperf* hss hss_sim configure_cots_bandrich_ue* wvdial* run_exec_autotests* iperf</CleanUpOldProgs> <CleanUpAluLteBox>/opt/ltebox/tools/stop_ltebox</CleanUpAluLteBox> <Timeout_execution>36000</Timeout_execution> - <TestCaseExclusionList></TestCaseExclusionList> + <TestCaseExclusionList>015502 015505 015506 015507 015508 015508 015509 015510 015511 015600 015700 016102 016105</TestCaseExclusionList> <MachineListGeneric>calisson stevens mozart nano amerique</MachineListGeneric> <testCase id="010101" > <class>compilation</class> @@ -185,7 +185,7 @@ <main_exec_args></main_exec_args> <search_expr_true></search_expr_true> <search_expr_false></search_expr_false> - <tags>lte-softmodemEXMIMO.Rel10</tags> + <tags>lte-softmodem.EXMIMO.Rel10</tags> <nruns>1</nruns> </testCase> @@ -202,7 +202,7 @@ <main_exec_args></main_exec_args> <search_expr_true></search_expr_true> <search_expr_false></search_expr_false> - <tags>lte-softmodem.EXMIMO.Rel10</tags> + <tags>lte-softmodem.BLADERF.Rel10</tags> <nruns>1</nruns> </testCase> diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.remote.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.remote.conf index 8248f20927ce315cce378bc2600ff9c6a4e456eb..7bc8e8593ac5297209ebad2acb2ca3cf2ac64b7c 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.remote.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.remote.conf @@ -30,7 +30,7 @@ eNBs = downlink_frequency = 2660000000L; uplink_frequency_offset = -120000000; Nid_cell = 0; - N_RB_DL = 100; + N_RB_DL = 25; Nid_cell_mbsfn = 0; nb_antennas_tx = 1; nb_antennas_rx = 1;