<div dir="ltr">sorry, ping~<br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jan 29, 2016 at 9:36 PM, Li Wang <span dir="ltr"><<a href="mailto:liwang@redhat.com" target="_blank">liwang@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">oom03 should not test on aarch64 system which does not support NUMA, so I add<br>
the function to make sure it could be skiped.<br>
-----<br>
# ./oom03<br>
oom03 0 TINFO : set overcommit_memory to 1<br>
...<br>
oom03 0 TINFO : expected victim is 29154.<br>
oom03 6 TPASS : victim signalled: (9) SIGKILL<br>
oom03 7 TCONF : numa_helper.c:86: syscall(236) __NR_get_mempolicy not supported on your arch<br>
oom03 8 TCONF : numa_helper.c:86: Remaining cases not appropriate for configuration<br>
<br>
oom0{4,5} get fails on aarch64 system if run it in continuous twice(the<br>
first time skiped with TCONF, then the second time it will be failed).<br>
-----<br>
# ./oom05<br>
oom05 0 TINFO : set overcommit_memory to 1<br>
oom05 1 TCONF : numa_helper.c:86: syscall(236) __NR_get_mempolicy not supported on your arch<br>
oom05 2 TCONF : numa_helper.c:86: Remaining cases not appropriate for configuration<br>
<br>
# ./oom05<br>
oom05 0 TINFO : set overcommit_memory to 1<br>
oom05 1 TBROK : mem.c:997: mkdir /dev/cgroup: errno=EEXIST(17): File exists<br>
oom05 2 TBROK : mem.c:997: Remaining cases broken<br>
oom05 0 TINFO : set overcommit_memory to 1<br>
<br>
the reason is that it doesn't pass the cleanup to the tst_brkm() there.<br>
<br>
Signed-off-by: Li Wang <<a href="mailto:liwang@redhat.com">liwang@redhat.com</a>><br>
-----<br>
---<br>
testcases/kernel/mem/oom/oom03.c | 3 +++<br>
testcases/kernel/mem/oom/oom04.c | 2 +-<br>
testcases/kernel/mem/oom/oom05.c | 2 +-<br>
3 files changed, 5 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/testcases/kernel/mem/oom/oom03.c b/testcases/kernel/mem/oom/oom03.c<br>
index 3afc3de..eabaeb9 100644<br>
--- a/testcases/kernel/mem/oom/oom03.c<br>
+++ b/testcases/kernel/mem/oom/oom03.c<br>
@@ -94,6 +94,9 @@ void setup(void)<br>
tst_sig(FORK, DEF_HANDLER, cleanup);<br>
TEST_PAUSE;<br>
<br>
+ if (!is_numa(NULL))<br>
+ tst_brkm(TCONF, NULL, "The case need a NUMA system.");<br>
+<br>
overcommit = get_sys_tune("overcommit_memory");<br>
set_sys_tune("overcommit_memory", 1, 1);<br>
mount_mem("memcg", "cgroup", "memory", MEMCG_PATH, MEMCG_PATH_NEW);<br>
diff --git a/testcases/kernel/mem/oom/oom04.c b/testcases/kernel/mem/oom/oom04.c<br>
index ffb5503..0a315e1 100644<br>
--- a/testcases/kernel/mem/oom/oom04.c<br>
+++ b/testcases/kernel/mem/oom/oom04.c<br>
@@ -100,7 +100,7 @@ void setup(void)<br>
*/<br>
ret = get_allowed_nodes(NH_MEMS, 1, &memnode);<br>
if (ret < 0)<br>
- tst_brkm(TBROK, NULL, "Failed to get a memory node "<br>
+ tst_brkm(TBROK, cleanup, "Failed to get a memory node "<br>
"using get_allowed_nodes()");<br>
write_cpusets(memnode);<br>
}<br>
diff --git a/testcases/kernel/mem/oom/oom05.c b/testcases/kernel/mem/oom/oom05.c<br>
index 9cd49a7..44a243e 100644<br>
--- a/testcases/kernel/mem/oom/oom05.c<br>
+++ b/testcases/kernel/mem/oom/oom05.c<br>
@@ -125,7 +125,7 @@ void setup(void)<br>
*/<br>
ret = get_allowed_nodes(NH_MEMS, 1, &memnode);<br>
if (ret < 0)<br>
- tst_brkm(TBROK, NULL, "Failed to get a memory node "<br>
+ tst_brkm(TBROK, cleanup, "Failed to get a memory node "<br>
"using get_allowed_nodes()");<br>
write_cpusets(memnode);<br>
}<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.9.3<br>
<br>
<br>
--<br>
Mailing list info: <a href="http://lists.linux.it/listinfo/ltp" rel="noreferrer" target="_blank">http://lists.linux.it/listinfo/ltp</a><br>
</font></span></blockquote></div><br><br clear="all"><br>-- <br><div class="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div>Regards,<br></div>Li Wang<br></div><div>Email: <a href="mailto:liwang@redhat.com" target="_blank">liwang@redhat.com</a><br></div></div></div></div></div></div>
</div></div>