From: David van Moolenbroek <david@minix3.org>
Date: Thu, 9 Jul 2009 11:44:35 +0000 (+0000)
Subject: Fix race condition in test 25
X-Git-Tag: v3.1.5~225
X-Git-Url: http://zhaoyanbai.com/repos/Bv9ARM.ch06.html?a=commitdiff_plain;h=f15d1fb13d17182ec9f1d8a67a9db01bec0683fd;p=minix.git

Fix race condition in test 25
---

diff --git a/test/test25.c b/test/test25.c
index 7d82a2aa6..42c86fe8e 100644
--- a/test/test25.c
+++ b/test/test25.c
@@ -499,7 +499,7 @@ void test25c()
 	if ((fd1 = open("fifo", O_WRONLY)) != 3) e(57);
 	if (write(fd1, "I did see Elvis.\n", 18) != 18) e(58);
 
-	/* Keep open till second reader is opened. */
+	/* Keep open till third reader is opened. */
 	while (stat("/tmp/sema.25", &st) != 0) sleep(1);
 	if (close(fd1) != 0) e(59);
 	exit(0);
@@ -509,12 +509,12 @@ void test25c()
 	if (strncmp(buf, "I ", 2) != 0) e(62);
 	if (close(fd1) != 0) e(63);
 	if ((fd1 = open("fifo", O_RDONLY)) != 3) e(64);
-
-	/* Signal second reader is open. */
-	Creat("/tmp/sema.25");
 	if (read(fd1, buf, 4) != 4) e(65);
 	if (strncmp(buf, "did ", 4) != 0) e(66);
 	if ((fd2 = open("fifo", O_RDONLY)) != 4) e(67);
+
+	/* Signal third reader is open. */
+	Creat("/tmp/sema.25");
 	if (read(fd2, buf, BUF_SIZE) != 12) e(68);
 	if (strncmp(buf, "see Elvis.\n", 12) != 0) e(69);
 	if (close(fd2) != 0) e(70);