diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-02-12 22:19:20 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-02-12 22:19:20 +0000 |
| commit | a2c4c1991d11811c054fa7d380d522865741fd86 (patch) | |
| tree | 75f770f9ad66e9edbb04028f2292a4effb446d14 | |
| parent | 8756f74004e73ce9276b9ab698f5043f6e7ffcd7 (diff) | |
| download | glibc-a2c4c1991d11811c054fa7d380d522865741fd86.tar.gz glibc-a2c4c1991d11811c054fa7d380d522865741fd86.tar.xz glibc-a2c4c1991d11811c054fa7d380d522865741fd86.zip | |
Remove indirection in stdio-common tests dependencies.
stdio-common/Makefile has the tests target depend on two test output files indirectly through rules do-tst-unbputc and do-tst-printf. I see no reason for such an indirection, and everywhere else the tests just depend on the output files directly, so this patch removes the indirection. Tested x86_64. * stdio-common/Makefile (do-tst-unbputc): Remove target. (do-tst-printf): Likewise. (tests): Depend directly on $(objpfx)tst-unbputc.out and $(objpfx)tst-printf.out.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | stdio-common/Makefile | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 006ca7d12e..40ff8449b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2014-02-12 Joseph Myers <joseph@codesourcery.com> + * stdio-common/Makefile (do-tst-unbputc): Remove target. + (do-tst-printf): Likewise. + (tests): Depend directly on $(objpfx)tst-unbputc.out and + $(objpfx)tst-printf.out. + * io/ftwtest-sh (testout): Change to $tmp/ftwtest-tmp.out. * Makerules (check-abi-%): Change target to diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 76eccb0f86..fb35f438be 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -64,14 +64,11 @@ test-srcs = tst-unbputc tst-printf include ../Rules ifeq ($(run-built-tests),yes) -.PHONY: do-tst-unbputc do-tst-printf -tests: do-tst-unbputc do-tst-printf +tests: $(objpfx)tst-unbputc.out $(objpfx)tst-printf.out -do-tst-unbputc: $(objpfx)tst-unbputc.out $(objpfx)tst-unbputc.out: tst-unbputc.sh $(objpfx)tst-unbputc $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' -do-tst-printf: $(objpfx)tst-printf.out $(objpfx)tst-printf.out: tst-printf.sh $(objpfx)tst-printf $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' endif |