Fix some testcases which implicitly assumed that TMPDIR was either

not set or set to /tmp   This is not always true. Fixes BZ 340115.
Patch by rhyskidd@gmail.com.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14643

diff --git a/NEWS b/NEWS
index 83d089c360a9b2ed0d7b44dcb25d3bb4492274c0..f60f7c84ac41a9ecf2dbd52393a8f91dedcfc229 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -46,6 +46,7 @@ where XXXXXX is the bug number as listed below.
 339853 arm64 times syscall unknown
 339855 arm64 unhandled getsid/setsid syscalls
 339858 arm64 dmb sy not implemented
+340115 Fix none/tests/cmdline[1|2] tests on systems which define TMPDIR
 n-i-bz Old STABS code is still being compiled, but never used. Remove it.
 n-i-bz Fix compilation on distros with glibc < 2.5
 

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index cb80d84e63692043e625a6b92346b50d1e5f6c7f..891c5b7efa617651e6959da57fcfd189816b6ef2 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -89,7 +89,7 @@ usage: valgrind [options] prog-and-args
                               DRD) [no]
     --vgdb-poll=<number>      gdbserver poll max every <number> basic blocks [5000] 
     --vgdb-shadow-registers=no|yes   let gdb see the shadow registers [no]
-    --vgdb-prefix=<prefix>    prefix for vgdb FIFOs [/tmp/vgdb-pipe]
+    --vgdb-prefix=<prefix>    prefix for vgdb FIFOs [.../vgdb-pipe]
     --run-libc-freeres=no|yes free up glibc memory at exit on Linux? [yes]
     --sim-hints=hint1,hint2,...  activate unusual sim behaviours [none] 
          where hint is one of:

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index 990f056fbcdcbb2e97d1dc6cf3d771e3ec10ec04..4832190a6725ca446ebc2e26ba9c35d02e1425c0 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -89,7 +89,7 @@ usage: valgrind [options] prog-and-args
                               DRD) [no]
     --vgdb-poll=<number>      gdbserver poll max every <number> basic blocks [5000] 
     --vgdb-shadow-registers=no|yes   let gdb see the shadow registers [no]
-    --vgdb-prefix=<prefix>    prefix for vgdb FIFOs [/tmp/vgdb-pipe]
+    --vgdb-prefix=<prefix>    prefix for vgdb FIFOs [.../vgdb-pipe]
     --run-libc-freeres=no|yes free up glibc memory at exit on Linux? [yes]
     --sim-hints=hint1,hint2,...  activate unusual sim behaviours [none] 
          where hint is one of:

diff --git a/none/tests/filter_cmdline1 b/none/tests/filter_cmdline1
index a301000137b734081eb157bcaa775a829391ffc5..59852668eeb16878e086fcbffd3830b9b679fbf0 100755 (executable)
--- a/none/tests/filter_cmdline1
+++ b/none/tests/filter_cmdline1
@@ -1,5 +1,6 @@
 #! /bin/sh
 
 sed -e 's/\(set minimum alignment of heap allocations\) \[[0-9]*\]/\1 [...]/' \
-    -e 's/\(command to start debugger\) \[.* -nw %f %p\]/\1 [... -nw %f %p]/'
+    -e 's/\(command to start debugger\) \[.* -nw %f %p\]/\1 [... -nw %f %p]/' \
+    -e 's/\(prefix for vgdb FIFOs\) \[.*\/vgdb-pipe\]/\1 [...\/vgdb-pipe]/'