diff options
author | Joseph Myers <joseph@codesourcery.com> | 2014-03-07 03:29:23 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2014-03-07 03:29:23 +0000 |
commit | 0b20a9e89f5c74119d6da2a5af6c965ac4b18a50 (patch) | |
tree | 18a2b6258cec0112af98921ba3e32ecce17a49c9 /localedata | |
parent | 265d52abcb4181e06cf5a60465b0a9514ecc4be9 (diff) | |
download | glibc-0b20a9e89f5c74119d6da2a5af6c965ac4b18a50.tar.gz glibc-0b20a9e89f5c74119d6da2a5af6c965ac4b18a50.tar.xz glibc-0b20a9e89f5c74119d6da2a5af6c965ac4b18a50.zip |
Make tests consistently use *.out output files.
This patch systematically renames miscellaneous tests so their outputs use a *.out name (unless the test is just running some glibc program with its conventional output file name, rather than a special program at all, as in catgets tests generating *.cat). In the case of the iconv test test-iconvconfig, output is redirected where it wasn't before. In various places the "generated" variable is updated to reflect the revised test names; in iconvdata/Makefile a typo (mmtrace-tst-loading) is also fixed. resolv/Makefile sets both "generate" (which appears unused) and "generated". Bitrot in the settings of these variables could no doubt be fixed so that "make clean" after build and testing leaves results the same as after configure (and indeed the tests-special / xtests-special variables could be used to simplify things, by removing those files automatically rather than listing them manually in these variables), and "make distclean" leaves an empty build directory, but right now it appears various files don't get deleted. I think they are liable to continue to bitrot in the absence of routine testing that these targets actually work, given that building in the source directory isn't supported and that was the main use of such makefile targets. Tested x86_64. * elf/Makefile (tests-special): Rename tests to end with .out. ($(objpfx)noload-mem): Likewise. ($(objpfx)tst-leaks1-mem): Likewise. ($(objpfx)tst-leaks1-static-mem.out): Likewise. * iconv/Makefile (xtests-special): Change test-iconvconfig to $(objpfx)test-iconvconfig.out. (test-iconvconfig): Change to $(objpfx)test-iconvconfig.out. Use set -e inside subshell and redirect output to file. * iconvdata/Makefile (generated): Rename tests to end with .out. Correct type. (tests-special): Rename tests to end with .out. ($(objpfx)mtrace-tst-loading): Likewise. * intl/Makefile (generated): Likewise. (tests-special): Likewise. ($(objpfx)mtrace-tst-gettext): Likewise. * misc/Makefile (generated): Likewise. (tests-special): Likewise. ($(objpfx)tst-error1-mem): Likewise. * nptl/Makefile (tests-special): Likewise. ($(objpfx)tst-stack3-mem): Likewise. (generated): Likewise. * posix/Makefile (generated): Likewise. (tests-special): Likewise. (xtests-special): Likewise. ($(objpfx)tst-fnmatch-mem): Likewise. ($(objpfx)bug-regex2-mem): Likewise. ($(objpfx)bug-regex14-mem): Likewise. ($(objpfx)bug-regex21-mem): Likewise. ($(objpfx)bug-regex31-mem): Likewise. ($(objpfx)tst-vfork3-mem): Likewise. ($(objpfx)tst-rxspencer-no-utf8-mem): Likewise. ($(objpfx)tst-pcre-mem): Likewise. ($(objpfx)tst-boost-mem): Likewise. ($(objpfx)bug-ga2-mem): Likewise. ($(objpfx)bug-glob2-mem): Likewise. * resolv/Makefile (generate): Likewise. (tests-special): Likewise. (xtests-special): Likewise. (generated): Likewise. ($(objpfx)mtrace-tst-leaks): Likewise. ($(objpfx)mtrace-tst-leaks2): Likewise. localedata: * Makefile (generated): Rename tests to end with .out. (tests-special): Likewise. ($(objpfx)mtrace-tst-leaks): Likewise.
Diffstat (limited to 'localedata')
-rw-r--r-- | localedata/ChangeLog | 6 | ||||
-rw-r--r-- | localedata/Makefile | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 2ca1abeda6..4e34fc5b99 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,9 @@ +2014-03-07 Joseph Myers <joseph@codesourcery.com> + + * Makefile (generated): Rename tests to end with .out. + (tests-special): Likewise. + ($(objpfx)mtrace-tst-leaks): Likewise. + 2014-03-06 Joseph Myers <joseph@codesourcery.com> * Makefile (tests): Change dependencies to .... diff --git a/localedata/Makefile b/localedata/Makefile index 5f01b61139..e9c0894b82 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -52,7 +52,7 @@ fmon-tests = n01y12 n02n40 n10y31 n11y41 n12y11 n20n32 n30y20 n41n00 \ y01y10 y02n22 y22n42 y30y21 y32n31 y40y00 y42n21 generated += $(test-input) $(test-output) sort-test.out tst-locale.out \ - tst-mbswcs.out tst-leaks.mtrace mtrace-tst-leaks + tst-mbswcs.out tst-leaks.mtrace mtrace-tst-leaks.out generated-dirs += $(ld-test-names) tt_TT de_DE.437 \ $(addprefix tstfmon_,$(fmon-tests)) \ @@ -79,7 +79,7 @@ tests-static = bug-setlocale1-static tests += $(tests-static) ifeq (yes,$(build-shared)) ifneq (no,$(PERL)) -tests-special += $(objpfx)mtrace-tst-leaks +tests-special += $(objpfx)mtrace-tst-leaks.out endif endif endif @@ -292,7 +292,7 @@ tst-sscanf-ENV = LOCPATH=$(common-objpfx)localedata tst-leaks-ENV = MALLOC_TRACE=$(objpfx)tst-leaks.mtrace \ LOCPATH=$(common-objpfx)localedata -$(objpfx)mtrace-tst-leaks: $(objpfx)tst-leaks.out +$(objpfx)mtrace-tst-leaks.out: $(objpfx)tst-leaks.out $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@; \ $(evaluate-test) |