diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-08-11 17:35:12 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-08-11 17:35:12 -0400 |
| commit | d6ef1e94a52b667876293ff3de84097dcbd46f7c (patch) | |
| tree | e64c95384f0295277b980a1b5fcd62afa15c3065 | |
| parent | 42e740602dbb7960e11b0bbf9053e95e8a1cb1e5 (diff) | |
| parent | addec0c02cb433c727f46d8ea78379d62051309c (diff) | |
| download | systemtap-steved-d6ef1e94a52b667876293ff3de84097dcbd46f7c.tar.gz systemtap-steved-d6ef1e94a52b667876293ff3de84097dcbd46f7c.tar.xz systemtap-steved-d6ef1e94a52b667876293ff3de84097dcbd46f7c.zip | |
Merge commit 'origin/master' into pr4225
* commit 'origin/master':
remove \n from end of $$vars/etc. convenience variables
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | tapsets.cxx | 1 | ||||
| -rw-r--r-- | testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuite/systemtap.base/vars.exp | 7 |
4 files changed, 14 insertions, 4 deletions
@@ -1,5 +1,10 @@ 2008-08-11 Frank Ch. Eigler <fche@elastic.org> + * 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 a321b4e8..5fbbb053 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -4379,7 +4379,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" } |