From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 19 Oct 2012 20:01:45 +0000 (+0000)
Subject: Use working directory, not /tmp, in io/ftwtest-sh.
X-Git-Tag: glibc-2.17~389
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d528cdcfdef2f0eb3932749aa9894db7c18101f4;p=thirdparty%2Fglibc.git

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

diff --git a/ChangeLog b/ChangeLog
index be21718f9b4..8ff8a77c9d8 100644
--- 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 1822ea7fcd3..93b2e669fbb 100644
--- 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