From 4b9d5d765ac51edf11bb0254c1506f6ce52b705b Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Wed, 12 Nov 2008 12:29:36 -0600
Subject: Improved error handling of num_args.tcl testcase. 2008-11-12  David
 Smith  <dsmith@redhat.com>

	* systemtap.context/num_args.tcl: Improved error handling of
	testcase.
---
 testsuite/ChangeLog                      | 5 +++++
 testsuite/systemtap.context/num_args.tcl | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index d0a3a4f4..658e9c98 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-12  David Smith  <dsmith@redhat.com>
+
+	* systemtap.context/num_args.tcl: Improved error handling of
+	testcase.
+
 2008-11-03  Wenji Huang  <wenji.huang@oracle.com>
 
 	* systemtap.base/cmd_parse.exp: Add exit() to probe.
diff --git a/testsuite/systemtap.context/num_args.tcl b/testsuite/systemtap.context/num_args.tcl
index 48e83f4d..7d12b433 100644
--- a/testsuite/systemtap.context/num_args.tcl
+++ b/testsuite/systemtap.context/num_args.tcl
@@ -54,9 +54,12 @@ expect {
 	    timeout {fail "string function arguments -- $tag"}
 	}
     }
+    -re "semantic error:" {
+	fail "function arguments -- $tag: compilation failed"
+    }
     eof {fail "function arguments -- $tag: unexpected timeout"}
 }
 exec kill -INT -[exp_pid]
-close
+catch close
 wait
 }
-- 
cgit 


From 8bf4a1448c19642ae13e2ed4458cc77af5f398fd Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Wed, 12 Nov 2008 13:49:17 -0500
Subject: add #include <stdio.h> for more reported gcc 4.4 compatibility

---
 util.cxx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/util.cxx b/util.cxx
index a5f77c06..42f0beb5 100644
--- a/util.cxx
+++ b/util.cxx
@@ -24,6 +24,7 @@ extern "C" {
 #include <sys/stat.h>
 #include <pwd.h>
 #include <unistd.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
 }
-- 
cgit