diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | io/ftwtest-sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 905c413715..d0dd89d5a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2012-10-24 Joseph Myers <joseph@codesourcery.com> + * io/ftwtest-sh (tmp): Define to ${objpfx}io, not using `pwd`. + * posix/globtest.sh (TMPDIR): Do not set. (testdir): Define using ${common_objpfx}posix not $TMPDIR. (testout): Likewise. diff --git a/io/ftwtest-sh b/io/ftwtest-sh index adc66678d2..3bbf3061ef 100644 --- a/io/ftwtest-sh +++ b/io/ftwtest-sh @@ -44,7 +44,7 @@ LANG=C export LANG # First create our scenario: -tmp=`pwd | sed 's|\(.\)/*$|\1|'` +tmp=${objpfx}io tmpdir=$tmp/ftwtest.d trap 'chmod -fR a+x $tmpdir; rm -fr $tmpdir $testout' 1 2 3 15 |