Merge commit 'origin/master' into pr7043

Conflicts:
	runtime/print.c
	runtime/transport/transport.c
	runtime/transport/transport_msgs.h

1 files changed, 14 insertions, 0 deletions

diff --git a/testsuite/systemtap.base/optionalprobe.stp b/testsuite/systemtap.base/optionalprobe.stp
new file mode 100644
index 00000000..13918cee
--- /dev/null
+++ b/testsuite/systemtap.base/optionalprobe.stp
@@ -0,0 +1,14 @@
+#! stap
+
+# test optional probe
+
+probe foo ?,
+      process("/do/not/exist").function("main") !,
+      kernel.mark("no such mark") ?,
+      kernel.trace("no trace") !,
+      process.foo ?,
+      kernel.statement("no statement") !,
+      module("no mod").function("*") ?,
+      kernel.function("no such func*") !,
+      begin {
+}