X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Fcommands.c;h=123f5b468958f7c90904bed982a6b5d353738f73;hb=b6df9fc8715f9a925136006b18fdd65f9c621757;hp=a1d23d8af7102a39bb32661fc9a39da90a7dc4d7;hpb=af75078fece3615088e561357c1e97603e43a5fe;p=dpdk.git

diff --git a/app/test/commands.c b/app/test/commands.c
index a1d23d8af7..123f5b4689 100644
--- a/app/test/commands.c
+++ b/app/test/commands.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
  *   All rights reserved.
  * 
  *   Redistribution and use in source and binary forms, with or without 
@@ -30,7 +30,6 @@
  *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- *  version: DPDK.L.1.2.3-3
  */
 
 #include <stdio.h>
@@ -94,6 +93,8 @@ static void cmd_autotest_parsed(void *parsed_result,
 
 	if (all || !strcmp(res->autotest, "version_autotest"))
 		ret |= test_version();
+	if (all || !strcmp(res->autotest, "eal_fs_autotest"))
+		ret |= test_eal_fs();
 	if (all || !strcmp(res->autotest, "debug_autotest"))
 		ret |= test_debug();
 	if (all || !strcmp(res->autotest, "pci_autotest"))
@@ -124,10 +125,14 @@ static void cmd_autotest_parsed(void *parsed_result,
 		ret |= test_errno();
 	if (all || !strcmp(res->autotest, "hash_autotest"))
 		ret |= test_hash();
+	if (all || !strcmp(res->autotest, "hash_perf_autotest"))
+		ret |= test_hash_perf();
 	if (all || !strcmp(res->autotest, "lpm_autotest"))
 		ret |= test_lpm();
 	if (all || !strcmp(res->autotest, "cpuflags_autotest"))
 		ret |= test_cpuflags();
+	if (all || !strcmp(res->autotest, "cmdline_autotest"))
+		ret |= test_cmdline();
 	/* tailq autotest must go after all lpm and hashs tests or any other
 	 * tests which need to create tailq objects (ring and mempool are implicitly
 	 * created in earlier tests so can go later)
@@ -154,6 +159,16 @@ static void cmd_autotest_parsed(void *parsed_result,
 		ret |= test_timer();
 	if (all || !strcmp(res->autotest, "mempool_autotest"))
 		ret |= test_mempool();
+	if (all || !strcmp(res->autotest, "mempool_perf_autotest"))
+		ret |= test_mempool_perf();
+	if (all || !strcmp(res->autotest, "memcpy_perf_autotest"))
+		ret |= test_memcpy_perf();
+	if (all || !strcmp(res->autotest, "func_reentrancy_autotest"))
+		ret |= test_func_reentrancy();
+	if (all || !strcmp(res->autotest, "pm_autotest"))
+		ret |= test_pmac_pm();
+	if (all || !strcmp(res->autotest, "acl_autotest"))
+		ret |= test_pmac_acl();
 
 	if (ret == 0)
 		printf("Test OK\n");
@@ -178,7 +193,11 @@ cmdline_parse_token_string_t cmd_autotest_autotest =
 			"string_autotest#multiprocess_autotest#"
 			"cpuflags_autotest#eal_flags_autotest#"
 			"alarm_autotest#interrupt_autotest#"
-			"version_autotest#"
+			"version_autotest#eal_fs_autotest#"
+			"cmdline_autotest#func_reentrancy_autotest#"
+			"mempool_perf_autotest#hash_perf_autotest#"
+			"memcpy_perf_autotest#pm_autotest#"
+			"acl_autotest#"
 			"all_autotests");
 
 cmdline_parse_inst_t cmd_autotest = {
@@ -315,12 +334,7 @@ static void cmd_set_ring_parsed(void *parsed_result, struct cmdline *cl,
 		return;
 	}
 
-	if (!strcmp(res->set, "set_quota")) {
-		ret = rte_ring_set_bulk_count(r, res->value);
-		if (ret != 0)
-			cmdline_printf(cl, "Cannot set quota\n");
-	}
-	else if (!strcmp(res->set, "set_watermark")) {
+	if (!strcmp(res->set, "set_watermark")) {
 		ret = rte_ring_set_water_mark(r, res->value);
 		if (ret != 0)
 			cmdline_printf(cl, "Cannot set water mark\n");
@@ -329,7 +343,7 @@ static void cmd_set_ring_parsed(void *parsed_result, struct cmdline *cl,
 
 cmdline_parse_token_string_t cmd_set_ring_set =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_ring_result, set,
-				 "set_quota#set_watermark");
+				 "set_watermark");
 
 cmdline_parse_token_string_t cmd_set_ring_name =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_ring_result, name, NULL);
@@ -340,8 +354,8 @@ cmdline_parse_token_num_t cmd_set_ring_value =
 cmdline_parse_inst_t cmd_set_ring = {
 	.f = cmd_set_ring_parsed,  /* function to call */
 	.data = NULL,      /* 2nd arg of func */
-	.help_str = "set quota/watermark: "
-			"set_quota|set_watermark <ring_name> <value>",
+	.help_str = "set watermark: "
+			"set_watermark <ring_name> <value>",
 	.tokens = {        /* token list, NULL terminated */
 		(void *)&cmd_set_ring_set,
 		(void *)&cmd_set_ring_name,