mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-11 03:40:06 +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).
201 lines
7.2 KiB
Makefile
201 lines
7.2 KiB
Makefile
# Copyright (C) 1995-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/>.
|
|
|
|
#
|
|
# Specific makefile for libio.
|
|
#
|
|
subdir := libio
|
|
|
|
headers := stdio.h libio.h _G_config.h bits/stdio.h bits/stdio-lock.h \
|
|
bits/sys_errlist.h bits/stdio2.h bits/stdio-ldbl.h bits/libio-ldbl.h
|
|
|
|
routines := \
|
|
filedoalloc iofclose iofdopen iofflush iofgetpos iofgets iofopen \
|
|
iofopncook iofputs iofread iofsetpos ioftell wfiledoalloc \
|
|
iofwrite iogetdelim iogetline iogets iopadn iopopen ioputs \
|
|
ioseekoff ioseekpos iosetbuffer iosetvbuf ioungetc \
|
|
iovsprintf iovsscanf \
|
|
iofgetpos64 iofopen64 iofsetpos64 \
|
|
fputwc fputwc_u getwc getwc_u getwchar getwchar_u iofgetws iofgetws_u \
|
|
iofputws iofputws_u iogetwline iowpadn ioungetwc putwc putwc_u \
|
|
putwchar putwchar_u putchar putchar_u fwprintf swprintf vwprintf \
|
|
wprintf wscanf fwscanf vwscanf vswprintf iovswscanf swscanf wgenops \
|
|
wstrops wfileops iofwide fwide wmemstream \
|
|
\
|
|
clearerr feof ferror fileno fputc freopen fseek getc getchar \
|
|
memstream pclose putc putchar rewind setbuf setlinebuf vasprintf \
|
|
iovdprintf vscanf vsnprintf obprintf fcloseall fseeko ftello \
|
|
freopen64 fseeko64 ftello64 \
|
|
\
|
|
__fbufsize __freading __fwriting __freadable __fwritable __flbf \
|
|
__fpurge __fpending __fsetlocking \
|
|
\
|
|
libc_fatal fmemopen
|
|
|
|
include ../Makeconfig
|
|
|
|
tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc \
|
|
tst_wprintf2 tst-widetext test-fmemopen tst-ext tst-ext2 \
|
|
tst-fgetws tst-ungetwc1 tst-ungetwc2 tst-swscanf tst-sscanf \
|
|
tst-mmap-setvbuf bug-ungetwc1 bug-ungetwc2 tst-atime tst-eof \
|
|
tst-freopen bug-rewind bug-rewind2 bug-ungetc bug-fseek \
|
|
tst-mmap-eofsync tst-mmap-fflushsync bug-mmap-fflush \
|
|
tst-mmap2-eofsync tst-mmap-offend bug-fopena+ bug-wfflush \
|
|
bug-ungetc2 bug-ftell bug-ungetc3 bug-ungetc4 tst-fopenloc2 \
|
|
tst-memstream1 tst-memstream2 \
|
|
tst-wmemstream1 tst-wmemstream2 \
|
|
bug-memstream1 bug-wmemstream1 \
|
|
tst-setvbuf1 tst-popen1 tst-fgetwc bug-wsetpos tst-fseek \
|
|
tst-fwrite-error tst-ftell-partial-wide
|
|
ifeq (yes,$(build-shared))
|
|
# Add test-fopenloc only if shared library is enabled since it depends on
|
|
# shared localedata objects.
|
|
tests += tst-fopenloc
|
|
endif
|
|
test-srcs = test-freopen
|
|
|
|
all: # Make this the default target; it will be defined in Rules.
|
|
|
|
ifeq ($(build-shared),yes)
|
|
routines += oldiofopen oldiofdopen oldiofclose oldiopopen oldpclose \
|
|
oldtmpfile oldiofgetpos oldiofgetpos64 oldiofsetpos \
|
|
oldiofsetpos64
|
|
endif
|
|
|
|
ifeq (yes,$(libc-reentrant))
|
|
routines += clearerr_u feof_u ferror_u fputc_u getc_u getchar_u \
|
|
iofflush_u putc_u putchar_u peekc iofread_u iofwrite_u iofgets_u \
|
|
iofputs_u
|
|
endif
|
|
|
|
CPPFLAGS += $(libio-mtsafe)
|
|
|
|
# Support for exception handling.
|
|
CFLAGS-fileops.c = $(exceptions)
|
|
CFLAGS-fputc.c = $(exceptions)
|
|
CFLAGS-fputwc.c = $(exceptions)
|
|
CFLAGS-freopen64.c = $(exceptions)
|
|
CFLAGS-freopen.c = $(exceptions)
|
|
CFLAGS-fseek.c = $(exceptions)
|
|
CFLAGS-fseeko64.c = $(exceptions)
|
|
CFLAGS-fseeko.c = $(exceptions)
|
|
CFLAGS-ftello64.c = $(exceptions)
|
|
CFLAGS-ftello.c = $(exceptions)
|
|
CFLAGS-fwide.c = $(exceptions)
|
|
CFLAGS-genops.c = $(exceptions)
|
|
CFLAGS-getc.c = $(exceptions)
|
|
CFLAGS-getchar.c = $(exceptions)
|
|
CFLAGS-getwc.c = $(exceptions)
|
|
CFLAGS-getwchar.c = $(exceptions)
|
|
CFLAGS-iofclose.c = $(exceptions)
|
|
CFLAGS-iofflush.c = $(exceptions)
|
|
CFLAGS-iofgetpos64.c = $(exceptions)
|
|
CFLAGS-iofgetpos.c = $(exceptions)
|
|
CFLAGS-iofgets.c = $(exceptions)
|
|
CFLAGS-iofgetws.c = $(exceptions)
|
|
CFLAGS-iofputs.c = $(exceptions)
|
|
CFLAGS-iofputws.c = $(exceptions)
|
|
CFLAGS-iofread.c = $(exceptions)
|
|
CFLAGS-iofsetpos64.c = $(exceptions)
|
|
CFLAGS-iofsetpos.c = $(exceptions)
|
|
CFLAGS-ioftell.c = $(exceptions)
|
|
CFLAGS-iofwrite.c = $(exceptions)
|
|
CFLAGS-iogetdelim.c = $(exceptions)
|
|
CFLAGS-iogetline.c = $(exceptions)
|
|
CFLAGS-iogets.c = $(exceptions)
|
|
CFLAGS-iogetwline.c = $(exceptions)
|
|
CFLAGS-ioputs.c = $(exceptions)
|
|
CFLAGS-ioseekoff.c = $(exceptions)
|
|
CFLAGS-ioseekpos.c = $(exceptions)
|
|
CFLAGS-iosetbuffer.c = $(exceptions)
|
|
CFLAGS-iosetvbuf.c = $(exceptions)
|
|
CFLAGS-ioungetc.c = $(exceptions)
|
|
CFLAGS-ioungetwc.c = $(exceptions)
|
|
CFLAGS-oldfileops.c = $(exceptions)
|
|
CFLAGS-oldiofclose.c = $(exceptions)
|
|
CFLAGS-oldiofgetpos64.c = $(exceptions)
|
|
CFLAGS-oldiofgetpos.c = $(exceptions)
|
|
CFLAGS-oldiofsetpos64.c = $(exceptions)
|
|
CFLAGS-oldiofsetpos.c = $(exceptions)
|
|
CFLAGS-peekc.c = $(exceptions)
|
|
CFLAGS-putc.c = $(exceptions)
|
|
CFLAGS-putchar.c = $(exceptions)
|
|
CFLAGS-putwc.c = $(exceptions)
|
|
CFLAGS-putwchar.c = $(exceptions)
|
|
CFLAGS-rewind.c = $(exceptions)
|
|
CFLAGS-wfileops.c = $(exceptions)
|
|
CFLAGS-wgenops.c = $(exceptions)
|
|
CFLAGS-oldiofopen.c = $(exceptions)
|
|
CFLAGS-iofopen.c = $(exceptions)
|
|
CFLAGS-iofopen64.c = $(exceptions)
|
|
CFLAGS-oldtmpfile.c = $(exceptions)
|
|
# XXX Do we need filedoalloc and wfiledoalloc? Others?
|
|
|
|
CFLAGS-tst_putwc.c = -DOBJPFX=\"$(objpfx)\"
|
|
|
|
tst_wprintf2-ARGS = "Some Text"
|
|
|
|
tst-widetext-ENV = LOCPATH=$(common-objpfx)localedata LANGUAGE=C
|
|
tst-fopenloc-ENV = LOCPATH=$(common-objpfx)localedata \
|
|
MALLOC_TRACE=$(objpfx)tst-fopenloc.mtrace
|
|
tst-fgetws-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-ungetwc1-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-ungetwc2-ENV = LOCPATH=$(common-objpfx)localedata
|
|
bug-ungetwc2-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-swscanf-ENV = LOCPATH=$(common-objpfx)localedata
|
|
bug-ftell-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-fgetwc-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-fseek-ENV = LOCPATH=$(common-objpfx)localedata
|
|
|
|
generated = tst-fopenloc.mtrace tst-fopenloc.check
|
|
|
|
aux := fileops genops stdfiles stdio strops
|
|
|
|
ifeq ($(build-shared),yes)
|
|
aux += oldfileops oldstdfiles
|
|
endif
|
|
|
|
shared-only-routines = oldiofopen oldiofdopen oldiofclose oldfileops \
|
|
oldstdfiles oldiopopen oldpclose oldtmpfile \
|
|
oldiofgetpos oldiofgetpos64 oldiofsetpos \
|
|
oldiofsetpos64
|
|
|
|
include ../Rules
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
tests: $(objpfx)test-freopen.out
|
|
ifeq (yes,$(build-shared))
|
|
# Run tst-fopenloc-cmp.out and tst-openloc-mem.out only if shared
|
|
# library is enabled since they depend on tst-fopenloc.out.
|
|
tests: $(objpfx)tst-fopenloc-cmp.out $(objpfx)tst-fopenloc-mem.out
|
|
endif
|
|
endif
|
|
|
|
$(objpfx)test-freopen.out: test-freopen.sh $(objpfx)test-freopen
|
|
$(SHELL) $< $(common-objpfx) '$(test-program-prefix)' \
|
|
$(common-objpfx)libio/; \
|
|
$(evaluate-test)
|
|
|
|
$(objpfx)tst-fopenloc-cmp.out: ../iconvdata/testdata/ISO-8859-1..UTF8 \
|
|
$(objpfx)tst-fopenloc.out
|
|
cmp $^ > $@; \
|
|
$(evaluate-test)
|
|
|
|
$(objpfx)tst-fopenloc-mem.out: $(objpfx)tst-fopenloc.out
|
|
$(common-objpfx)malloc/mtrace $(objpfx)tst-fopenloc.mtrace > $@; \
|
|
$(evaluate-test)
|