Merge commit 'origin/master' into pr4225

* commit 'origin/master':
  Use relative instead of absolute line. (bug 6611)
  move post-0.7 news tidbit to the top
  Add test for $$vars, $$params, $$locals.
  typographical tweaks for embedded script code
  Add $$vars, $$parms, $$locals
  Rename $path to $pathname of syscall tapset for 2.6.27
  Correct several tests for 2.6.27
  c code generation: assert C indentation/nesting cancels out at appropriate points
  Tweak test_installcheck for helloworld.meta and traceio2.meta.
  Run both tests for installcheck tests.
  No need for random suffix file cmdline and sysinfo files in the
  Ensure that a systemtap server is available if 'server' is specified
  session.h (struct systemtap_session): Added itrace_derived_probe
  * syscalls2.stp: Add sys_unlinkat.
  Fix on_each_cpu() call for kernels >2.6.26.
  Remove unused STAPCONF_MODULE_NSECTIONS

2 files changed, 33 insertions, 1 deletions

diff --git a/testsuite/systemtap.base/vars.exp b/testsuite/systemtap.base/vars.exp
new file mode 100644
index 00000000..7541c01b
--- /dev/null
+++ b/testsuite/systemtap.base/vars.exp
@@ -0,0 +1,32 @@
+# Script for testing $$vars, $$parms, $$locals
+    
+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/..\".*$//}]
+catch {eval exec $cmd} vars
+
+# grab C statement that $$parms yields
+set cmd [regsub "vars" $cmd "parms"]
+catch {eval exec $cmd} parms
+
+# grab C statement that $$locals yields
+set cmd [regsub "parms" $cmd "locals"]
+catch {eval exec $cmd} locals
+
+# syntax check of $$vars C statement
+set vars_ok [regexp "(\[a-z_\]+=%#llx *)+" $vars]
+if {!$vars_ok} {
+    fail "$test"
+} else {
+    pass "$test"
+}
+
+# $$vars should be equivalent to $$parms + $$locals
+if {![string equal [string trim $vars] \
+      		   [string trim [concat $parms " " $locals]]]} {
+    fail "$test parms/locals"
+} else {
+    pass "$test parms/locals"
+}
+
diff --git a/testsuite/systemtap.base/warnings.stp b/testsuite/systemtap.base/warnings.stp
index 94ed57b3..d71b3034 100644
--- a/testsuite/systemtap.base/warnings.stp
+++ b/testsuite/systemtap.base/warnings.stp
@@ -9,7 +9,7 @@ probe never { print(elide+me1) bar () }
 
 # PR 6611
 
-probe probea = kernel.statement("bio_init@fs/bio.c:135")
+probe probea = kernel.statement("bio_init@fs/bio.c+3")
                { printf("%d", funca(2)); elide_me6="foo" }
 probe probea { printf("%d", funcb(2,3)); printf("%s",var) }