[CRIU] [PATCH] zdtm: fifo-rowo-pair test update

[Cyrill Gorcunov]

Address Andrew's comments

 - use TEST_VALUE macro instead of open coded value
 - use WIFx macros for child status testing
 - kill child/parent on error

Note that it was not clear from an initiall patch
change log -- the difference between fifo_wronly
test case and this one is that we use fork() call
here which allow us to make sure that fifo restoration
code logic will be tested more widely.

Basically the flowchart of the test case:

parent				child
------				-----
open RW fifo (slave)
open RO fifo (master)
				open WO fifo (master)
				dup parent slave to slave1

				... waiting c/r to happen ...
				... waking up from c/r ...

				send bytes to master
				send bytes to slave1

				finish
... initiating c/r ...
... waking up from c/r ...

read bytes from master
read bytes from slave

PASS :D

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 test/zdtm/live/static/fifo-rowo-pair.c |   47 +++++++++++++++++++-------------
 1 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/test/zdtm/live/static/fifo-rowo-pair.c b/test/zdtm/live/static/fifo-rowo-pair.c
index 17265a2..793ee6d 100644
--- a/test/zdtm/live/static/fifo-rowo-pair.c
+++ b/test/zdtm/live/static/fifo-rowo-pair.c
@@ -26,6 +26,14 @@ TEST_OPTION(name_master, string, "master fifo name", 1);
 char *name_slave;
 TEST_OPTION(name_slave, string, "slave fifo name", 1);
 
+#define TEST_VALUE	(00100)
+
+#define exit_shot(pid, code)	\
+	do { kill(pid, SIGKILL); exit(code); } while (0)
+
+#define exit_shot_parent(code)	\
+	exit_shot(getppid(), 1)
+
 int main(int argc, char **argv)
 {
 	task_waiter_t t;
@@ -60,29 +68,29 @@ int main(int argc, char **argv)
 		fd_master = open(name_master, O_WRONLY);
 		if (fd_master < 0) {
 			err("can't open %s: %m\n", name_master);
-			exit(1);
+			exit_shot_parent(1);
 		}
 
 		new_slave = dup2(fd_slave, 64);
 		if (new_slave < 0) {
 			err("can't dup %s: %m\n", name_slave);
-			exit(1);
+			exit_shot_parent(1);
 		}
 
 		close(fd_slave);
 
 		task_waiter_complete_current(&t);
 
-		v = 00100;
+		v = TEST_VALUE;
 		if (write(new_slave, &v, sizeof(v)) != sizeof(v)) {
 			err("write failed: %m\n");
-			exit(1);
+			exit_shot_parent(1);
 		}
 
-		v = 00100;
+		v = TEST_VALUE;
 		if (write(fd_master, &v, sizeof(v)) != sizeof(v)) {
 			err("write failed: %m\n");
-			exit(1);
+			exit_shot_parent(1);
 		}
 
 		/* Don't exit until explicitly asked */
@@ -97,7 +105,7 @@ int main(int argc, char **argv)
 	fd_master = open(name_master, O_RDONLY);
 	if (fd_master < 0) {
 		err("can't open %s: %m\n", name_master);
-		exit(1);
+		exit_shot(pid, 1);
 	}
 
 	/* Wait until data appear in kernel fifo buffer */
@@ -108,38 +116,39 @@ int main(int argc, char **argv)
 
 	if (read(fd_master, &v, sizeof(v)) != sizeof(v)) {
 		err("read failed: %m\n");
-		exit(1);
+		exit_shot(pid, 1);
 	}
 
 	task_waiter_complete_current(&t);
 
-	if (v != 00100) {
+	if (v != TEST_VALUE) {
 		fail("read data mismatch\n");
-		exit(1);
+		exit_shot(pid, 1);
 	}
 
 	if (read(fd_slave, &v, sizeof(v)) != sizeof(v)) {
 		err("read failed: %m\n");
-		exit(1);
+		exit_shot(pid, 1);
 	}
-	if (v != 00100) {
+	if (v != TEST_VALUE) {
 		fail("read data mismatch\n");
-		exit(1);
+		exit_shot(pid, 1);
 	}
 
 	waitpid(pid, &status, P_ALL);
 
-	if (unlink(name_master) < 0) {
+	if (unlink(name_master) < 0)
 		err("can't unlink %s: %m", name_master);
-		exit(1);
-	}
 
-	if (unlink(name_slave) < 0) {
+	if (unlink(name_slave) < 0)
 		err("can't unlink %s: %m", name_slave);
-		exit(1);
+
+	if (!WIFEXITED(status)) {
+		err("child %d is still running\n", pid);
+		exit_shot(pid, 1);
 	}
 
-	errno = (status >> 8) & 0x7f;
+	errno = WEXITSTATUS(status);
 	if (errno) {
 		fail("Child exited with error %m");
 		exit(errno);
-- 
1.7.7.6