app/test: filter out unavailable tests

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

diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py
index 02921ff..c69705e 100644 (file)
--- a/app/test/autotest_data.py
+++ b/app/test/autotest_data.py
@@ -43,11 +43,10 @@ def num_sockets():
                return 1
        return result
 
-# 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())
+# Assign given number to each socket
+# e.g. 32 becomes 32,32 or 32,32,32,32
+def per_sockets(num):
+    return ",".join([str(num)] * num_sockets())
 
 # groups of tests that can be run in parallel
 # the grouping has been found largely empirically
@@ -55,9 +54,15 @@ parallel_test_group_list = [
 
 {
        "Prefix":       "group_1",
-       "Memory" :      all_sockets(8),
+       "Memory" :      per_sockets(8),
        "Tests" :
        [
+               {
+                "Name" :       "Cycles autotest",
+                "Command" :    "cycles_autotest",
+                "Func" :       default_autotest,
+                "Report" :     None,
+               },
                {
                 "Name" :       "Timer autotest",
                 "Command" :    "timer_autotest",
@@ -89,28 +94,16 @@ parallel_test_group_list = [
                 "Report" :     None,
                },
                {
-                "Name" :       "Dump log history",
-                "Command" :    "dump_log_history",
-                "Func" :       dump_autotest,
-                "Report" :     None,
-               },
-               {
-                "Name" :       "Dump rings",
-                "Command" :    "dump_ring",
-                "Func" :       dump_autotest,
-                "Report" :     None,
-               },
-               {
-                "Name" :       "Dump mempools",
-                "Command" :    "dump_mempool",
-                "Func" :       dump_autotest,
+                "Name" :       "Resource autotest",
+                "Command" :    "resource_autotest",
+                "Func" :       default_autotest,
                 "Report" :     None,
                },
        ]
 },
 {
        "Prefix":       "group_2",
-       "Memory" :      "32",
+       "Memory" :      "16",
        "Tests" :
        [
                {
@@ -165,7 +158,7 @@ parallel_test_group_list = [
 },
 {
        "Prefix":       "group_3",
-       "Memory" :      all_sockets(1024),
+       "Memory" :      per_sockets(390),
        "Tests" :
        [
                {
@@ -174,6 +167,12 @@ parallel_test_group_list = [
                 "Func" :       default_autotest,
                 "Report" :     None,
                },
+               {
+                       "Name" :    "LPM6 autotest",
+                       "Command" : "lpm6_autotest",
+                       "Func" :    default_autotest,
+                       "Report" :  None,
+               },
                {
                 "Name" :       "IVSHMEM autotest",
                 "Command" :    "ivshmem_autotest",
@@ -208,7 +207,7 @@ parallel_test_group_list = [
 },
 {
        "Prefix":       "group_4",
-       "Memory" :      all_sockets(128),
+       "Memory" :      per_sockets(128),
        "Tests" :
        [
                {
@@ -251,7 +250,7 @@ parallel_test_group_list = [
 },
 {
        "Prefix":       "group_5",
-       "Memory" :      "16",
+       "Memory" :      "32",
        "Tests" :
        [
                {
@@ -288,7 +287,7 @@ parallel_test_group_list = [
 },
 {
        "Prefix":       "group_6",
-       "Memory" :      all_sockets(620),
+       "Memory" :      per_sockets(128),
        "Tests" :
        [
                {
@@ -325,7 +324,7 @@ parallel_test_group_list = [
 },
 {
        "Prefix" :      "group_7",
-       "Memory" :      "400",
+       "Memory" :      "64",
        "Tests" :
        [
                {
@@ -368,15 +367,9 @@ non_parallel_test_group_list = [
 },
 {
        "Prefix":       "mempool_perf",
-       "Memory" :      all_sockets(256),
+       "Memory" :      per_sockets(256),
        "Tests" :
        [
-               {
-                "Name" :       "Cycles autotest",
-                "Command" :    "cycles_autotest",
-                "Func" :       default_autotest,
-                "Report" :     None,
-               },
                {
                 "Name" :       "Mempool performance autotest",
                 "Command" :    "mempool_perf_autotest",
@@ -387,7 +380,7 @@ non_parallel_test_group_list = [
 },
 {
        "Prefix":       "memcpy_perf",
-       "Memory" :      all_sockets(512),
+       "Memory" :      per_sockets(512),
        "Tests" :
        [
                {
@@ -400,7 +393,7 @@ non_parallel_test_group_list = [
 },
 {
        "Prefix":       "hash_perf",
-       "Memory" :      all_sockets(512),
+       "Memory" :      per_sockets(512),
        "Tests" :
        [
                {
@@ -413,7 +406,7 @@ non_parallel_test_group_list = [
 },
 {
        "Prefix" :      "power",
-       "Memory" :      all_sockets(512),
+       "Memory" :      "16",
        "Tests" :
        [
                {
@@ -426,7 +419,7 @@ non_parallel_test_group_list = [
 },
 {
        "Prefix" :      "power_acpi_cpufreq",
-       "Memory" :      all_sockets(512),
+       "Memory" :      "16",
        "Tests" :
        [
                {
@@ -439,7 +432,7 @@ non_parallel_test_group_list = [
 },
 {
        "Prefix" :      "power_kvm_vm",
-       "Memory" :      "512",
+       "Memory" :      "16",
        "Tests" :
        [
                {
@@ -450,22 +443,9 @@ non_parallel_test_group_list = [
                },
        ]
 },
-{
-       "Prefix" :      "lpm6",
-       "Memory" :      "512",
-       "Tests" :
-       [
-               {
-                 "Name" :       "LPM6 autotest",
-                 "Command" :    "lpm6_autotest",
-                 "Func" :       default_autotest,
-                 "Report" :     None,
-                },
-       ]
-},
 {
        "Prefix":       "timer_perf",
-       "Memory" :      all_sockets(512),
+       "Memory" :      per_sockets(512),
        "Tests" :
        [
                {
@@ -482,7 +462,7 @@ non_parallel_test_group_list = [
 #
 {
        "Prefix":       "ring_perf",
-       "Memory" :      all_sockets(512),
+       "Memory" :      per_sockets(512),
        "Tests" :
        [
                {