From d4f18399915d21203c170e316a4f11ac6c1bfa3d Mon Sep 17 00:00:00 2001 From: Xavier Arteaga Date: Fri, 30 Jul 2021 14:32:14 +0200 Subject: [PATCH] Increase enb_phy_test flush time --- srsenb/test/phy/enb_phy_test.cc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/srsenb/test/phy/enb_phy_test.cc b/srsenb/test/phy/enb_phy_test.cc index a9bbb9c91..64c6f3fde 100644 --- a/srsenb/test/phy/enb_phy_test.cc +++ b/srsenb/test/phy/enb_phy_test.cc @@ -1373,7 +1373,7 @@ public: } break; case change_state_flush: - if (tti_counter >= 2 * FDD_HARQ_DELAY_DL_MS + FDD_HARQ_DELAY_UL_MS) { + if (tti_counter >= 2 * (FDD_HARQ_DELAY_DL_MS + FDD_HARQ_DELAY_UL_MS)) { logger.warning("******* Cell rotation: Reconfigure *******"); std::array activation = {}; ///< Activation/Deactivation vector @@ -1502,20 +1502,23 @@ int main(int argc, char** argv) if (not valid_cfg) { // Verify that phy returns with an error if provided an invalid configuration TESTASSERT(err_code != SRSRAN_SUCCESS); - return 0; + return SRSRAN_SUCCESS; } - TESTASSERT(err_code == SRSRAN_SUCCESS); // Run Simulation - for (uint32_t i = 0; i < test_args.duration; i++) { - TESTASSERT(test_bench->run_tti() >= SRSRAN_SUCCESS); + for (uint32_t i = 0; i < test_args.duration and err_code >= SRSRAN_SUCCESS; i++) { + err_code = test_bench->run_tti(); } test_bench->stop(); srslog::flush(); - std::cout << "Passed" << std::endl; + if (err_code >= SRSRAN_SUCCESS) { + std::cout << "Ok" << std::endl; + } else { + std::cout << "Error" << std::endl; + } - return SRSRAN_SUCCESS; + return err_code; }