mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-25 12:11:10 +00:00
f0881698bf
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).
88 lines
2.8 KiB
Makefile
88 lines
2.8 KiB
Makefile
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
|
# This file is part of the GNU C Library.
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2.1 of the License, or (at your option) any later version.
|
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with the GNU C Library; if not, see
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
# Makefile for catgets.
|
|
#
|
|
subdir := catgets
|
|
|
|
headers = nl_types.h
|
|
routines = catgets open_catalog
|
|
others = gencat
|
|
install-bin = gencat
|
|
extra-objs = $(gencat-modules:=.o)
|
|
|
|
tests = tst-catgets
|
|
test-srcs = test-gencat
|
|
|
|
gencat-modules = xmalloc
|
|
|
|
# To find xmalloc.c
|
|
vpath %.c ../locale/programs
|
|
|
|
|
|
include ../Rules
|
|
|
|
$(objpfx)gencat: $(gencat-modules:%=$(objpfx)%.o)
|
|
|
|
catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"' \
|
|
-DHAVE_CONFIG_H
|
|
|
|
CPPFLAGS-gencat = -DNOT_IN_libc
|
|
|
|
generated = de.msg test1.cat test1.h test2.cat test2.h sample.SJIS.cat \
|
|
test-gencat.h
|
|
generated-dirs = de
|
|
|
|
tst-catgets-ENV = NLSPATH="$(objpfx)%l/%N.cat" LANG=de
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
tests: $(objpfx)de/libc.cat $(objpfx)test1.cat $(objpfx)test2.cat \
|
|
$(objpfx)test-gencat.out
|
|
# This test just checks whether the program produces any error or not.
|
|
# The result is not tested.
|
|
$(objpfx)test1.cat: test1.msg $(objpfx)gencat
|
|
LC_ALL=hr_HR.ISO-8859-2 LOCPATH=$(common-objpfx)localedata \
|
|
GCONV_PATH=$(common-objpfx)iconvdata \
|
|
$(built-program-cmd) -H $(objpfx)test1.h $@ $<; \
|
|
$(evaluate-test)
|
|
$(objpfx)test2.cat: test2.msg $(objpfx)gencat
|
|
LOCPATH=$(common-objpfx)localedata \
|
|
GCONV_PATH=$(common-objpfx)iconvdata \
|
|
$(built-program-cmd) -H $(objpfx)test2.h $@ $<; \
|
|
$(evaluate-test)
|
|
$(objpfx)de/libc.cat: $(objpfx)de.msg $(objpfx)gencat
|
|
$(make-target-directory)
|
|
LC_ALL=de_DE.ISO-8859-1 LOCPATH=$(common-objpfx)localedata \
|
|
GCONV_PATH=$(common-objpfx)iconvdata $(built-program-cmd) $@ $<; \
|
|
$(evaluate-test)
|
|
$(objpfx)tst-catgets.out: $(objpfx)de/libc.cat
|
|
|
|
# Generate a non-simple input file.
|
|
$(objpfx)de.msg: xopen-msg.awk $(..)po/de.po
|
|
LC_ALL=C $(AWK) -f $^ $< > $@
|
|
|
|
$(objpfx)test-gencat.out: test-gencat.sh $(objpfx)test-gencat \
|
|
$(objpfx)sample.SJIS.cat
|
|
$(SHELL) $< $(common-objpfx) '$(test-program-cmd)'; \
|
|
$(evaluate-test)
|
|
|
|
$(objpfx)sample.SJIS.cat: sample.SJIS $(objpfx)gencat
|
|
GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
|
|
$(built-program-cmd) -H $(objpfx)test-gencat.h < $(word 1,$^) > $@
|
|
endif
|