Use working directory, not /tmp, in io/ftwtest-sh.

diff --git a/ChangeLog b/ChangeLog
index be21718f9b4865248eb8b7992a7bdfbb55b2da1b..8ff8a77c9d8610efe999b541a5f0007928747bf5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-10-19  Joseph Myers  <joseph@codesourcery.com>
 
+       [BZ #13888]
+       * io/ftwtest-sh (tmp): Set to use the working directory, not /tmp
+       or TMPDIR.
+       (testout): Likewise.
+
        * posix/Makefile ($(objpfx)tst-getconf.out): Pass
        $(built-program-cmd) to tst-getconf.sh, not $(elf-objpfx) and
        $(rtld-installed-name).

diff --git a/io/ftwtest-sh b/io/ftwtest-sh
index 1822ea7fcd318a78fa6401755958f5354ff4634a..93b2e669fbb20d9dadcda5b4e47de383047cee61 100644 (file)
--- a/io/ftwtest-sh
+++ b/io/ftwtest-sh
@@ -44,7 +44,7 @@ LANG=C
 export LANG
 
 # First create our scenario:
-tmp=`echo ${TMPDIR:-/tmp} | sed 's|\(.\)/*$|\1|'`
+tmp=`pwd | sed 's|\(.\)/*$|\1|'`
 tmpdir=$tmp/ftwtest.d
 
 [ -f ${objpfx}elf/ld.so ] && ldso=${objpfx}elf/ld.so
@@ -71,7 +71,7 @@ ln -s $tmpdir/foo/lvl1/lvl2/lvl3/lvl4 $tmpdir/foo/lvl1/link@1
 echo > $tmpdir/bar/xo
 chmod a-x,a+r $tmpdir/bar
 
-testout=${TMPDIR:-/tmp}/ftwtest.out
+testout=$tmp/ftwtest.out
 
 LD_LIBRARY_PATH=$objpfx $ldso $testprogram $tmpdir |
     sort > $testout