X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Fautotest_data.py;h=878c72e81cd73ccbff9dea9a3a6c5d38d32e6cfd;hb=68fa37e021a1c44c6b2a947cefc20eb61c729947;hp=4f0fd291089be431b53a12bc889d8bcb380d077c;hpb=51f567129c9422ac5e8fad7437dd8c5684954b5d;p=dpdk.git

diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py
index 4f0fd29108..878c72e81c 100644
--- a/app/test/autotest_data.py
+++ b/app/test/autotest_data.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 
 #   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
 #   modification, are permitted provided that the following conditions
 #   are met:
-# 
+#
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above copyright
@@ -18,7 +18,7 @@
 #     * Neither the name of Intel Corporation nor the names of its
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
-# 
+#
 #   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 #   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 #   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -43,8 +43,8 @@ def num_sockets():
 		return 1
 	return result
 
-# multiply given number for all sockets
-# e.g. 32 becomes 32,32 or 32,32,32,32 etc.
+# spread given number for all sockets
+# e.g. 32 becomes 16,16 or 8,8,8,8 etc.
 def all_sockets(num):
 	mem_per_socket = num / num_sockets()
 	return ",".join([str(mem_per_socket)] * num_sockets())
@@ -165,7 +165,7 @@ parallel_test_group_list = [
 },
 {
 	"Prefix":	"group_3",
-	"Memory" :	all_sockets(256),
+	"Memory" :	all_sockets(1024),
 	"Tests" :	
 	[
 		{
@@ -174,6 +174,12 @@ parallel_test_group_list = [
 		 "Func" :	default_autotest,
 		 "Report" :	None,
 		},
+		{
+		 "Name" :	"IVSHMEM autotest",
+		 "Command" : 	"ivshmem_autotest",
+		 "Func" :	default_autotest,
+		 "Report" :	None,
+		},
 		{
 		 "Name" :	"Memcpy autotest",
 		 "Command" : 	"memcpy_autotest",
@@ -333,12 +339,6 @@ parallel_test_group_list = [
 		 "Command" : 	"acl_autotest",
 		 "Func" :	default_autotest,
 		 "Report" :	None,
-		},
-		{
-		 "Name" :	"Pattern match autotest",
-		 "Command" : 	"pm_autotest",
-		 "Func" :	default_autotest,
-		 "Report" :	None,
 		},
 		 {
 		 "Name" :"Sched autotest",
@@ -438,26 +438,30 @@ non_parallel_test_group_list = [
 	]
 },
 {
-	"Prefix":	"ring_perf",
+	"Prefix":	"timer_perf",
 	"Memory" :	all_sockets(512),
 	"Tests" :	
 	[
 		{
-		 "Name" :	"Ring performance autotest",
-		 "Command" : 	"ring_perf_autotest",
+		 "Name" :	"Timer performance autotest",
+		 "Command" : 	"timer_perf_autotest",
 		 "Func" :	default_autotest,
 		 "Report" :	None,
 		},
 	]
 },
+							
+#
+# Please always make sure that ring_perf is the last test!
+#
 {
-	"Prefix":	"timer_perf",
+	"Prefix":	"ring_perf",
 	"Memory" :	all_sockets(512),
 	"Tests" :	
 	[
 		{
-		 "Name" :	"Timer performance autotest",
-		 "Command" : 	"timer_perf_autotest",
+		 "Name" :	"Ring performance autotest",
+		 "Command" : 	"ring_perf_autotest",
 		 "Func" :	default_autotest,
 		 "Report" :	None,
 		},