remove \n from end of $$vars/etc. convenience variables

4 files changed, 14 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 9b59e6e5..ffee57ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2008-08-11  Frank Ch. Eigler  <fche@elastic.org>
 
-	PR5049
+	* tapsets.cxx (dwarf_var_expanding...visit_target_symbol):
+	Don't add a \n at the end of $$vars/$$parms/$$locals.
+
+2008-08-11  Frank Ch. Eigler  <fche@elastic.org>
+
 	PR5049
 	* tapsets.cxx (cu_name_matches, collect_srcfiles_matching):
 	Implicitly but optionally prefix probe source filenames with "*/".
diff --git a/tapsets.cxx b/tapsets.cxx
index af9fda52..73a104b4 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -4330,7 +4330,6 @@ dwarf_var_expanding_copy_visitor::visit_target_symbol (target_symbol *e)
 	  }
 	while (dwarf_siblingof (&result, &result) == 0);
 
-      pf->raw_components += "\\n";
       pf->components = print_format::string_to_components(pf->raw_components);
       provide <print_format*> (this, pf);
 
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 83bc8b1d..405dd754 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2008-08-11  Frank Ch. Eigler  <fche@elastic.org>
 
+	* systemtap.base/vars.exp: Adjust to loss of "\n" at end of $$vars
+	et al.
+
+2008-08-11  Frank Ch. Eigler  <fche@elastic.org>
+
 	PR5049
 	* semok/thirtyone.stp: New test.
 
diff --git a/testsuite/systemtap.base/vars.exp b/testsuite/systemtap.base/vars.exp
index 7541c01b..d81baace 100644
--- a/testsuite/systemtap.base/vars.exp
+++ b/testsuite/systemtap.base/vars.exp
@@ -3,7 +3,7 @@
 set test "vars"
 
 # grab C statement that $$vars yields
-set cmd [concat stap -p3 -e {"probe kernel.statement(\"bio_copy_user@fs/bio.c+1\") \{print (\$\$vars)\}"} 2>&1 | grep {"printf.*="} | sed -e {"s/^.*MAXSTRINGLEN, \"//"} -e {s/..\".*$//}]
+set cmd [concat stap -p3 -e {"probe kernel.statement(\"bio_copy_user@fs/bio.c+1\") \{print (\$\$vars)\}"} 2>&1 | grep {"printf.*="} | sed -e {"s/^.*MAXSTRINGLEN, \"//"} -e {s/.\".*$//}]
 catch {eval exec $cmd} vars
 
 # grab C statement that $$parms yields
@@ -23,9 +23,10 @@ if {!$vars_ok} {
 }
 
 # $$vars should be equivalent to $$parms + $$locals
-if {![string equal [string trim $vars] \
-      		   [string trim [concat $parms " " $locals]]]} {
+if {![string equal $vars "$parms $locals"]} {
     fail "$test parms/locals"
+    verbose -log "vars=$vars="
+    verbose -log "rest=$parms $locals="
 } else {
     pass "$test parms/locals"
 }