X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Fcommands.c;h=477081789123635402ce55960987e6a03cef3537;hb=e9d48c0072d36eb6423b45fba4ec49d0def6c36f;hp=4b980186ba79550063568024d042ec3ed5b6a528;hpb=24f42575dfe2226f126546d0ca501cba9fbd6373;p=dpdk.git

diff --git a/app/test/commands.c b/app/test/commands.c
old mode 100755
new mode 100644
index 4b980186ba..4770817891
--- a/app/test/commands.c
+++ b/app/test/commands.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
  * 
  *   Redistribution and use in source and binary forms, with or without
@@ -160,6 +160,8 @@ static void cmd_autotest_parsed(void *parsed_result,
 		ret |= test_ring_perf();
 	if (all || !strcmp(res->autotest, "timer_autotest"))
 		ret |= test_timer();
+	if (all || !strcmp(res->autotest, "timer_perf_autotest"))
+		ret |= test_timer_perf();
 	if (all || !strcmp(res->autotest, "mempool_autotest"))
 		ret |= test_mempool();
 	if (all || !strcmp(res->autotest, "mempool_perf_autotest"))
@@ -176,12 +178,19 @@ static void cmd_autotest_parsed(void *parsed_result,
 		ret |= test_meter();
 	if (all || !strcmp(res->autotest, "kni_autotest"))
 		ret |= test_kni();
-	if (all || !strcmp(res->autotest, "acl_autotest"))
-		ret |= test_pmac_acl();
 	if (all || !strcmp(res->autotest, "power_autotest"))
 		ret |= test_power();
 	if (all || !strcmp(res->autotest, "common_autotest"))
 		ret |= test_common();
+#ifdef RTE_LIBRTE_PMD_RING
+	if (all || !strcmp(res->autotest, "ring_pmd_autotest"))
+		ret |= test_pmd_ring();
+#endif /* RTE_LIBRTE_PMD_RING */
+
+#ifdef RTE_LIBRTE_ACL
+	if (all || !strcmp(res->autotest, "acl_autotest"))
+		ret |= test_acl();
+#endif /* RTE_LIBRTE_ACL */
 
 	if (ret == 0)
 		printf("Test OK\n");
@@ -213,7 +222,15 @@ cmdline_parse_token_string_t cmd_autotest_autotest =
 			"memcpy_perf_autotest#ring_perf_autotest#"
 			"red_autotest#meter_autotest#sched_autotest#"
 			"memcpy_perf_autotest#kni_autotest#"
-			"pm_autotest#acl_autotest#power_autotest#"
+			"pm_autotest#"
+#ifdef RTE_LIBRTE_ACL
+			"acl_autotest#"
+#endif
+			"power_autotest#"
+			"timer_perf_autotest#"
+#ifdef RTE_LIBRTE_PMD_RING
+			"ring_pmd_autotest#"
+#endif
 			"common_autotest#all_autotests");
 
 cmdline_parse_inst_t cmd_autotest = {