From: Florian Krohm <florian@eich-krohm.de>
Date: Mon, 20 Oct 2014 20:59:13 +0000 (+0000)
Subject: Fix some testcases which implicitly assumed that TMPDIR was either
X-Git-Tag: svn/VALGRIND_3_11_0~905
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79c843e68883655ebe61054f4275016c03fa96fe;p=thirdparty%2Fvalgrind.git

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 83d089c360..f60f7c84ac 100644
--- 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 cb80d84e63..891c5b7efa 100644
--- 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 990f056fbc..4832190a67 100644
--- 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 a301000137..59852668ee 100755
--- 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]/'