Make fork test deterministic.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2190

diff --git a/none/tests/fork.c b/none/tests/fork.c
index 8995beb5655d1cd4e34de0885d203b09c0fe1719..22a7c211b743b34255ad26c99cf4569730f417ee 100644 (file)
--- a/none/tests/fork.c
+++ b/none/tests/fork.c
@@ -1,6 +1,7 @@
 
 #include <unistd.h>
 #include <sys/types.h>
+#include <sys/wait.h>
 #include <stdio.h>
 
 int main(void)
@@ -16,5 +17,8 @@ int main(void)
 
   printf("%s", pid==0 ? "X" : "XX");
 
+  if (pid != 0)
+     waitpid(pid, NULL, 0);
+
   return 0;
 }

diff --git a/none/tests/fork.stderr.exp b/none/tests/fork.stderr.exp
index 139597f9cb07c5d48bed18984ec4747f4b4f3438..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/none/tests/fork.stderr.exp
+++ b/none/tests/fork.stderr.exp
@@ -1,2 +0,0 @@
-
-

diff --git a/none/tests/fork.vgtest b/none/tests/fork.vgtest
index 0de247f89d943e3bca06683dc97ac04d9fc4c018..efd66f6017646860503da9adc198c1ee77493cf7 100644 (file)
--- a/none/tests/fork.vgtest
+++ b/none/tests/fork.vgtest
@@ -1 +1,2 @@
 prog: fork
+vgopts: -q