Merge branch 'master' of git://sources.redhat.com/git/systemtap

Conflicts:

	Makefile.in

1 files changed, 27 insertions, 0 deletions

diff --git a/testsuite/systemtap.base/uprobes_exe.c b/testsuite/systemtap.base/uprobes_exe.c
new file mode 100644
index 00000000..447434c6
--- /dev/null
+++ b/testsuite/systemtap.base/uprobes_exe.c
@@ -0,0 +1,27 @@
+/* uprobes_lib test case
+ * Copyright (C) 2009, Red Hat Inc.
+ *                                                          
+ * This file is part of systemtap, and is free software.  You can
+ * redistribute it and/or modify it under the terms of the GNU General
+ * Public License (GPL); either version 2, or (at your option) any
+ * later version.
+ */
+
+#include <unistd.h>
+
+// function from our library
+int lib_main (void);
+
+void
+main_func (int foo)
+{
+  ; // nothing here...
+}
+
+int
+main (int argc, char *argv[], char *envp[])
+{
+  main_func(1);
+  lib_main();
+  return 0;
+}