Merge branch 'master' into unwind

* master:
  Revert "Just a test commit"
  Just a test commit
  bump autoconf* version numbers to 0.7
  replace mentions of CVS with GIT in docuemntation files
  2008-03-27  Frank Ch. Eigler  <fche@elastic.org>
  2008-03-27  Frank Ch. Eigler  <fche@elastic.org>
  2008-03-26  Frank Ch. Eigler  <fche@elastic.org>
  Revert "dummy commit"
  dummy commit

4 files changed, 22 insertions, 12 deletions

diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index a54e80bd..da789127 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-31  Frank Ch. Eigler  <fche@elastic.org>
+
+	* configure.ac: Bump version to 0.7.
+	* configure: Regenerated.
+
+2008-03-27  Frank Ch. Eigler  <fche@elastic.org>
+
+	* systemtap.base/cmd_parse.exp: Don't assume $SHELL=bash.
+
 2008-03-23  Frank Ch. Eigler  <fche@elastic.org>
 
 	* lib/stap_run.exp (stap_run): Ignore missing debuginfo warnings.
diff --git a/testsuite/configure b/testsuite/configure
index bafa86d8..bd8237cb 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.6.2.
+# Generated by GNU Autoconf 2.61 for systemtap 0.7.
 #
 # 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.6.2'
-PACKAGE_STRING='systemtap 0.6.2'
+PACKAGE_VERSION='0.7'
+PACKAGE_STRING='systemtap 0.7'
 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.6.2 to adapt to many kinds of systems.
+\`configure' configures systemtap 0.7 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.6.2:";;
+     short | recursive ) echo "Configuration of systemtap 0.7:";;
    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.6.2
+systemtap configure 0.7
 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.6.2, which was
+It was created by systemtap $as_me 0.7, 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.6.2'
+ VERSION='0.7'
 
 
 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.6.2, which was
+This file was extended by systemtap $as_me 0.7, 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.6.2
+systemtap config.status 0.7
 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 8f924936..70d01e96 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.6.2, systemtap@sources.redhat.com, systemtap)
+AC_INIT([systemtap], 0.7, systemtap@sources.redhat.com, systemtap)
 
 AC_PREREQ(2.59)
 AC_CONFIG_AUX_DIR(..)
diff --git a/testsuite/systemtap.base/cmd_parse.exp b/testsuite/systemtap.base/cmd_parse.exp
index cf15698f..ff347a9d 100644
--- a/testsuite/systemtap.base/cmd_parse.exp
+++ b/testsuite/systemtap.base/cmd_parse.exp
@@ -56,7 +56,8 @@ expect {
 wait
 
 #stap -c '(((a=42+7)); echo "The answer is $a")' -e 'probe begin {}'
-spawn stap -c {(((a=42+7)); echo "The answer is $a")} -e {probe begin {}}
+# NB: not  ((a=42+7)) - must not assume bash
+spawn stap -c {(a=49; echo "The answer is $a")} -e {probe begin {}}
 expect {
     -timeout 60
     "The answer is 49" {pass "cmd_parse6"}