commit 8e2383a8fd788c3415bd0cc17cb9658a8a10a3f9
author Maciej Żenczykowski <maze@google.com> Tue Aug 31 20:55:36 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 31 20:55:36 2021 +0000
tree d9497b342d15c67804b97f37742409e184629111
parent fdb4abe24b95bbeff57ebaff67f08803eebb3b8d
parent 33fbf89e53a03d488048076cce1db966cc804beb

Merge "[bpf_native_test] Remove unused libprocessgroup dependency"

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 1559a3c..57f5d3c 100644
--- a/ltp/testcase/tools/configs/disabled_tests.py
+++ b/ltp/testcase/tools/configs/disabled_tests.py
@@ -20,6 +20,8 @@
     '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
+    'controllers.memcg_control_32bit', #b/197942864
+    'controllers.memcg_control_64bit', #b/197942864
     '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 44984ea..7728fe9 100644
--- a/ltp/testcase/tools/configs/stable_tests.py
+++ b/ltp/testcase/tools/configs/stable_tests.py
@@ -67,8 +67,6 @@
     ('controllers.cpuset_sched_domains_64bit', True),
     ('controllers.cpuset_syscall_32bit', True),
     ('controllers.cpuset_syscall_64bit', True),
-    ('controllers.memcg_control_32bit', True),
-    ('controllers.memcg_control_64bit', True),
     ('controllers.memcg_regression_32bit', True),
     ('controllers.memcg_regression_64bit', True),
     ('controllers.memcg_test_3_32bit', True),