Merge commit 'origin/master' into pr6429-comp-unwindsyms

* commit 'origin/master':
  Fix assignment optimization expected results.
  PR6538: more testsuite tweaks for read-only warnings
  PR6538: more tapset fixes
  PR6538: explain why absentstats.stp logs will contain warnings
  PR6538: fix treatment of initialized globals
  Use pointer_arg to fetch arguments for syscall.utime and compat_utime.
  Optimize compound and binary expression assignments.
  Check new (sub) functions of _struct_utimbuf_* and _struct_compat_utimbuf_*.
  PR6538: tapset changes
  PR6538: testsuite changes
  PR5001: fix test suite collateral damage
  PR6538: warn about read-only variables
  Add some scripts and descriptions to the systemtap.examples.
  PR5001: Remove _stp_ctime and always use ctime.
  Use tr1/unordered_map instead of the deprecated ext/hash_map.
  PR6524: ctime() on bad values hangs system.
  Optimize away assignments in other contexts.
  Optimize away assignments in other contexts.
  dummy commit for testing systemtap-cvs notification
  Remove sa_restorer initialization.

1 files changed, 2 insertions, 2 deletions

diff --git a/testsuite/buildok/socket.stp b/testsuite/buildok/socket.stp
index 4b9142a9..5ada4018 100755
--- a/testsuite/buildok/socket.stp
+++ b/testsuite/buildok/socket.stp
@@ -1,4 +1,4 @@
-#! stap -p4
+#! stap -wp4
 
 probe socket.send, socket.receive,
       socket.sendmsg, socket.sendmsg.return,
@@ -33,7 +33,7 @@ probe socket.send, socket.receive,
 	typ = sock_type_str2num(tstr)
 	log(sprintf("%d, %d, %s", type, typ, tstr))
 
-	log(sprintf("%d", success))
+	log(sprintf("%d", success))  # -w since success is not universally defined
 }