commit a11ad222f993e9f8ade26709b3ab4b905a2bacc8
author Garrett Cooper <yanegomi@gmail.com> Tue Jan 18 02:02:55 2011 -0800
committer Garrett Cooper <yanegomi@gmail.com> Tue Jan 18 02:02:55 2011 -0800
tree a472969a7eb8907888aef68fa7272f5cbc78c560
parent 4bab33598e917b0a58637e13a48de8dd8c9ae7c4

More cleanup and fixes.

Signed-off-by: Garrett Cooper <yanegomi@gmail.com>

testcases/kernel/mem/oom/oom01.c

diff --git a/testcases/kernel/mem/oom/oom01.c b/testcases/kernel/mem/oom/oom01.c
index c55df7c..c670d90 100644
--- a/testcases/kernel/mem/oom/oom01.c
+++ b/testcases/kernel/mem/oom/oom01.c
@@ -85,20 +85,23 @@
 		testoom(0, 0, 0);
 	}
 	cleanup();
+	tst_exit();
 }
 
 void setup(void)
 {
 	int fd;
 
+	tst_require_root(NULL);
+
 	tst_sig(FORK, DEF_HANDLER, cleanup);
 	TEST_PAUSE;
 
 	fd = open(SYSFS_OVER, O_RDONLY);
 	if (fd == -1)
-		tst_brkm(TBROK|TERRNO, cleanup, "open");
+		tst_brkm(TBROK|TERRNO, NULL, "open");
 	if (read(fd, &overcommit, 1) != 1)
-		tst_brkm(TBROK|TERRNO, cleanup, "read");
+		tst_brkm(TBROK|TERRNO, NULL, "read");
 	close(fd);
 }
 

testcases/kernel/mem/oom/oom02.c

diff --git a/testcases/kernel/mem/oom/oom02.c b/testcases/kernel/mem/oom/oom02.c
index 71305c7..68ed1ef 100644
--- a/testcases/kernel/mem/oom/oom02.c
+++ b/testcases/kernel/mem/oom/oom02.c
@@ -81,6 +81,7 @@
 		testoom(0, 0, 1);
 	}
 	cleanup();
+	tst_exit();
 }
 
 void setup(void)

testcases/kernel/mem/oom/oom03.c

diff --git a/testcases/kernel/mem/oom/oom03.c b/testcases/kernel/mem/oom/oom03.c
index 6212e4f..dd09467 100644
--- a/testcases/kernel/mem/oom/oom03.c
+++ b/testcases/kernel/mem/oom/oom03.c
@@ -94,20 +94,23 @@
 		testoom(0, 1, 0);
 	}
 	cleanup();
+	tst_exit();
 }
 
 void setup(void)
 {
 	int fd;
 
+	tst_require_root(NULL);
+
 	tst_sig(FORK, DEF_HANDLER, cleanup);
 	TEST_PAUSE;
 
 	fd = open(SYSFS_OVER, O_RDONLY);
 	if (fd == -1)
-		tst_brkm(TBROK|TERRNO, cleanup, "open");
+		tst_brkm(TBROK|TERRNO, NULL, "open");
 	if (read(fd, &overcommit, 1) != 1)
-		tst_brkm(TBROK|TERRNO, cleanup, "read");
+		tst_brkm(TBROK|TERRNO, NULL, "read");
 	close(fd);
 
 	mount_mem("memcg", "cgroup", "memory", MEMCG_PATH, MEMCG_PATH_NEW);
@@ -127,5 +130,4 @@
 	umount_mem(MEMCG_PATH, MEMCG_PATH_NEW);
 	
 	TEST_CLEANUP;
-	tst_exit();
 }

testcases/kernel/mem/oom/oom04.c

diff --git a/testcases/kernel/mem/oom/oom04.c b/testcases/kernel/mem/oom/oom04.c
index 307bfd2..1dff85e 100644
--- a/testcases/kernel/mem/oom/oom04.c
+++ b/testcases/kernel/mem/oom/oom04.c
@@ -168,6 +168,7 @@
 		testoom(0, 1, 1);
 	}
 	cleanup();
+	tst_exit();
 }
 
 void testoom(int mempolicy, int lite)
@@ -219,14 +220,16 @@
 {
 	int fd;
 
+	tst_require_root(NULL);
+
 	tst_sig(FORK, DEF_HANDLER, cleanup);
 	TEST_PAUSE;
 
 	fd = open(SYSFS_OVER, O_RDONLY);
 	if (fd == -1)
-		tst_brkm(TBROK|TERRNO, cleanup, "open");
+		tst_brkm(TBROK|TERRNO, NULL, "open");
 	if (read(fd, &overcommit, 1) != 1)
-		tst_brkm(TBROK|TERRNO, cleanup, "read");
+		tst_brkm(TBROK|TERRNO, NULL, "read");
 	close(fd);
 
 	mount_mem("cpuset", "cpuset", NULL, CPATH, CPATH_NEW);
@@ -292,7 +295,6 @@
 	umount_mem(MEMCG_PATH, MEMCG_PATH_NEW);
 
 	TEST_CLEANUP;
-	tst_exit();
 }
 
 void oom(int testcase, int mempolicy, int lite)
@@ -392,7 +394,6 @@
 
 #else /* no NUMA */
 int main(void) {
-	tst_resm(TCONF, "no NUMA development packages installed.");
-	tst_exit();
+	tst_brkm(TCONF, NULL, "no NUMA development packages installed.");
 }
 #endif