diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-02-12 20:52:19 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-02-12 20:52:19 +0000 |
| commit | 8756f74004e73ce9276b9ab698f5043f6e7ffcd7 (patch) | |
| tree | 3c3ed67146ff67922a04de255377cc2bb1120b87 | |
| parent | 1b6dd3f1297882f2450942a55189fefaae31071f (diff) | |
| download | glibc-8756f74004e73ce9276b9ab698f5043f6e7ffcd7.tar.gz glibc-8756f74004e73ce9276b9ab698f5043f6e7ffcd7.tar.xz glibc-8756f74004e73ce9276b9ab698f5043f6e7ffcd7.zip | |
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.
| -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 e231408a26..006ca7d12e 100644 --- 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 7341c1f654..db1c6bcc32 100644 --- 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 |