diff options
author | Joseph Myers <joseph@codesourcery.com> | 2014-02-21 21:48:08 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2014-02-21 21:48:08 +0000 |
commit | f0881698bf244bcb16c394d2d6258d975a11baef (patch) | |
tree | 1476337c5c42a7e623ffbfbcf0914d52fff2bd0d /posix/Makefile | |
parent | acd7f096d79c181866d56d4aaf3b043e741f1e2c (diff) | |
download | glibc-f0881698bf244bcb16c394d2d6258d975a11baef.zip glibc-f0881698bf244bcb16c394d2d6258d975a11baef.tar.gz glibc-f0881698bf244bcb16c394d2d6258d975a11baef.tar.bz2 |
Generate .test-result files for tests with special rules.
This patch, an updated version of
<https://sourceware.org/ml/libc-alpha/2014-01/msg00194.html> now
proposed for inclusion in glibc, extends the generation of PASS and
FAIL status in .test-result files for individual tests to cover tests
with their own custom makefile rules. This is just adding
$(evaluate-test) calls to all such rules, since tests with multiple
commands were previously split into separate tests.
Note that the tests the makefiles expect to fail (posix/annexc and
conformtest) currently get FAIL listed in the .test-result file,
rather than XFAIL; a subsequent patch will introduce a better XFAIL
mechanism.
Tested x86_64.
* Makefile ($(objpfx)c++-types-check.out): Use $(evaluate-test).
($(objpfx)check-local-headers.out): Likewise.
($(objpfx)begin-end-check.out): Likewise.
* Makerules (check-abi-%.out): Likewise.
* catgets/Makefile ($(objpfx)test1.cat): Likewise.
($(objpfx)test2.cat): Likewise.
($(objpfx)de/libc.cat): Likewise.
($(objpfx)test-gencat.out): Likewise.
* conform/Makefile ($(objpfx)run-conformtest.out): Likewise.
* elf/Makefile ($(objpfx)order-cmp.out): Likewise.
($(objpfx)noload-mem): Likewise.
($(objpfx)tst-pathopt.out): Likewise.
($(objpfx)tst-rtld-load-self.out): Likewise.
($(objpfx)tst-array1-cmp.out): Likewise.
($(objpfx)tst-array1-static-cmp.out): Likewise.
($(objpfx)tst-array2-cmp.out): Likewise.
($(objpfx)tst-array3-cmp.out): Likewise.
($(objpfx)tst-array4-cmp.out): Likewise.
($(objpfx)tst-array5-cmp.out): Likewise.
($(objpfx)tst-array5-static-cmp.out): Likewise.
($(objpfx)check-textrel.out): Likewise.
($(objpfx)check-execstack.out): Likewise.
($(objpfx)check-localplt.out): Likewise.
($(objpfx)order2-cmp.out): Likewise.
($(objpfx)tst-leaks1-mem): Likewise.
($(objpfx)tst-leaks1-static-mem): Likewise.
($(objpfx)tst-initorder-cmp.out): Likewise.
($(objpfx)tst-initorder2-cmp.out): Likewise.
($(objpfx)tst-unused-dep.out): Likewise.
($(objpfx)tst-unused-dep-cmp.out): Likewise.
* grp/Makefile ($(objpfx)tst_fgetgrent.out): Likewise.
* iconv/Makefile (test-iconvconfig): Likewise.
* iconvdata/Makefile ($(objpfx)mtrace-tst-loading): Likewise.
($(objpfx)iconv-test.out): Likewise.
($(objpfx)tst-tables.out): Likewise.
* intl/Makefile ($(objpfx)mtrace-tst-gettext): Likewise.
($(objpfx)tst-gettext.out): Likewise.
($(objpfx)tst-translit.out): Likewise.
($(objpfx)tst-gettext2.out): Likewise.
($(objpfx)tst-gettext4.out): Likewise.
($(objpfx)tst-gettext6.out): Likewise.
* io/Makefile ($(objpfx)ftwtest.out): Likewise.
* libio/Makefile ($(objpfx)test-freopen.out): Likewise.
($(objpfx)tst-fopenloc-cmp.out): Likewise.
($(objpfx)tst-fopenloc-mem.out): Likewise.
* malloc/Makefile ($(objpfx)tst-mtrace.out): Likewise.
* misc/Makefile ($(objpfx)tst-error1-mem): Likewise.
* posix/Makefile ($(objpfx)globtest.out): Likewise.
($(objpfx)wordexp-tst.out): Likewise.
($(objpfx)annexc.out): 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)tst-getconf.out): Likewise.
($(objpfx)bug-ga2-mem): Likewise.
($(objpfx)bug-glob2-mem): Likewise.
* resolv/Makefile ($(objpfx)mtrace-tst-leaks): Likewise.
($(objpfx)mtrace-tst-leaks2): Likewise.
* stdio-common/Makefile ($(objpfx)tst-unbputc.out): Likewise.
($(objpfx)tst-printf.out): Likewise.
($(objpfx)tst-setvbuf1.out): Likewise.
($(objpfx)tst-setvbuf1-cmp.out): Likewise.
* stdlib/Makefile ($(objpfx)isomac.out): Likewise.
($(objpfx)tst-fmtmsg.out): Likewise.
* string/Makefile ($(objpfx)tst-svc-cmp.out): Likewise.
* sysdeps/x86/Makefile ($(objpfx)tst-xmmymm.out): Likewise.
localedata:
* Makefile ($(objpfx)sort-test.out): Use $(evaluate-test).
($(objpfx)tst-fmon.out): Likewise.
($(objpfx)tst-numeric.out): Likewise.
($(objpfx)tst-locale.out): Likewise.
($(objpfx)tst-rpmatch.out): Likewise.
($(objpfx)tst-trans.out): Likewise.
($(objpfx)tst-mbswcs.out): Likewise.
($(objpfx)tst-ctype.out): Likewise.
($(objpfx)tst-wctype.out): Likewise.
($(objpfx)tst-langinfo.out): Likewise.
($(objpfx)mtrace-tst-leaks): Likewise.
nptl:
* Makefile ($(objpfx)tst-stack3-mem): Use $(evaluate-test).
($(objpfx)tst-tls6.out): Likewise.
($(objpfx)tst-cleanup0.out): Likewise.
($(objpfx)tst-cleanup0-cmp.out): Likewise.
($(objpfx)tst-cancel-wrappers.out): Likewise.
($(objpfx)tst-oddstacklimit.out): Likewise.
nptl_db:
* Makefile ($(objpfx)db-symbols.out): Use
$(evaluate-test).
Diffstat (limited to 'posix/Makefile')
-rw-r--r-- | posix/Makefile | 46 |
1 files changed, 31 insertions, 15 deletions
diff --git a/posix/Makefile b/posix/Makefile index 2c9868e..ea06d39 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -121,9 +121,11 @@ ifeq (yes,$(build-shared)) tests: $(objpfx)globtest.out $(objpfx)wordexp-tst.out $(objpfx)globtest.out: globtest.sh $(objpfx)globtest $(SHELL) $< $(common-objpfx) '$(test-via-rtld-prefix)' \ - '$(test-program-prefix)' '$(test-wrapper-env)' + '$(test-program-prefix)' '$(test-wrapper-env)'; \ + $(evaluate-test) $(objpfx)wordexp-tst.out: wordexp-tst.sh $(objpfx)wordexp-test - $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' + $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \ + $(evaluate-test) endif endif @@ -233,7 +235,8 @@ endif $(objpfx)annexc.out: $(objpfx)annexc -$(dir $<)$(notdir $<) '$(CC)' \ - '$(patsubst %,-I../%,$(sorted-subdirs)) -I../include $(+sysdep-includes) $(sysincludes) -I..' > $@ + '$(patsubst %,-I../%,$(sorted-subdirs)) -I../include $(+sysdep-includes) $(sysincludes) -I..' > $@; \ + $(evaluate-test) annexc-CFLAGS = -O $(objpfx)annexc: annexc.c @@ -242,60 +245,73 @@ $(objpfx)annexc: annexc.c tst-fnmatch-ENV += MALLOC_TRACE=$(objpfx)tst-fnmatch.mtrace $(objpfx)tst-fnmatch-mem: $(objpfx)tst-fnmatch.out - $(common-objpfx)malloc/mtrace $(objpfx)tst-fnmatch.mtrace > $@ + $(common-objpfx)malloc/mtrace $(objpfx)tst-fnmatch.mtrace > $@; \ + $(evaluate-test) bug-regex2-ENV = MALLOC_TRACE=$(objpfx)bug-regex2.mtrace $(objpfx)bug-regex2-mem: $(objpfx)bug-regex2.out - $(common-objpfx)malloc/mtrace $(objpfx)bug-regex2.mtrace > $@ + $(common-objpfx)malloc/mtrace $(objpfx)bug-regex2.mtrace > $@; \ + $(evaluate-test) bug-regex14-ENV = MALLOC_TRACE=$(objpfx)bug-regex14.mtrace $(objpfx)bug-regex14-mem: $(objpfx)bug-regex14.out - $(common-objpfx)malloc/mtrace $(objpfx)bug-regex14.mtrace > $@ + $(common-objpfx)malloc/mtrace $(objpfx)bug-regex14.mtrace > $@; \ + $(evaluate-test) bug-regex21-ENV = MALLOC_TRACE=$(objpfx)bug-regex21.mtrace $(objpfx)bug-regex21-mem: $(objpfx)bug-regex21.out - $(common-objpfx)malloc/mtrace $(objpfx)bug-regex21.mtrace > $@ + $(common-objpfx)malloc/mtrace $(objpfx)bug-regex21.mtrace > $@; \ + $(evaluate-test) bug-regex31-ENV = MALLOC_TRACE=$(objpfx)bug-regex31.mtrace $(objpfx)bug-regex31-mem: $(objpfx)bug-regex31.out - $(common-objpfx)malloc/mtrace $(objpfx)bug-regex31.mtrace > $@ + $(common-objpfx)malloc/mtrace $(objpfx)bug-regex31.mtrace > $@; \ + $(evaluate-test) tst-vfork3-ENV = MALLOC_TRACE=$(objpfx)tst-vfork3.mtrace $(objpfx)tst-vfork3-mem: $(objpfx)tst-vfork3.out - $(common-objpfx)malloc/mtrace $(objpfx)tst-vfork3.mtrace > $@ + $(common-objpfx)malloc/mtrace $(objpfx)tst-vfork3.mtrace > $@; \ + $(evaluate-test) # tst-rxspencer.mtrace is not generated, only # tst-rxspencer-no-utf8.mtrace, since otherwise the file has almost # 100M and takes very long time to process. tst-rxspencer-no-utf8-ENV += MALLOC_TRACE=$(objpfx)tst-rxspencer-no-utf8.mtrace $(objpfx)tst-rxspencer-no-utf8-mem: $(objpfx)tst-rxspencer-no-utf8.out - $(common-objpfx)malloc/mtrace $(objpfx)tst-rxspencer-no-utf8.mtrace > $@ + $(common-objpfx)malloc/mtrace $(objpfx)tst-rxspencer-no-utf8.mtrace \ + > $@; \ + $(evaluate-test) tst-pcre-ENV = MALLOC_TRACE=$(objpfx)tst-pcre.mtrace $(objpfx)tst-pcre-mem: $(objpfx)tst-pcre.out - $(common-objpfx)malloc/mtrace $(objpfx)tst-pcre.mtrace > $@ + $(common-objpfx)malloc/mtrace $(objpfx)tst-pcre.mtrace > $@; \ + $(evaluate-test) tst-boost-ENV = MALLOC_TRACE=$(objpfx)tst-boost.mtrace $(objpfx)tst-boost-mem: $(objpfx)tst-boost.out - $(common-objpfx)malloc/mtrace $(objpfx)tst-boost.mtrace > $@ + $(common-objpfx)malloc/mtrace $(objpfx)tst-boost.mtrace > $@; \ + $(evaluate-test) $(objpfx)tst-getconf.out: tst-getconf.sh $(objpfx)getconf - $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' + $(SHELL) $< $(common-objpfx) '$(built-program-cmd)'; \ + $(evaluate-test) $(objpfx)bug-ga2-mem: $(objpfx)bug-ga2.out - $(common-objpfx)malloc/mtrace $(objpfx)bug-ga2.mtrace > $@ + $(common-objpfx)malloc/mtrace $(objpfx)bug-ga2.mtrace > $@; \ + $(evaluate-test) bug-ga2-ENV = MALLOC_TRACE=$(objpfx)bug-ga2.mtrace bug-glob2-ENV = MALLOC_TRACE=$(objpfx)bug-glob2.mtrace $(objpfx)bug-glob2-mem: $(objpfx)bug-glob2.out - $(common-objpfx)malloc/mtrace $(objpfx)bug-glob2.mtrace > $@ + $(common-objpfx)malloc/mtrace $(objpfx)bug-glob2.mtrace > $@; \ + $(evaluate-test) $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ $(objpfx)getconf.speclist FORCE |