From af6a67d0f801ad6dbcbd01d4712cba77f1098adf Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Mon, 1 Nov 2010 15:37:23 -0500
Subject: [PATCH] Improved fork/vfork tests for RHEL5.

* testsuite/systemtap.clone/dtrace_fork_exec.exp: Improve output string to
  handle parent/child execution order differences.
* testsuite/systemtap.clone/dtrace_vfork_parent.c: Added include files to
  avoid compile error on RHEL5.
* testsuite/systemtap.clone/dtrace_vfork_parent.c: Ditto.
---
 testsuite/systemtap.clone/dtrace_fork_exec.exp  | 4 +++-
 testsuite/systemtap.clone/dtrace_fork_parent.c  | 2 ++
 testsuite/systemtap.clone/dtrace_vfork_parent.c | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/testsuite/systemtap.clone/dtrace_fork_exec.exp b/testsuite/systemtap.clone/dtrace_fork_exec.exp
index 58d65078d..b81f7495b 100644
--- a/testsuite/systemtap.clone/dtrace_fork_exec.exp
+++ b/testsuite/systemtap.clone/dtrace_fork_exec.exp
@@ -13,7 +13,9 @@ proc run_test_prog {} {
     return 0
 }
 
-set output_string "parent - pid: \[0-9\]+\r\nparent - child pid: \[0-9\]+\r\nparent - child pid before exec: \[0-9\]+\r\nchild - pid: \[0-9\]+\r\nparent - finished\r\n"
+# Since we can't guarentee the order of parent/child execution, we
+# have to be flexible on output.
+set output_string "parent - pid: \[0-9\]+\r\nparent - child pid( before exec)?: \[0-9\]+\r\nparent - child pid( before exec)?: \[0-9\]+\r\nchild - pid: \[0-9\]+\r\nparent - finished\r\n"
 
 # Build everything (without semaphores)
 set TEST_NAME "dtrace_fork_exec1"
diff --git a/testsuite/systemtap.clone/dtrace_fork_parent.c b/testsuite/systemtap.clone/dtrace_fork_parent.c
index 440987aeb..cb403ff04 100644
--- a/testsuite/systemtap.clone/dtrace_fork_parent.c
+++ b/testsuite/systemtap.clone/dtrace_fork_parent.c
@@ -13,6 +13,8 @@
 #include <string.h>
 #include <sched.h>
 #include <errno.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 #include "dtrace_fork_parent_probes.h"
 
 #if !defined(USE_SEMAPHORES)
diff --git a/testsuite/systemtap.clone/dtrace_vfork_parent.c b/testsuite/systemtap.clone/dtrace_vfork_parent.c
index bc0d851c0..e4903fe55 100644
--- a/testsuite/systemtap.clone/dtrace_vfork_parent.c
+++ b/testsuite/systemtap.clone/dtrace_vfork_parent.c
@@ -13,6 +13,8 @@
 #include <string.h>
 #include <sched.h>
 #include <errno.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 #include "dtrace_vfork_parent_probes.h"
 
 #if !defined(USE_SEMAPHORES)
-- 
2.43.5