Merge commit 'origin/master' into pr7043

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

6 files changed, 53 insertions, 1 deletions

diff --git a/testsuite/parseko/cmdline17.stp b/testsuite/parseko/cmdline17.stp
new file mode 100755
index 00000000..a9baf2d4
--- /dev/null
+++ b/testsuite/parseko/cmdline17.stp
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# options '-D' and '-L' are mutually exclusive
+#
+#-D              Run in background. This requires '-o' option.
+#-L              Load module and start probes, then detach.
+
+staprun -L -D fake_module
diff --git a/testsuite/parseko/cmdline18.stp b/testsuite/parseko/cmdline18.stp
new file mode 100755
index 00000000..bbdfbcc5
--- /dev/null
+++ b/testsuite/parseko/cmdline18.stp
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# options '-D' and '-d' are mutually exclusive
+#
+#-D              Run in background. This requires '-o' option.
+#-d              Delete a module.  Only detached or unused modules
+#                the user has permission to access will be deleted. Use "*"
+#                (quoted) to delete all unused modules.
+
+staprun -d -D fake_module
diff --git a/testsuite/parseko/cmdline19.stp b/testsuite/parseko/cmdline19.stp
new file mode 100755
index 00000000..fbcef351
--- /dev/null
+++ b/testsuite/parseko/cmdline19.stp
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# options '-D' and '-c cmd' are mutually exclusive
+#
+#-D              Run in background. This requires '-o' option.
+#-c cmd          Command 'cmd' will be run and staprun will
+#                exit when it does.  The '_stp_target' variable
+#                will contain the pid for the command.
+
+staprun -c /bin/ls -D fake_module
diff --git a/testsuite/parseko/cmdline20.stp b/testsuite/parseko/cmdline20.stp
new file mode 100755
index 00000000..625cf20d
--- /dev/null
+++ b/testsuite/parseko/cmdline20.stp
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# You have to specify ouput FILE with '-D' option
+#
+#-D              Run in background. This requires '-o' option.
+#-o FILE         Send output to FILE. This supports strftime(3)
+#                formats for FILE.
+
+staprun -D fake_module
diff --git a/testsuite/parseko/cmdline21.stp b/testsuite/parseko/cmdline21.stp
new file mode 100755
index 00000000..d7496c8c
--- /dev/null
+++ b/testsuite/parseko/cmdline21.stp
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# You have to specify ouput FILE with '-S' option
+#
+#-S size[,N]     Switches output file to next file when the size
+#                of file reaches the specified size. The value
+#                should be an integer greater than 1 which is
+#                assumed to be the maximum file size in MB.
+#                When the number of output files reaches N, it
+#                switches to the first output file. You can omit
+#                the second argument.
+#-o FILE         Send output to FILE. This supports strftime(3)
+#                formats for FILE.
+
+staprun -S 1,1 fake_module
diff --git a/testsuite/parseko/utrace01.stp b/testsuite/parseko/utrace01.stp
index 1cb4227f..9f3619b5 100755
--- a/testsuite/parseko/utrace01.stp
+++ b/testsuite/parseko/utrace01.stp
@@ -1,4 +1,4 @@
 #! stap -p2
 
 # process NAME must be a string
-probe process(/bin/cat).death { }
+probe process(/bin/cat).end { }