Stop io/ftwtest deleting its own output.

If you rerun "make check" in a tree where some tests have already been
run, it will rerun io/ftwtest-sh because that test uses ftwtest.out,
the same name to which output is redirected, as its internal temporary
file, and then removes it on exit.

Clearly tests should not be removing the files to which their output
is redirected like that.  This patch changes the script to use a
different file as its internal temporary file, so the actual output
referenced in the makefile isn't removed.

Tested x86_64.

	* io/ftwtest-sh (testout): Change to $tmp/ftwtest-tmp.out.

diff --git a/ChangeLog b/ChangeLog
index e231408a264b8e1230171a41e0c14994abd6461e..006ca7d12e5f3adb2b5d264ac0d23a942d90ec50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-02-12  Joseph Myers  <joseph@codesourcery.com>
 
+       * io/ftwtest-sh (testout): Change to $tmp/ftwtest-tmp.out.
+
        * Makerules (check-abi-%): Change target to
        $(objpfx)check-abi-%.out.
        (check-abi target): Update dependencies.

diff --git a/io/ftwtest-sh b/io/ftwtest-sh
index 7341c1f65480e55af59757e0a6a912370bbdffa5..db1c6bcc321d5f69ca39971bec8b32e876af3f7b 100644 (file)
--- a/io/ftwtest-sh
+++ b/io/ftwtest-sh
@@ -69,7 +69,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=$tmp/ftwtest.out
+testout=$tmp/ftwtest-tmp.out
 
 $testprogram $tmpdir |
     sort > $testout