2007-08-14 David Smith <dsmith@redhat.com>

	Merge from setuid-branch.
	* configure.ac: Version increase to 0.6.
	* configure: Regenerated.

	* parseko/cmdline09.stp: Added new test for staprun command line
	options.
	* parseko/cmdline10.stp: Ditto.
	* parseko/cmdline11.stp: Ditto.
	* parseko/cmdline12.stp: Ditto.
	* parseko/cmdline13.stp: Ditto.
	* parseko/cmdline14.stp: Ditto.

	* systemtap.samples/args.exp: No longer necessary to use "sudo" to
	run staprun.

6 files changed, 52 insertions, 0 deletions

diff --git a/testsuite/parseko/cmdline09.stp b/testsuite/parseko/cmdline09.stp
new file mode 100755
index 00000000..eef900aa
--- /dev/null
+++ b/testsuite/parseko/cmdline09.stp
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# A module name can't have more than 60 chars (stap truncates the
+# module name before creating the kernel module but staprun can't
+# truncate an existing module name).
+staprun stap_123456789012345678901234567890123456789012345678901234567890
diff --git a/testsuite/parseko/cmdline10.stp b/testsuite/parseko/cmdline10.stp
new file mode 100755
index 00000000..eb2ec0ed
--- /dev/null
+++ b/testsuite/parseko/cmdline10.stp
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# 
+# -b buffer size  The systemtap module specifies a buffer size.
+#                 Setting one here will override that value.  The
+#                 value should be an integer between 1 and 64
+#                 which be assumed to be the buffer size in MB.
+#                 That value will be per-cpu in bulk mode.
+
+staprun -b 0 fake_module
diff --git a/testsuite/parseko/cmdline11.stp b/testsuite/parseko/cmdline11.stp
new file mode 100755
index 00000000..6b3e426a
--- /dev/null
+++ b/testsuite/parseko/cmdline11.stp
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# options '-L' and '-A' are mutually exclusive
+#
+# -L              Load module and start probes, then detach.
+# -A              Attach to loaded systemtap module.
+
+staprun -L -A fake_module
diff --git a/testsuite/parseko/cmdline12.stp b/testsuite/parseko/cmdline12.stp
new file mode 100755
index 00000000..1797fe54
--- /dev/null
+++ b/testsuite/parseko/cmdline12.stp
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# options '-A' and '-b size' are mutually exclusive (since the buffer
+# size option only has an effect when the module is inserted)
+#
+# -A              Attach to loaded systemtap module.
+# -b buffer size  The systemtap module specifies a buffer size.
+#                 Setting one here will override that value.  The
+#                 value should be an integer between 1 and 64
+#                 which be assumed to be the buffer size in MB.
+#                 That value will be per-cpu in bulk mode.
+staprun -A -b 2 fake_module
diff --git a/testsuite/parseko/cmdline13.stp b/testsuite/parseko/cmdline13.stp
new file mode 100755
index 00000000..28decbc8
--- /dev/null
+++ b/testsuite/parseko/cmdline13.stp
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# options '-A' and '-c cmd' are mutually exclusive
+#
+# -A              Attach to loaded systemtap module.
+# -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 -A -c bash fake_module
diff --git a/testsuite/parseko/cmdline14.stp b/testsuite/parseko/cmdline14.stp
new file mode 100755
index 00000000..a563d107
--- /dev/null
+++ b/testsuite/parseko/cmdline14.stp
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# options '-A' and '-x pid' are mutually exclusive
+#
+# -A              Attach to loaded systemtap module.
+# -x pid          Sets the '_stp_target' variable to pid.
+staprun -A -x 100 fake_module