commit 0d516bdc0e40d74a1f5db2b3fb5eeaec2cce8162
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 08 23:34:32 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 08 23:34:32 2021 +0000
tree 4f711a31acb3fda2c0144686b6a9dc09935b4cfc
parent 2c5e7f396a13285ab8f3efd76bcc01197051c795
parent 22ddd417290e3a84b1bc578a84ee6a6bd60f965d

Merge "ltp: disable controllers.cgroup_fj_function_net_prio"

ltp/testcase/tools/configs/disabled_tests.py

diff --git a/ltp/testcase/tools/configs/disabled_tests.py b/ltp/testcase/tools/configs/disabled_tests.py
index 9538027..1559a3c 100644
--- a/ltp/testcase/tools/configs/disabled_tests.py
+++ b/ltp/testcase/tools/configs/disabled_tests.py
@@ -18,6 +18,8 @@
     'controllers.cgroup_fj_function_blkio_64bit',  # b/191224883
     'controllers.cgroup_fj_function_memory_32bit',  # b/191867109
     'controllers.cgroup_fj_function_memory_64bit',  # b/191867109
+    'controllers.cgroup_fj_function_net_prio_32bit', # b/193172511
+    'controllers.cgroup_fj_function_net_prio_64bit', # b/193172511
     'cve.cve-2017-15649_32bit',  # b/191224884
     'cve.cve-2017-15649_64bit',  # b/191224884
     'cve.cve-2017-2636_32bit',  # b/191224903

ltp/testcase/tools/configs/stable_tests.py

diff --git a/ltp/testcase/tools/configs/stable_tests.py b/ltp/testcase/tools/configs/stable_tests.py
index 1125ff4..44984ea 100644
--- a/ltp/testcase/tools/configs/stable_tests.py
+++ b/ltp/testcase/tools/configs/stable_tests.py
@@ -45,8 +45,6 @@
     ('controllers.cgroup_fj_function_hugetlb_64bit', True),
     ('controllers.cgroup_fj_function_net_cls_32bit', True),
     ('controllers.cgroup_fj_function_net_cls_64bit', True),
-    ('controllers.cgroup_fj_function_net_prio_32bit', True),
-    ('controllers.cgroup_fj_function_net_prio_64bit', True),
     ('controllers.cgroup_fj_function_perf_event_32bit', True),
     ('controllers.cgroup_fj_function_perf_event_64bit', True),
     ('controllers.cpuacct_1_1_32bit', True),