app/test: remove all-autotests option

It's no longer possible to run all autotests in
a single go and have them pass, so remove that option.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Bruce Richardson 2014-02-10 11:47:38 +00:00 committed by David Marchand
parent c1090bdee1
commit 5c64c7d168

View File

@ -86,113 +86,105 @@ static void cmd_autotest_parsed(void *parsed_result,
{ {
struct cmd_autotest_result *res = parsed_result; struct cmd_autotest_result *res = parsed_result;
int ret = 0; int ret = 0;
int all = 0;
if (!strcmp(res->autotest, "all_autotests")) if (!strcmp(res->autotest, "version_autotest"))
all = 1; ret = test_version();
if (!strcmp(res->autotest, "eal_fs_autotest"))
if (all || !strcmp(res->autotest, "version_autotest")) ret = test_eal_fs();
ret |= test_version(); if (!strcmp(res->autotest, "debug_autotest"))
if (all || !strcmp(res->autotest, "eal_fs_autotest")) ret = test_debug();
ret |= test_eal_fs(); if (!strcmp(res->autotest, "pci_autotest"))
if (all || !strcmp(res->autotest, "debug_autotest")) ret = test_pci();
ret |= test_debug(); if (!strcmp(res->autotest, "prefetch_autotest"))
if (all || !strcmp(res->autotest, "pci_autotest")) ret = test_prefetch();
ret |= test_pci(); if (!strcmp(res->autotest, "byteorder_autotest"))
if (all || !strcmp(res->autotest, "prefetch_autotest")) ret = test_byteorder();
ret |= test_prefetch(); if (!strcmp(res->autotest, "per_lcore_autotest"))
if (all || !strcmp(res->autotest, "byteorder_autotest")) ret = test_per_lcore();
ret |= test_byteorder(); if (!strcmp(res->autotest, "atomic_autotest"))
if (all || !strcmp(res->autotest, "per_lcore_autotest")) ret = test_atomic();
ret |= test_per_lcore(); if (!strcmp(res->autotest, "malloc_autotest"))
if (all || !strcmp(res->autotest, "atomic_autotest")) ret = test_malloc();
ret |= test_atomic(); if (!strcmp(res->autotest, "spinlock_autotest"))
if (all || !strcmp(res->autotest, "malloc_autotest")) ret = test_spinlock();
ret |= test_malloc(); if (!strcmp(res->autotest, "memory_autotest"))
if (all || !strcmp(res->autotest, "spinlock_autotest")) ret = test_memory();
ret |= test_spinlock(); if (!strcmp(res->autotest, "memzone_autotest"))
if (all || !strcmp(res->autotest, "memory_autotest")) ret = test_memzone();
ret |= test_memory(); if (!strcmp(res->autotest, "rwlock_autotest"))
if (all || !strcmp(res->autotest, "memzone_autotest")) ret = test_rwlock();
ret |= test_memzone(); if (!strcmp(res->autotest, "mbuf_autotest"))
if (all || !strcmp(res->autotest, "rwlock_autotest")) ret = test_mbuf();
ret |= test_rwlock(); if (!strcmp(res->autotest, "logs_autotest"))
if (all || !strcmp(res->autotest, "mbuf_autotest")) ret = test_logs();
ret |= test_mbuf(); if (!strcmp(res->autotest, "errno_autotest"))
if (all || !strcmp(res->autotest, "logs_autotest")) ret = test_errno();
ret |= test_logs(); if (!strcmp(res->autotest, "hash_autotest"))
if (all || !strcmp(res->autotest, "errno_autotest")) ret = test_hash();
ret |= test_errno(); if (!strcmp(res->autotest, "hash_perf_autotest"))
if (all || !strcmp(res->autotest, "hash_autotest")) ret = test_hash_perf();
ret |= test_hash(); if (!strcmp(res->autotest, "lpm_autotest"))
if (all || !strcmp(res->autotest, "hash_perf_autotest")) ret = test_lpm();
ret |= test_hash_perf(); if (!strcmp(res->autotest, "lpm6_autotest"))
if (all || !strcmp(res->autotest, "lpm_autotest")) ret = test_lpm6();
ret |= test_lpm(); if (!strcmp(res->autotest, "cpuflags_autotest"))
if (all || !strcmp(res->autotest, "lpm6_autotest")) ret = test_cpuflags();
ret |= test_lpm6(); if (!strcmp(res->autotest, "cmdline_autotest"))
if (all || !strcmp(res->autotest, "cpuflags_autotest")) ret = test_cmdline();
ret |= test_cpuflags(); if (!strcmp(res->autotest, "tailq_autotest"))
if (all || !strcmp(res->autotest, "cmdline_autotest")) ret = test_tailq();
ret |= test_cmdline(); if (!strcmp(res->autotest, "multiprocess_autotest"))
/* tailq autotest must go after all lpm and hashs tests or any other ret = test_mp_secondary();
* tests which need to create tailq objects (ring and mempool are implicitly if (!strcmp(res->autotest, "memcpy_autotest"))
* created in earlier tests so can go later) ret = test_memcpy();
*/ if (!strcmp(res->autotest, "string_autotest"))
if (all || !strcmp(res->autotest, "tailq_autotest")) ret = test_string_fns();
ret |= test_tailq(); if (!strcmp(res->autotest, "eal_flags_autotest"))
if (all || !strcmp(res->autotest, "multiprocess_autotest")) ret = test_eal_flags();
ret |= test_mp_secondary(); if (!strcmp(res->autotest, "alarm_autotest"))
if (all || !strcmp(res->autotest, "memcpy_autotest")) ret = test_alarm();
ret |= test_memcpy(); if (!strcmp(res->autotest, "interrupt_autotest"))
if (all || !strcmp(res->autotest, "string_autotest")) ret = test_interrupt();
ret |= test_string_fns(); if (!strcmp(res->autotest, "cycles_autotest"))
if (all || !strcmp(res->autotest, "eal_flags_autotest")) ret = test_cycles();
ret |= test_eal_flags(); if (!strcmp(res->autotest, "ring_autotest"))
if (all || !strcmp(res->autotest, "alarm_autotest")) ret = test_ring();
ret |= test_alarm(); if (!strcmp(res->autotest, "ring_perf_autotest"))
if (all || !strcmp(res->autotest, "interrupt_autotest")) ret = test_ring_perf();
ret |= test_interrupt(); if (!strcmp(res->autotest, "timer_autotest"))
if (all || !strcmp(res->autotest, "cycles_autotest")) ret = test_timer();
ret |= test_cycles(); if (!strcmp(res->autotest, "timer_perf_autotest"))
if (all || !strcmp(res->autotest, "ring_autotest")) ret = test_timer_perf();
ret |= test_ring(); if (!strcmp(res->autotest, "mempool_autotest"))
if (all || !strcmp(res->autotest, "ring_perf_autotest")) ret = test_mempool();
ret |= test_ring_perf(); if (!strcmp(res->autotest, "mempool_perf_autotest"))
if (all || !strcmp(res->autotest, "timer_autotest")) ret = test_mempool_perf();
ret |= test_timer(); if (!strcmp(res->autotest, "memcpy_perf_autotest"))
if (all || !strcmp(res->autotest, "timer_perf_autotest")) ret = test_memcpy_perf();
ret |= test_timer_perf(); if (!strcmp(res->autotest, "func_reentrancy_autotest"))
if (all || !strcmp(res->autotest, "mempool_autotest")) ret = test_func_reentrancy();
ret |= test_mempool(); if (!strcmp(res->autotest, "red_autotest"))
if (all || !strcmp(res->autotest, "mempool_perf_autotest")) ret = test_red();
ret |= test_mempool_perf(); if (!strcmp(res->autotest, "sched_autotest"))
if (all || !strcmp(res->autotest, "memcpy_perf_autotest")) ret = test_sched();
ret |= test_memcpy_perf(); if (!strcmp(res->autotest, "meter_autotest"))
if (all || !strcmp(res->autotest, "func_reentrancy_autotest")) ret = test_meter();
ret |= test_func_reentrancy(); if (!strcmp(res->autotest, "kni_autotest"))
if (all || !strcmp(res->autotest, "red_autotest")) ret = test_kni();
ret |= test_red(); if (!strcmp(res->autotest, "power_autotest"))
if (all || !strcmp(res->autotest, "sched_autotest")) ret = test_power();
ret |= test_sched(); if (!strcmp(res->autotest, "common_autotest"))
if (all || !strcmp(res->autotest, "meter_autotest")) ret = test_common();
ret |= test_meter(); if (!strcmp(res->autotest, "ivshmem_autotest"))
if (all || !strcmp(res->autotest, "kni_autotest"))
ret |= test_kni();
if (all || !strcmp(res->autotest, "power_autotest"))
ret |= test_power();
if (all || !strcmp(res->autotest, "common_autotest"))
ret |= test_common();
if (all || !strcmp(res->autotest, "ivshmem_autotest"))
ret = test_ivshmem(); ret = test_ivshmem();
#ifdef RTE_LIBRTE_PMD_RING #ifdef RTE_LIBRTE_PMD_RING
if (all || !strcmp(res->autotest, "ring_pmd_autotest")) if (!strcmp(res->autotest, "ring_pmd_autotest"))
ret |= test_pmd_ring(); ret = test_pmd_ring();
#endif /* RTE_LIBRTE_PMD_RING */ #endif /* RTE_LIBRTE_PMD_RING */
#ifdef RTE_LIBRTE_ACL #ifdef RTE_LIBRTE_ACL
if (all || !strcmp(res->autotest, "acl_autotest")) if (!strcmp(res->autotest, "acl_autotest"))
ret |= test_acl(); ret = test_acl();
#endif /* RTE_LIBRTE_ACL */ #endif /* RTE_LIBRTE_ACL */
if (ret == 0) if (ret == 0)
@ -234,7 +226,7 @@ cmdline_parse_token_string_t cmd_autotest_autotest =
#ifdef RTE_LIBRTE_PMD_RING #ifdef RTE_LIBRTE_PMD_RING
"ring_pmd_autotest#" "ring_pmd_autotest#"
#endif #endif
"common_autotest#all_autotests"); "common_autotest");
cmdline_parse_inst_t cmd_autotest = { cmdline_parse_inst_t cmd_autotest = {
.f = cmd_autotest_parsed, /* function to call */ .f = cmd_autotest_parsed, /* function to call */