app: fix whitespace

[dpdk.git] / app / test / autotest_data.py

diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py
index bdb7e94..02921ff 100644 (file)
--- a/app/test/autotest_data.py
+++ b/app/test/autotest_data.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 
 #   BSD LICENSE
-# 
+#
 #   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())
@@ -56,7 +56,7 @@ parallel_test_group_list = [
 {
        "Prefix":       "group_1",
        "Memory" :      all_sockets(8),
-       "Tests" :       
+       "Tests" :
        [
                {
                 "Name" :       "Timer autotest",
@@ -69,7 +69,7 @@ parallel_test_group_list = [
                 "Command" :    "debug_autotest",
                 "Func" :       default_autotest,
                 "Report" :     None,
-               },      
+               },
                {
                 "Name" :       "Errno autotest",
                 "Command" :    "errno_autotest",
@@ -87,7 +87,7 @@ parallel_test_group_list = [
                 "Command" :    "common_autotest",
                 "Func" :       default_autotest,
                 "Report" :     None,
-               },      
+               },
                {
                 "Name" :       "Dump log history",
                 "Command" :    "dump_log_history",
@@ -111,7 +111,7 @@ parallel_test_group_list = [
 {
        "Prefix":       "group_2",
        "Memory" :      "32",
-       "Tests" :       
+       "Tests" :
        [
                {
                 "Name" :       "Memory autotest",
@@ -165,8 +165,8 @@ parallel_test_group_list = [
 },
 {
        "Prefix":       "group_3",
-       "Memory" :      all_sockets(256),
-       "Tests" :       
+       "Memory" :      all_sockets(1024),
+       "Tests" :
        [
                {
                 "Name" :       "LPM autotest",
@@ -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",
@@ -203,7 +209,7 @@ parallel_test_group_list = [
 {
        "Prefix":       "group_4",
        "Memory" :      all_sockets(128),
-       "Tests" :       
+       "Tests" :
        [
                {
                 "Name" :       "PCI autotest",
@@ -246,7 +252,7 @@ parallel_test_group_list = [
 {
        "Prefix":       "group_5",
        "Memory" :      "16",
-       "Tests" :       
+       "Tests" :
        [
                {
                 "Name" :       "Spinlock autotest",
@@ -283,7 +289,7 @@ parallel_test_group_list = [
 {
        "Prefix":       "group_6",
        "Memory" :      all_sockets(620),
-       "Tests" :       
+       "Tests" :
        [
                {
                 "Name" :       "Function reentrancy 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",
@@ -369,7 +369,7 @@ non_parallel_test_group_list = [
 {
        "Prefix":       "mempool_perf",
        "Memory" :      all_sockets(256),
-       "Tests" :       
+       "Tests" :
        [
                {
                 "Name" :       "Cycles autotest",
@@ -388,7 +388,7 @@ non_parallel_test_group_list = [
 {
        "Prefix":       "memcpy_perf",
        "Memory" :      all_sockets(512),
-       "Tests" :       
+       "Tests" :
        [
                {
                 "Name" :       "Memcpy performance autotest",
@@ -401,7 +401,7 @@ non_parallel_test_group_list = [
 {
        "Prefix":       "hash_perf",
        "Memory" :      all_sockets(512),
-       "Tests" :       
+       "Tests" :
        [
                {
                 "Name" :       "Hash performance autotest",
@@ -424,6 +424,32 @@ non_parallel_test_group_list = [
                },
        ]
 },
+{
+       "Prefix" :      "power_acpi_cpufreq",
+       "Memory" :      all_sockets(512),
+       "Tests" :
+       [
+               {
+                "Name" :       "Power ACPI cpufreq autotest",
+                "Command" :    "power_acpi_cpufreq_autotest",
+                "Func" :       default_autotest,
+                "Report" :     None,
+               },
+       ]
+},
+{
+       "Prefix" :      "power_kvm_vm",
+       "Memory" :      "512",
+       "Tests" :
+       [
+               {
+                "Name" :       "Power KVM VM  autotest",
+                "Command" :    "power_kvm_vm_autotest",
+                "Func" :       default_autotest,
+                "Report" :     None,
+               },
+       ]
+},
 {
        "Prefix" :      "lpm6",
        "Memory" :      "512",
@@ -438,26 +464,30 @@ non_parallel_test_group_list = [
        ]
 },
 {
-       "Prefix":       "ring_perf",
+       "Prefix":       "timer_perf",
        "Memory" :      all_sockets(512),
-       "Tests" :       
+       "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" :       
+       "Tests" :
        [
                {
-                "Name" :       "Timer performance autotest",
-                "Command" :    "timer_perf_autotest",
+                "Name" :       "Ring performance autotest",
+                "Command" :    "ring_perf_autotest",
                 "Func" :       default_autotest,
                 "Report" :     None,
                },