diff options
| -rw-r--r-- | testsuite/ChangeLog | 17 | ||||
| -rwxr-xr-x | testsuite/configure | 20 | ||||
| -rw-r--r-- | testsuite/configure.ac | 2 | ||||
| -rwxr-xr-x | testsuite/parseko/cmdline09.stp | 6 | ||||
| -rwxr-xr-x | testsuite/parseko/cmdline10.stp | 10 | ||||
| -rwxr-xr-x | testsuite/parseko/cmdline11.stp | 8 | ||||
| -rwxr-xr-x | testsuite/parseko/cmdline12.stp | 12 | ||||
| -rwxr-xr-x | testsuite/parseko/cmdline13.stp | 9 | ||||
| -rwxr-xr-x | testsuite/parseko/cmdline14.stp | 7 | ||||
| -rw-r--r-- | testsuite/systemtap.samples/args.exp | 4 |
10 files changed, 82 insertions, 13 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index ee107c22..f92024d9 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,20 @@ +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. + 2007-08-07 Frank Ch. Eigler <fche@redhat.com> PR 4846 diff --git a/testsuite/configure b/testsuite/configure index 0b0054ef..e50dc588 100755 --- a/testsuite/configure +++ b/testsuite/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for systemtap 0.5.15. +# Generated by GNU Autoconf 2.61 for systemtap 0.6. # # Report bugs to <systemtap@sources.redhat.com>. # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='systemtap' PACKAGE_TARNAME='systemtap' -PACKAGE_VERSION='0.5.15' -PACKAGE_STRING='systemtap 0.5.15' +PACKAGE_VERSION='0.6' +PACKAGE_STRING='systemtap 0.6' PACKAGE_BUGREPORT='systemtap@sources.redhat.com' ac_subst_vars='SHELL @@ -1148,7 +1148,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures systemtap 0.5.15 to adapt to many kinds of systems. +\`configure' configures systemtap 0.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1214,7 +1214,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of systemtap 0.5.15:";; + short | recursive ) echo "Configuration of systemtap 0.6:";; esac cat <<\_ACEOF @@ -1285,7 +1285,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -systemtap configure 0.5.15 +systemtap configure 0.6 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1299,7 +1299,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by systemtap $as_me 0.5.15, which was +It was created by systemtap $as_me 0.6, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1991,7 +1991,7 @@ fi # Define the identity of the package. PACKAGE='systemtap' - VERSION='0.5.15' + VERSION='0.6' cat >>confdefs.h <<_ACEOF @@ -2595,7 +2595,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by systemtap $as_me 0.5.15, which was +This file was extended by systemtap $as_me 0.6, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2638,7 +2638,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -systemtap config.status 0.5.15 +systemtap config.status 0.6 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/testsuite/configure.ac b/testsuite/configure.ac index b85ea8f3..18e85559 100644 --- a/testsuite/configure.ac +++ b/testsuite/configure.ac @@ -1,7 +1,7 @@ dnl configure.ac --- autoconf input file for systemtap testsuite dnl Process this file with autoconf to produce a configure script. -AC_INIT([systemtap], 0.5.15, systemtap@sources.redhat.com, systemtap) +AC_INIT([systemtap], 0.6, systemtap@sources.redhat.com, systemtap) AC_PREREQ(2.59) AC_CONFIG_AUX_DIR(..) 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 diff --git a/testsuite/systemtap.samples/args.exp b/testsuite/systemtap.samples/args.exp index e7c886c5..f6d5cec6 100644 --- a/testsuite/systemtap.samples/args.exp +++ b/testsuite/systemtap.samples/args.exp @@ -47,7 +47,7 @@ if [file exists $modpath] { return } -spawn sudo $staprunpath -d [pid] $modpath foo=hello bar=999 +spawn $staprunpath -d [pid] $modpath foo=hello bar=999 set ok 0 expect { -timeout 120 @@ -62,7 +62,7 @@ if {$ok == 1} { fail "$test run 1" } -spawn sudo $staprunpath -d [pid] $modpath foo=goodbye bar=0 +spawn $staprunpath -d [pid] $modpath foo=goodbye bar=0 set ok 0 expect { -timeout 120 |