From 81169a01ff2e3628963780a2b4862913a2df462f Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 27 Oct 2021 16:04:10 +0200 Subject: [PATCH] test: remove unnecessary test commands EAL and rwlock tests have been split into smaller unit tests now listed in meson. Nothing is referencing eal_flags_autotest and rwlock_autotest anymore, since we dropped the python wrapper. Fixes: 8c745bb62340 ("test: remove autotest python wrapper") Signed-off-by: David Marchand --- app/test/test_eal_flags.c | 84 --------------------------------------- app/test/test_rwlock.c | 42 -------------------- 2 files changed, 126 deletions(-) diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c index 1d18a0ba8f..d7f4c2cd47 100644 --- a/app/test/test_eal_flags.c +++ b/app/test/test_eal_flags.c @@ -1498,90 +1498,6 @@ test_memory_flags(void) return 0; } -static int -test_eal_flags(void) -{ - int ret = 0; - - ret = test_missing_c_flag(); - if (ret < 0) { - printf("Error in test_missing_c_flag()\n"); - return ret; - } - - ret = test_main_lcore_flag(); - if (ret < 0) { - printf("Error in test_main_lcore_flag()\n"); - return ret; - } - - ret = test_invalid_n_flag(); - if (ret < 0) { - printf("Error in test_invalid_n_flag()\n"); - return ret; - } - - ret = test_no_hpet_flag(); - if (ret < 0) { - printf("Error in test_no_hpet_flag()\n"); - return ret; - } - - ret = test_no_huge_flag(); - if (ret < 0) { - printf("Error in test_no_huge_flag()\n"); - return ret; - } - - ret = test_allow_flag(); - if (ret < 0) { - printf("Error in test_allow_flag()\n"); - return ret; - } - - ret = test_invalid_b_flag(); - if (ret < 0) { - printf("Error in test_invalid_b_flag()\n"); - return ret; - } - -#ifdef RTE_NET_RING - ret = test_invalid_vdev_flag(); - if (ret < 0) { - printf("Error in test_invalid_vdev_flag()\n"); - return ret; - } -#endif - ret = test_invalid_r_flag(); - if (ret < 0) { - printf("Error in test_invalid_r_flag()\n"); - return ret; - } - - ret = test_memory_flags(); - if (ret < 0) { - printf("Error in test_memory_flags()\n"); - return ret; - } - - ret = test_file_prefix(); - if (ret < 0) { - printf("Error in test_file_prefix()\n"); - return ret; - } - - ret = test_misc_flags(); - if (ret < 0) { - printf("Error in test_misc_flags()"); - return ret; - } - - return ret; -} - -REGISTER_TEST_COMMAND(eal_flags_autotest, test_eal_flags); - -/* subtests used in meson for CI */ REGISTER_TEST_COMMAND(eal_flags_c_opt_autotest, test_missing_c_flag); REGISTER_TEST_COMMAND(eal_flags_main_opt_autotest, test_main_lcore_flag); REGISTER_TEST_COMMAND(eal_flags_n_opt_autotest, test_invalid_n_flag); diff --git a/app/test/test_rwlock.c b/app/test/test_rwlock.c index f2d1c8883c..4ae0bf8deb 100644 --- a/app/test/test_rwlock.c +++ b/app/test/test_rwlock.c @@ -506,48 +506,6 @@ try_rwlock_test_rde_wro(void) return process_try_lcore_stats(); } -static int -test_rwlock(void) -{ - uint32_t i; - int32_t rc, ret; - - static const struct { - const char *name; - int (*ftst)(void); - } test[] = { - { - .name = "rwlock_test1", - .ftst = rwlock_test1, - }, - { - .name = "try_rwlock_test_rda", - .ftst = try_rwlock_test_rda, - }, - { - .name = "try_rwlock_test_rds_wrm", - .ftst = try_rwlock_test_rds_wrm, - }, - { - .name = "try_rwlock_test_rde_wro", - .ftst = try_rwlock_test_rde_wro, - }, - }; - - ret = 0; - for (i = 0; i != RTE_DIM(test); i++) { - printf("starting test %s;\n", test[i].name); - rc = test[i].ftst(); - printf("test %s completed with status %d\n", test[i].name, rc); - ret |= rc; - } - - return ret; -} - -REGISTER_TEST_COMMAND(rwlock_autotest, test_rwlock); - -/* subtests used in meson for CI */ REGISTER_TEST_COMMAND(rwlock_test1_autotest, rwlock_test1); REGISTER_TEST_COMMAND(rwlock_rda_autotest, try_rwlock_test_rda); REGISTER_TEST_COMMAND(rwlock_rds_wrm_autotest, try_rwlock_test_rds_wrm); -- 2.39.5