mirror of https://github.com/PentHertz/srsLTE.git
remove unecessary sleeps in mac test, and add long_ prefix in long tests
This commit is contained in:
parent
772ab89391
commit
c6323478d2
|
@ -56,7 +56,7 @@ add_executable(chest_test_srs chest_test_srs.c)
|
|||
target_link_libraries(chest_test_srs srslte_phy srslte_common)
|
||||
|
||||
foreach (cell_n_prb 6 15 25 50 75 100)
|
||||
add_test(chest_test_srs_${cell_n_prb} chest_test_srs -c 2 -r ${cell_n_prb})
|
||||
add_test(long_chest_test_srs_${cell_n_prb} chest_test_srs -c 2 -r ${cell_n_prb})
|
||||
endforeach(cell_n_prb 6 15 25 50 75 100)
|
||||
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include "srslte/asn1/rrc_asn1_utils.h"
|
||||
#include "srslte/common/log_filter.h"
|
||||
#include "srslte/common/mac_pcap.h"
|
||||
#include "srslte/common/test_common.h"
|
||||
#include "srslte/interfaces/ue_interfaces.h"
|
||||
#include "srslte/test/ue_test_interfaces.h"
|
||||
#include "srsue/hdr/stack/mac/mac.h"
|
||||
|
@ -38,14 +39,6 @@ using namespace srslte;
|
|||
|
||||
static std::unique_ptr<srslte::mac_pcap> pcap_handle = nullptr;
|
||||
|
||||
#define TESTASSERT(cond) \
|
||||
{ \
|
||||
if (!(cond)) { \
|
||||
std::cout << "[" << __FUNCTION__ << "][Line " << __LINE__ << "]: FAIL at " << (#cond) << std::endl; \
|
||||
return SRSLTE_ERROR; \
|
||||
} \
|
||||
}
|
||||
|
||||
srslte::log_ref mac_log{"MAC"};
|
||||
|
||||
namespace srslte {
|
||||
|
@ -433,7 +426,6 @@ int mac_unpack_test()
|
|||
mac.tb_decoded(cc_idx, mac_grant, dl_ack);
|
||||
|
||||
// make sure MAC PDU thread picks up before stopping
|
||||
sleep(1);
|
||||
stack.run_tti(0);
|
||||
mac.stop();
|
||||
|
||||
|
@ -495,7 +487,6 @@ int mac_ul_sch_pdu_test1()
|
|||
}
|
||||
|
||||
// make sure MAC PDU thread picks up before stopping
|
||||
sleep(1);
|
||||
stack.run_tti(0);
|
||||
mac.stop();
|
||||
|
||||
|
@ -592,7 +583,6 @@ int mac_ul_logical_channel_prioritization_test1()
|
|||
}
|
||||
|
||||
// make sure MAC PDU thread picks up before stopping
|
||||
sleep(1);
|
||||
stack.run_tti(0);
|
||||
mac.stop();
|
||||
|
||||
|
@ -701,7 +691,6 @@ int mac_ul_logical_channel_prioritization_test2()
|
|||
}
|
||||
|
||||
// make sure MAC PDU thread picks up before stopping
|
||||
sleep(1);
|
||||
stack.run_tti(0);
|
||||
mac.stop();
|
||||
|
||||
|
@ -762,7 +751,6 @@ int mac_ul_logical_channel_prioritization_test3()
|
|||
|
||||
// run TTI to setup Bj
|
||||
stack.run_tti(0);
|
||||
sleep(1);
|
||||
|
||||
// write dummy data for each LCID
|
||||
rlc.write_sdu(3, 50);
|
||||
|
@ -792,7 +780,6 @@ int mac_ul_logical_channel_prioritization_test3()
|
|||
}
|
||||
|
||||
// make sure MAC PDU thread picks up before stopping
|
||||
sleep(1);
|
||||
stack.run_tti(0);
|
||||
mac.stop();
|
||||
|
||||
|
@ -876,7 +863,6 @@ int mac_ul_sch_pdu_with_short_bsr_test()
|
|||
}
|
||||
|
||||
// make sure MAC PDU thread picks up before stopping
|
||||
sleep(1);
|
||||
stack.run_tti(tti);
|
||||
mac.stop();
|
||||
|
||||
|
@ -965,7 +951,6 @@ int mac_ul_sch_pdu_with_padding_bsr_test()
|
|||
}
|
||||
|
||||
// make sure MAC PDU thread picks up before stopping
|
||||
sleep(1);
|
||||
stack.run_tti(0);
|
||||
mac.stop();
|
||||
|
||||
|
@ -1021,7 +1006,6 @@ int mac_ul_sch_pdu_one_byte_test()
|
|||
}
|
||||
|
||||
// make sure MAC PDU thread picks up before stopping
|
||||
sleep(1);
|
||||
stack.run_tti(0);
|
||||
mac.stop();
|
||||
|
||||
|
@ -1077,7 +1061,6 @@ int mac_ul_sch_pdu_two_byte_test()
|
|||
}
|
||||
|
||||
// make sure MAC PDU thread picks up before stopping
|
||||
sleep(1);
|
||||
stack.run_tti(0);
|
||||
mac.stop();
|
||||
|
||||
|
@ -1133,7 +1116,6 @@ int mac_ul_sch_pdu_three_byte_test()
|
|||
}
|
||||
|
||||
// make sure MAC PDU thread picks up before stopping
|
||||
sleep(1);
|
||||
stack.run_tti(0);
|
||||
mac.stop();
|
||||
|
||||
|
|
Loading…
Reference in New Issue