changeset 12496:a48d3d749ca5

Refactor common macros used in tests.
author Bruno Haible <bruno@clisp.org>
date Thu, 24 Dec 2009 21:01:42 +0100
parents 16a0ada3a101
children e2d59f164e76
files ChangeLog modules/acl-tests modules/areadlink-tests modules/areadlink-with-size-tests modules/areadlinkat-tests modules/areadlinkat-with-size-tests modules/argmatch-tests modules/argv-iter-tests modules/array-list-tests modules/array-mergesort-tests modules/array-oset-tests modules/avltree-list-tests modules/avltree-oset-tests modules/avltreehash-list-tests modules/base64-tests modules/binary-io-tests modules/bitrotate-tests modules/btowc-tests modules/byteswap-tests modules/c-ctype-tests modules/c-stack-tests modules/c-strcase-tests modules/c-strcasestr-tests modules/c-strstr-tests modules/canonicalize-lgpl-tests modules/canonicalize-tests modules/carray-list-tests modules/ceilf-tests modules/ceill-tests modules/chown-tests modules/cloexec-tests modules/copy-file-tests modules/count-one-bits-tests modules/dprintf-posix-tests modules/dup2-tests modules/dup3-tests modules/duplocale-tests modules/fbufmode-tests modules/fchdir-tests modules/fcntl-safer-tests modules/fcntl-tests modules/fdopendir-tests modules/fdutimensat-tests modules/fflush-tests modules/filevercmp-tests modules/flock-tests modules/floorf-tests modules/floorl-tests modules/fnmatch-tests modules/fopen-safer-tests modules/fopen-tests modules/fpending-tests modules/fprintf-posix-tests modules/fpurge-tests modules/freadable-tests modules/freadahead-tests modules/freading-tests modules/freadptr-tests modules/freadseek-tests modules/freopen-tests modules/frexp-nolibm-tests modules/frexp-tests modules/frexpl-nolibm-tests modules/frexpl-tests modules/fseek-tests modules/fseeko-tests modules/fstrcmp-tests modules/fsync-tests modules/ftell-tests modules/ftello-tests modules/func-tests modules/futimens-tests modules/fwritable-tests modules/fwriting-tests modules/getcwd-tests modules/getdate-tests modules/getdelim-tests modules/getdtablesize-tests modules/getgroups-tests modules/getline-tests modules/getndelim2-tests modules/glob-tests modules/hash-tests modules/i-ring-tests modules/iconv-tests modules/iconv_open-utf-tests modules/idpriv-drop-tests modules/idpriv-droptemp-tests modules/inet_ntop-tests modules/inet_pton-tests modules/isblank-tests modules/isfinite-tests modules/isinf-tests modules/isnan-tests modules/isnand-nolibm-tests modules/isnand-tests modules/isnanf-nolibm-tests modules/isnanf-tests modules/isnanl-nolibm-tests modules/isnanl-tests modules/lchown-tests modules/ldexpl-tests modules/link-tests modules/linkat-tests modules/linked-list-tests modules/linkedhash-list-tests modules/localename-tests modules/lseek-tests modules/lstat-tests modules/mbmemcasecmp-tests modules/mbmemcasecoll-tests modules/mbrtowc-tests modules/mbscasecmp-tests modules/mbscasestr-tests modules/mbschr-tests modules/mbscspn-tests modules/mbsinit-tests modules/mbsncasecmp-tests modules/mbsnrtowcs-tests modules/mbspbrk-tests modules/mbspcasecmp-tests modules/mbsrchr-tests modules/mbsrtowcs-tests modules/mbsspn-tests modules/mbsstr-tests modules/memchr-tests modules/memchr2-tests modules/memcmp-tests modules/memmem-tests modules/memrchr-tests modules/mkdir-tests modules/mkfifo-tests modules/mkfifoat-tests modules/mknod-tests modules/nanosleep-tests modules/nl_langinfo-tests modules/obstack-printf-tests modules/open-tests modules/openat-tests modules/pipe-filter-gi-tests modules/pipe-filter-ii-tests modules/pipe2-tests modules/popen-safer-tests modules/popen-tests modules/posixtm-tests modules/pread-tests modules/printf-frexp-tests modules/printf-frexpl-tests modules/printf-posix-tests modules/priv-set-tests modules/quotearg-tests modules/random_r-tests modules/rawmemchr-tests modules/rbtree-list-tests modules/rbtree-oset-tests modules/rbtreehash-list-tests modules/readlink-tests modules/remove-tests modules/rename-tests modules/renameat-tests modules/rmdir-tests modules/round-tests modules/roundf-tests modules/roundl-tests modules/safe-alloc-tests modules/setenv-tests modules/sigaction-tests modules/signbit-tests modules/sleep-tests modules/snprintf-posix-tests modules/snprintf-tests modules/sprintf-posix-tests modules/stat-tests modules/stat-time-tests modules/strcasestr-tests modules/strchrnul-tests modules/strerror-tests modules/striconv-tests modules/striconveh-tests modules/striconveha-tests modules/strsignal-tests modules/strstr-tests modules/strtod-tests modules/strverscmp-tests modules/symlink-tests modules/symlinkat-tests modules/trunc-tests modules/truncf-tests modules/truncl-tests modules/uname-tests modules/unicase/cased-tests modules/unicase/ignorable-tests modules/unicase/locale-language-tests modules/unicase/tolower-tests modules/unicase/totitle-tests modules/unicase/toupper-tests modules/unicase/u16-casecmp-tests modules/unicase/u16-casecoll-tests modules/unicase/u16-casefold-tests modules/unicase/u16-is-cased-tests modules/unicase/u16-is-casefolded-tests modules/unicase/u16-is-lowercase-tests modules/unicase/u16-is-titlecase-tests modules/unicase/u16-is-uppercase-tests modules/unicase/u16-tolower-tests modules/unicase/u16-totitle-tests modules/unicase/u16-toupper-tests modules/unicase/u32-casecmp-tests modules/unicase/u32-casecoll-tests modules/unicase/u32-casefold-tests modules/unicase/u32-is-cased-tests modules/unicase/u32-is-casefolded-tests modules/unicase/u32-is-lowercase-tests modules/unicase/u32-is-titlecase-tests modules/unicase/u32-is-uppercase-tests modules/unicase/u32-tolower-tests modules/unicase/u32-totitle-tests modules/unicase/u32-toupper-tests modules/unicase/u8-casecmp-tests modules/unicase/u8-casecoll-tests modules/unicase/u8-casefold-tests modules/unicase/u8-is-cased-tests modules/unicase/u8-is-casefolded-tests modules/unicase/u8-is-lowercase-tests modules/unicase/u8-is-titlecase-tests modules/unicase/u8-is-uppercase-tests modules/unicase/u8-tolower-tests modules/unicase/u8-totitle-tests modules/unicase/u8-toupper-tests modules/unicase/ulc-casecmp-tests modules/unicase/ulc-casecoll-tests modules/uniconv/u16-conv-from-enc-tests modules/uniconv/u16-conv-to-enc-tests modules/uniconv/u16-strconv-from-enc-tests modules/uniconv/u16-strconv-to-enc-tests modules/uniconv/u32-conv-from-enc-tests modules/uniconv/u32-conv-to-enc-tests modules/uniconv/u32-strconv-from-enc-tests modules/uniconv/u32-strconv-to-enc-tests modules/uniconv/u8-conv-from-enc-tests modules/uniconv/u8-conv-to-enc-tests modules/uniconv/u8-strconv-from-enc-tests modules/uniconv/u8-strconv-to-enc-tests modules/unictype/bidicategory-byname-tests modules/unictype/bidicategory-name-tests modules/unictype/bidicategory-of-tests modules/unictype/bidicategory-test-tests modules/unictype/block-list-tests modules/unictype/block-of-tests modules/unictype/block-test-tests modules/unictype/category-C-tests modules/unictype/category-Cc-tests modules/unictype/category-Cf-tests modules/unictype/category-Cn-tests modules/unictype/category-Co-tests modules/unictype/category-Cs-tests modules/unictype/category-L-tests modules/unictype/category-Ll-tests modules/unictype/category-Lm-tests modules/unictype/category-Lo-tests modules/unictype/category-Lt-tests modules/unictype/category-Lu-tests modules/unictype/category-M-tests modules/unictype/category-Mc-tests modules/unictype/category-Me-tests modules/unictype/category-Mn-tests modules/unictype/category-N-tests modules/unictype/category-Nd-tests modules/unictype/category-Nl-tests modules/unictype/category-No-tests modules/unictype/category-P-tests modules/unictype/category-Pc-tests modules/unictype/category-Pd-tests modules/unictype/category-Pe-tests modules/unictype/category-Pf-tests modules/unictype/category-Pi-tests modules/unictype/category-Po-tests modules/unictype/category-Ps-tests modules/unictype/category-S-tests modules/unictype/category-Sc-tests modules/unictype/category-Sk-tests modules/unictype/category-Sm-tests modules/unictype/category-So-tests modules/unictype/category-Z-tests modules/unictype/category-Zl-tests modules/unictype/category-Zp-tests modules/unictype/category-Zs-tests modules/unictype/category-and-not-tests modules/unictype/category-and-tests modules/unictype/category-byname-tests modules/unictype/category-name-tests modules/unictype/category-none-tests modules/unictype/category-of-tests modules/unictype/category-or-tests modules/unictype/category-test-withtable-tests modules/unictype/combining-class-tests modules/unictype/ctype-alnum-tests modules/unictype/ctype-alpha-tests modules/unictype/ctype-blank-tests modules/unictype/ctype-cntrl-tests modules/unictype/ctype-digit-tests modules/unictype/ctype-graph-tests modules/unictype/ctype-lower-tests modules/unictype/ctype-print-tests modules/unictype/ctype-punct-tests modules/unictype/ctype-space-tests modules/unictype/ctype-upper-tests modules/unictype/ctype-xdigit-tests modules/unictype/decimal-digit-tests modules/unictype/digit-tests modules/unictype/mirror-tests modules/unictype/numeric-tests modules/unictype/property-alphabetic-tests modules/unictype/property-ascii-hex-digit-tests modules/unictype/property-bidi-arabic-digit-tests modules/unictype/property-bidi-arabic-right-to-left-tests modules/unictype/property-bidi-block-separator-tests modules/unictype/property-bidi-boundary-neutral-tests modules/unictype/property-bidi-common-separator-tests modules/unictype/property-bidi-control-tests modules/unictype/property-bidi-embedding-or-override-tests modules/unictype/property-bidi-eur-num-separator-tests modules/unictype/property-bidi-eur-num-terminator-tests modules/unictype/property-bidi-european-digit-tests modules/unictype/property-bidi-hebrew-right-to-left-tests modules/unictype/property-bidi-left-to-right-tests modules/unictype/property-bidi-non-spacing-mark-tests modules/unictype/property-bidi-other-neutral-tests modules/unictype/property-bidi-pdf-tests modules/unictype/property-bidi-segment-separator-tests modules/unictype/property-bidi-whitespace-tests modules/unictype/property-byname-tests modules/unictype/property-combining-tests modules/unictype/property-composite-tests modules/unictype/property-currency-symbol-tests modules/unictype/property-dash-tests modules/unictype/property-decimal-digit-tests modules/unictype/property-default-ignorable-code-point-tests modules/unictype/property-deprecated-tests modules/unictype/property-diacritic-tests modules/unictype/property-extender-tests modules/unictype/property-format-control-tests modules/unictype/property-grapheme-base-tests modules/unictype/property-grapheme-extend-tests modules/unictype/property-grapheme-link-tests modules/unictype/property-hex-digit-tests modules/unictype/property-hyphen-tests modules/unictype/property-id-continue-tests modules/unictype/property-id-start-tests modules/unictype/property-ideographic-tests modules/unictype/property-ids-binary-operator-tests modules/unictype/property-ids-trinary-operator-tests modules/unictype/property-ignorable-control-tests modules/unictype/property-iso-control-tests modules/unictype/property-join-control-tests modules/unictype/property-left-of-pair-tests modules/unictype/property-line-separator-tests modules/unictype/property-logical-order-exception-tests modules/unictype/property-lowercase-tests modules/unictype/property-math-tests modules/unictype/property-non-break-tests modules/unictype/property-not-a-character-tests modules/unictype/property-numeric-tests modules/unictype/property-other-alphabetic-tests modules/unictype/property-other-default-ignorable-code-point-tests modules/unictype/property-other-grapheme-extend-tests modules/unictype/property-other-id-continue-tests modules/unictype/property-other-id-start-tests modules/unictype/property-other-lowercase-tests modules/unictype/property-other-math-tests modules/unictype/property-other-uppercase-tests modules/unictype/property-paired-punctuation-tests modules/unictype/property-paragraph-separator-tests modules/unictype/property-pattern-syntax-tests modules/unictype/property-pattern-white-space-tests modules/unictype/property-private-use-tests modules/unictype/property-punctuation-tests modules/unictype/property-quotation-mark-tests modules/unictype/property-radical-tests modules/unictype/property-sentence-terminal-tests modules/unictype/property-soft-dotted-tests modules/unictype/property-space-tests modules/unictype/property-terminal-punctuation-tests modules/unictype/property-test-tests modules/unictype/property-titlecase-tests modules/unictype/property-unassigned-code-value-tests modules/unictype/property-unified-ideograph-tests modules/unictype/property-uppercase-tests modules/unictype/property-variation-selector-tests modules/unictype/property-white-space-tests modules/unictype/property-xid-continue-tests modules/unictype/property-xid-start-tests modules/unictype/property-zero-width-tests modules/unictype/scripts-tests modules/unictype/syntax-c-ident-tests modules/unictype/syntax-c-whitespace-tests modules/unictype/syntax-java-ident-tests modules/unictype/syntax-java-whitespace-tests modules/unilbrk/u16-possible-linebreaks-tests modules/unilbrk/u16-width-linebreaks-tests modules/unilbrk/u32-possible-linebreaks-tests modules/unilbrk/u32-width-linebreaks-tests modules/unilbrk/u8-possible-linebreaks-tests modules/unilbrk/u8-width-linebreaks-tests modules/unilbrk/ulc-possible-linebreaks-tests modules/unilbrk/ulc-width-linebreaks-tests modules/uninorm/canonical-decomposition-tests modules/uninorm/compat-decomposition-tests modules/uninorm/composition-tests modules/uninorm/decomposing-form-tests modules/uninorm/decomposition-tests modules/uninorm/filter-tests modules/uninorm/nfc-tests modules/uninorm/nfd-tests modules/uninorm/nfkc-tests modules/uninorm/nfkd-tests modules/uninorm/u16-normcmp-tests modules/uninorm/u16-normcoll-tests modules/uninorm/u32-normcmp-tests modules/uninorm/u32-normcoll-tests modules/uninorm/u8-normcmp-tests modules/uninorm/u8-normcoll-tests modules/unistdio/u16-asnprintf-tests modules/unistdio/u16-vasnprintf-tests modules/unistdio/u16-vasprintf-tests modules/unistdio/u16-vsnprintf-tests modules/unistdio/u16-vsprintf-tests modules/unistdio/u32-asnprintf-tests modules/unistdio/u32-vasnprintf-tests modules/unistdio/u32-vasprintf-tests modules/unistdio/u32-vsnprintf-tests modules/unistdio/u32-vsprintf-tests modules/unistdio/u8-asnprintf-tests modules/unistdio/u8-vasnprintf-tests modules/unistdio/u8-vasprintf-tests modules/unistdio/u8-vsnprintf-tests modules/unistdio/u8-vsprintf-tests modules/unistdio/ulc-asnprintf-tests modules/unistdio/ulc-vasnprintf-tests modules/unistdio/ulc-vasprintf-tests modules/unistdio/ulc-vsnprintf-tests modules/unistdio/ulc-vsprintf-tests modules/uniwbrk/u16-wordbreaks-tests modules/uniwbrk/u32-wordbreaks-tests modules/uniwbrk/u8-wordbreaks-tests modules/uniwbrk/ulc-wordbreaks-tests modules/uniwidth/u16-strwidth-tests modules/uniwidth/u16-width-tests modules/uniwidth/u32-strwidth-tests modules/uniwidth/u32-width-tests modules/uniwidth/u8-strwidth-tests modules/uniwidth/u8-width-tests modules/uniwidth/width-tests modules/unlink-tests modules/unsetenv-tests modules/usleep-tests modules/utimens-tests modules/utimensat-tests modules/vasnprintf-posix-tests modules/vasnprintf-tests modules/vasprintf-posix-tests modules/vasprintf-tests modules/vdprintf-posix-tests modules/vfprintf-posix-tests modules/vprintf-posix-tests modules/vsnprintf-posix-tests modules/vsnprintf-tests modules/vsprintf-posix-tests modules/wcrtomb-tests modules/wcsnrtombs-tests modules/wcsrtombs-tests modules/wctype-tests modules/wcwidth-tests modules/xmemdup0-tests modules/xprintf-posix-tests modules/xvasprintf-tests tests/macros.h tests/test-areadlink-with-size.c tests/test-areadlink.c tests/test-areadlinkat-with-size.c tests/test-areadlinkat.c tests/test-argmatch.c tests/test-argv-iter.c tests/test-array-mergesort.c tests/test-array_list.c tests/test-array_oset.c tests/test-avltree_list.c tests/test-avltree_oset.c tests/test-avltreehash_list.c tests/test-base64.c tests/test-binary-io.c tests/test-bitrotate.c tests/test-btowc.c tests/test-byteswap.c tests/test-c-ctype.c tests/test-c-stack.c tests/test-c-strcasecmp.c tests/test-c-strcasestr.c tests/test-c-strncasecmp.c tests/test-c-strstr.c tests/test-canonicalize-lgpl.c tests/test-canonicalize.c tests/test-carray_list.c tests/test-ceilf1.c tests/test-ceilf2.c tests/test-ceill.c tests/test-chown.c tests/test-cloexec.c tests/test-copy-acl.c tests/test-copy-file.c tests/test-count-one-bits.c tests/test-dprintf-posix.c tests/test-dup2.c tests/test-dup3.c tests/test-duplocale.c tests/test-fbufmode.c tests/test-fchdir.c tests/test-fchownat.c tests/test-fcntl-safer.c tests/test-fcntl.c tests/test-fdopendir.c tests/test-fdutimensat.c tests/test-fflush2.c tests/test-file-has-acl.c tests/test-filevercmp.c tests/test-flock.c tests/test-floorf1.c tests/test-floorf2.c tests/test-floorl.c tests/test-fnmatch.c tests/test-fopen.h tests/test-fpending.c tests/test-fprintf-posix.c tests/test-fpurge.c tests/test-freadable.c tests/test-freadahead.c tests/test-freading.c tests/test-freadptr.c tests/test-freadptr2.c tests/test-freadseek.c tests/test-freopen.c tests/test-frexp.c tests/test-frexpl.c tests/test-fseek.c tests/test-fseeko.c tests/test-fstatat.c tests/test-fstrcmp.c tests/test-fsync.c tests/test-ftell.c tests/test-ftello.c tests/test-func.c tests/test-futimens.c tests/test-fwritable.c tests/test-fwriting.c tests/test-getcwd.c tests/test-getdate.c tests/test-getdelim.c tests/test-getdtablesize.c tests/test-getgroups.c tests/test-getline.c tests/test-getndelim2.c tests/test-glob.c tests/test-hash.c tests/test-i-ring.c tests/test-iconv-utf.c tests/test-iconv.c tests/test-idpriv-drop.c tests/test-idpriv-droptemp.c tests/test-inet_ntop.c tests/test-inet_pton.c tests/test-isblank.c tests/test-isfinite.c tests/test-isinf.c tests/test-isnan.c tests/test-isnand.h tests/test-isnanf.h tests/test-isnanl.h tests/test-lchown.c tests/test-ldexpl.c tests/test-link.c tests/test-linkat.c tests/test-linked_list.c tests/test-linkedhash_list.c tests/test-localename.c tests/test-lseek.c tests/test-lstat.c tests/test-mbmemcasecmp.c tests/test-mbmemcasecoll.c tests/test-mbrtowc.c tests/test-mbscasecmp.c tests/test-mbscasestr1.c tests/test-mbscasestr2.c tests/test-mbscasestr3.c tests/test-mbscasestr4.c tests/test-mbschr.c tests/test-mbscspn.c tests/test-mbsinit.c tests/test-mbsncasecmp.c tests/test-mbsnrtowcs.c tests/test-mbspbrk.c tests/test-mbspcasecmp.c tests/test-mbsrchr.c tests/test-mbsrtowcs.c tests/test-mbsspn.c tests/test-mbsstr1.c tests/test-mbsstr2.c tests/test-mbsstr3.c tests/test-memchr.c tests/test-memchr2.c tests/test-memcmp.c tests/test-memmem.c tests/test-memrchr.c tests/test-mkdir.c tests/test-mkdirat.c tests/test-mkfifo.c tests/test-mkfifoat.c tests/test-mknod.c tests/test-nanosleep.c tests/test-nl_langinfo.c tests/test-obstack-printf.c tests/test-open.c tests/test-openat.c tests/test-pipe-filter-gi1.c tests/test-pipe-filter-gi2-main.c tests/test-pipe-filter-ii1.c tests/test-pipe-filter-ii2-main.c tests/test-pipe2.c tests/test-popen.h tests/test-posixtm.c tests/test-pread.c tests/test-printf-frexp.c tests/test-printf-frexpl.c tests/test-printf-posix.c tests/test-priv-set.c tests/test-quotearg.c tests/test-random_r.c tests/test-rawmemchr.c tests/test-rbtree_list.c tests/test-rbtree_oset.c tests/test-rbtreehash_list.c tests/test-readlink.c tests/test-remove.c tests/test-rename.c tests/test-renameat.c tests/test-rmdir.c tests/test-round1.c tests/test-roundf1.c tests/test-roundl.c tests/test-safe-alloc.c tests/test-sameacls.c tests/test-set-mode-acl.c tests/test-setenv.c tests/test-sigaction.c tests/test-signbit.c tests/test-sleep.c tests/test-snprintf-posix.c tests/test-snprintf.c tests/test-sprintf-posix.c tests/test-stat-time.c tests/test-stat.c tests/test-strcasestr.c tests/test-strchrnul.c tests/test-strerror.c tests/test-striconv.c tests/test-striconveh.c tests/test-striconveha.c tests/test-strsignal.c tests/test-strstr.c tests/test-strtod.c tests/test-strverscmp.c tests/test-symlink.c tests/test-symlinkat.c tests/test-trunc1.c tests/test-trunc2.c tests/test-truncf1.c tests/test-truncf2.c tests/test-truncl.c tests/test-uname.c tests/test-unlink.c tests/test-unlinkat.c tests/test-unsetenv.c tests/test-usleep.c tests/test-utimens.c tests/test-utimensat.c tests/test-vasnprintf-posix.c tests/test-vasnprintf-posix2.c tests/test-vasnprintf.c tests/test-vasprintf-posix.c tests/test-vasprintf.c tests/test-vdprintf-posix.c tests/test-vfprintf-posix.c tests/test-vprintf-posix.c tests/test-vsnprintf-posix.c tests/test-vsnprintf.c tests/test-vsprintf-posix.c tests/test-wcrtomb.c tests/test-wcsnrtombs.c tests/test-wcsrtombs.c tests/test-wctype.c tests/test-wcwidth.c tests/test-xfprintf-posix.c tests/test-xmemdup0.c tests/test-xprintf-posix.c tests/test-xvasprintf.c tests/unicase/test-locale-language.c tests/unicase/test-mapping-part1.h tests/unicase/test-predicate-part1.h tests/unicase/test-u16-casecmp.c tests/unicase/test-u16-casecoll.c tests/unicase/test-u16-casefold.c tests/unicase/test-u16-is-cased.c tests/unicase/test-u16-is-casefolded.c tests/unicase/test-u16-is-lowercase.c tests/unicase/test-u16-is-titlecase.c tests/unicase/test-u16-is-uppercase.c tests/unicase/test-u16-tolower.c tests/unicase/test-u16-totitle.c tests/unicase/test-u16-toupper.c tests/unicase/test-u32-casecmp.c tests/unicase/test-u32-casecoll.c tests/unicase/test-u32-casefold.c tests/unicase/test-u32-is-cased.c tests/unicase/test-u32-is-casefolded.c tests/unicase/test-u32-is-lowercase.c tests/unicase/test-u32-is-titlecase.c tests/unicase/test-u32-is-uppercase.c tests/unicase/test-u32-tolower.c tests/unicase/test-u32-totitle.c tests/unicase/test-u32-toupper.c tests/unicase/test-u8-casecmp.c tests/unicase/test-u8-casecoll.c tests/unicase/test-u8-casefold.c tests/unicase/test-u8-is-cased.c tests/unicase/test-u8-is-casefolded.c tests/unicase/test-u8-is-lowercase.c tests/unicase/test-u8-is-titlecase.c tests/unicase/test-u8-is-uppercase.c tests/unicase/test-u8-tolower.c tests/unicase/test-u8-totitle.c tests/unicase/test-u8-toupper.c tests/unicase/test-ulc-casecmp.c tests/unicase/test-ulc-casecoll.c tests/uniconv/test-u16-conv-from-enc.c tests/uniconv/test-u16-conv-to-enc.c tests/uniconv/test-u16-strconv-from-enc.c tests/uniconv/test-u16-strconv-to-enc.c tests/uniconv/test-u32-conv-from-enc.c tests/uniconv/test-u32-conv-to-enc.c tests/uniconv/test-u32-strconv-from-enc.c tests/uniconv/test-u32-strconv-to-enc.c tests/uniconv/test-u8-conv-from-enc.c tests/uniconv/test-u8-conv-to-enc.c tests/uniconv/test-u8-strconv-from-enc.c tests/uniconv/test-u8-strconv-to-enc.c tests/unictype/test-bidi_byname.c tests/unictype/test-bidi_name.c tests/unictype/test-bidi_of.c tests/unictype/test-bidi_test.c tests/unictype/test-block_list.c tests/unictype/test-block_of.c tests/unictype/test-block_test.c tests/unictype/test-categ_and.c tests/unictype/test-categ_and_not.c tests/unictype/test-categ_byname.c tests/unictype/test-categ_name.c tests/unictype/test-categ_none.c tests/unictype/test-categ_of.c tests/unictype/test-categ_or.c tests/unictype/test-categ_test_withtable.c tests/unictype/test-combining.c tests/unictype/test-decdigit.c tests/unictype/test-digit.c tests/unictype/test-mirror.c tests/unictype/test-numeric.c tests/unictype/test-pr_byname.c tests/unictype/test-pr_test.c tests/unictype/test-predicate-part1.h tests/unictype/test-scripts.c tests/unictype/test-sy_c_ident.c tests/unictype/test-sy_java_ident.c tests/unilbrk/test-u16-possible-linebreaks.c tests/unilbrk/test-u16-width-linebreaks.c tests/unilbrk/test-u32-possible-linebreaks.c tests/unilbrk/test-u32-width-linebreaks.c tests/unilbrk/test-u8-possible-linebreaks.c tests/unilbrk/test-u8-width-linebreaks.c tests/unilbrk/test-ulc-possible-linebreaks.c tests/unilbrk/test-ulc-width-linebreaks.c tests/uninorm/test-canonical-decomposition.c tests/uninorm/test-compat-decomposition.c tests/uninorm/test-composition.c tests/uninorm/test-decomposing-form.c tests/uninorm/test-decomposition.c tests/uninorm/test-u16-nfc.c tests/uninorm/test-u16-nfd.c tests/uninorm/test-u16-nfkc.c tests/uninorm/test-u16-nfkd.c tests/uninorm/test-u16-normcmp.c tests/uninorm/test-u16-normcoll.c tests/uninorm/test-u32-nfc.c tests/uninorm/test-u32-nfd.c tests/uninorm/test-u32-nfkc.c tests/uninorm/test-u32-nfkd.c tests/uninorm/test-u32-normalize-big.c tests/uninorm/test-u32-normcmp.c tests/uninorm/test-u32-normcoll.c tests/uninorm/test-u8-nfc.c tests/uninorm/test-u8-nfd.c tests/uninorm/test-u8-nfkc.c tests/uninorm/test-u8-nfkd.c tests/uninorm/test-u8-normcmp.c tests/uninorm/test-u8-normcoll.c tests/uninorm/test-uninorm-filter-nfc.c tests/unistdio/test-u16-asnprintf1.c tests/unistdio/test-u16-vasnprintf1.c tests/unistdio/test-u16-vasnprintf2.c tests/unistdio/test-u16-vasnprintf3.c tests/unistdio/test-u16-vasprintf1.c tests/unistdio/test-u16-vsnprintf1.c tests/unistdio/test-u16-vsprintf1.c tests/unistdio/test-u32-asnprintf1.c tests/unistdio/test-u32-vasnprintf1.c tests/unistdio/test-u32-vasnprintf2.c tests/unistdio/test-u32-vasnprintf3.c tests/unistdio/test-u32-vasprintf1.c tests/unistdio/test-u32-vsnprintf1.c tests/unistdio/test-u32-vsprintf1.c tests/unistdio/test-u8-asnprintf1.c tests/unistdio/test-u8-vasnprintf1.c tests/unistdio/test-u8-vasnprintf2.c tests/unistdio/test-u8-vasnprintf3.c tests/unistdio/test-u8-vasprintf1.c tests/unistdio/test-u8-vsnprintf1.c tests/unistdio/test-u8-vsprintf1.c tests/unistdio/test-ulc-asnprintf1.c tests/unistdio/test-ulc-vasnprintf1.c tests/unistdio/test-ulc-vasnprintf2.c tests/unistdio/test-ulc-vasnprintf3.c tests/unistdio/test-ulc-vasprintf1.c tests/unistdio/test-ulc-vsnprintf1.c tests/unistdio/test-ulc-vsprintf1.c tests/uniwbrk/test-u16-wordbreaks.c tests/uniwbrk/test-u32-wordbreaks.c tests/uniwbrk/test-u8-wordbreaks.c tests/uniwbrk/test-ulc-wordbreaks.c tests/uniwidth/test-u16-strwidth.c tests/uniwidth/test-u16-width.c tests/uniwidth/test-u32-strwidth.c tests/uniwidth/test-u32-width.c tests/uniwidth/test-u8-strwidth.c tests/uniwidth/test-u8-width.c tests/uniwidth/test-uc_width.c tests/uniwidth/test-uc_width2.c
diffstat 853 files changed, 2016 insertions(+), 5191 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Dec 24 20:29:33 2009 +0100
+++ b/ChangeLog	Thu Dec 24 21:01:42 2009 +0100
@@ -1,3 +1,878 @@
+2009-12-24  Bruno Haible  <bruno@clisp.org>
+
+	Refactor common macros used in tests.
+	* tests/macros.h: New file.
+	* tests/test-areadlink.c: Include macros.h. Don't include <stdio.h>
+	and/or <stdlib.h>, if appropriate.
+	(ASSERT, SIZEOF): Remove macros.
+	* tests/test-areadlink-with-size.c: Likewise.
+	* tests/test-areadlinkat.c: Likewise.
+	* tests/test-areadlinkat-with-size.c: Likewise.
+	* tests/test-argmatch.c: Likewise.
+	* tests/test-argv-iter.c: Likewise.
+	* tests/test-array-mergesort.c: Likewise.
+	* tests/test-array_list.c: Likewise.
+	* tests/test-array_oset.c: Likewise.
+	* tests/test-avltree_list.c: Likewise.
+	* tests/test-avltree_oset.c: Likewise.
+	* tests/test-avltreehash_list.c: Likewise.
+	* tests/test-base64.c: Likewise.
+	* tests/test-binary-io.c: Likewise.
+	* tests/test-bitrotate.c: Likewise.
+	* tests/test-btowc.c: Likewise.
+	* tests/test-byteswap.c: Likewise.
+	* tests/test-c-ctype.c: Likewise.
+	* tests/test-c-stack.c: Likewise.
+	* tests/test-c-strcasecmp.c: Likewise.
+	* tests/test-c-strcasestr.c: Likewise.
+	* tests/test-c-strncasecmp.c: Likewise.
+	* tests/test-c-strstr.c: Likewise.
+	* tests/test-canonicalize-lgpl.c: Likewise.
+	* tests/test-canonicalize.c: Likewise.
+	* tests/test-carray_list.c: Likewise.
+	* tests/test-ceilf1.c: Likewise.
+	* tests/test-ceilf2.c: Likewise.
+	* tests/test-ceill.c: Likewise.
+	* tests/test-chown.c: Likewise.
+	* tests/test-cloexec.c: Likewise.
+	* tests/test-copy-acl.c: Likewise.
+	* tests/test-copy-file.c: Likewise.
+	* tests/test-count-one-bits.c: Likewise.
+	* tests/test-dprintf-posix.c: Likewise.
+	* tests/test-dup2.c: Likewise.
+	* tests/test-dup3.c: Likewise.
+	* tests/test-duplocale.c: Likewise.
+	* tests/test-fbufmode.c: Likewise.
+	* tests/test-fchdir.c: Likewise.
+	* tests/test-fchownat.c: Likewise.
+	* tests/test-fcntl-safer.c: Likewise.
+	* tests/test-fcntl.c: Likewise.
+	* tests/test-fdopendir.c: Likewise.
+	* tests/test-fdutimensat.c: Likewise.
+	* tests/test-fflush2.c: Likewise.
+	* tests/test-file-has-acl.c: Likewise.
+	* tests/test-filevercmp.c: Likewise.
+	* tests/test-flock.c: Likewise.
+	* tests/test-floorf1.c: Likewise.
+	* tests/test-floorf2.c: Likewise.
+	* tests/test-floorl.c: Likewise.
+	* tests/test-fnmatch.c: Likewise.
+	* tests/test-fopen.h: Likewise.
+	* tests/test-fpending.c: Likewise.
+	* tests/test-fprintf-posix.c: Likewise.
+	* tests/test-fpurge.c: Likewise.
+	* tests/test-freadable.c: Likewise.
+	* tests/test-freadahead.c: Likewise.
+	* tests/test-freading.c: Likewise.
+	* tests/test-freadptr.c: Likewise.
+	* tests/test-freadptr2.c: Likewise.
+	* tests/test-freadseek.c: Likewise.
+	* tests/test-freopen.c: Likewise.
+	* tests/test-frexp.c: Likewise.
+	* tests/test-frexpl.c: Likewise.
+	* tests/test-fseek.c: Likewise.
+	* tests/test-fseeko.c: Likewise.
+	* tests/test-fstatat.c: Likewise.
+	* tests/test-fstrcmp.c: Likewise.
+	* tests/test-fsync.c: Likewise.
+	* tests/test-ftell.c: Likewise.
+	* tests/test-ftello.c: Likewise.
+	* tests/test-func.c: Likewise.
+	* tests/test-futimens.c: Likewise.
+	* tests/test-fwritable.c: Likewise.
+	* tests/test-fwriting.c: Likewise.
+	* tests/test-getcwd.c: Likewise.
+	* tests/test-getdate.c: Likewise.
+	* tests/test-getdelim.c: Likewise.
+	* tests/test-getdtablesize.c: Likewise.
+	* tests/test-getgroups.c: Likewise.
+	* tests/test-getline.c: Likewise.
+	* tests/test-getndelim2.c: Likewise.
+	* tests/test-glob.c: Likewise.
+	* tests/test-hash.c: Likewise.
+	* tests/test-i-ring.c: Likewise.
+	* tests/test-iconv-utf.c: Likewise.
+	* tests/test-iconv.c: Likewise.
+	* tests/test-idpriv-drop.c: Likewise.
+	* tests/test-idpriv-droptemp.c: Likewise.
+	* tests/test-inet_ntop.c: Likewise.
+	* tests/test-inet_pton.c: Likewise.
+	* tests/test-isblank.c: Likewise.
+	* tests/test-isfinite.c: Likewise.
+	* tests/test-isinf.c: Likewise.
+	* tests/test-isnan.c: Likewise.
+	* tests/test-isnand.h: Likewise.
+	* tests/test-isnanf.h: Likewise.
+	* tests/test-isnanl.h: Likewise.
+	* tests/test-lchown.c: Likewise.
+	* tests/test-ldexpl.c: Likewise.
+	* tests/test-link.c: Likewise.
+	* tests/test-linkat.c: Likewise.
+	* tests/test-linked_list.c: Likewise.
+	* tests/test-linkedhash_list.c: Likewise.
+	* tests/test-localename.c: Likewise.
+	* tests/test-lseek.c: Likewise.
+	* tests/test-lstat.c: Likewise.
+	* tests/test-mbmemcasecmp.c: Likewise.
+	* tests/test-mbmemcasecoll.c: Likewise.
+	* tests/test-mbrtowc.c: Likewise.
+	* tests/test-mbscasecmp.c: Likewise.
+	* tests/test-mbscasestr1.c: Likewise.
+	* tests/test-mbscasestr2.c: Likewise.
+	* tests/test-mbscasestr3.c: Likewise.
+	* tests/test-mbscasestr4.c: Likewise.
+	* tests/test-mbschr.c: Likewise.
+	* tests/test-mbscspn.c: Likewise.
+	* tests/test-mbsinit.c: Likewise.
+	* tests/test-mbsncasecmp.c: Likewise.
+	* tests/test-mbsnrtowcs.c: Likewise.
+	* tests/test-mbspbrk.c: Likewise.
+	* tests/test-mbspcasecmp.c: Likewise.
+	* tests/test-mbsrchr.c: Likewise.
+	* tests/test-mbsrtowcs.c: Likewise.
+	* tests/test-mbsspn.c: Likewise.
+	* tests/test-mbsstr1.c: Likewise.
+	* tests/test-mbsstr2.c: Likewise.
+	* tests/test-mbsstr3.c: Likewise.
+	* tests/test-memchr.c: Likewise.
+	* tests/test-memchr2.c: Likewise.
+	* tests/test-memcmp.c: Likewise.
+	* tests/test-memmem.c: Likewise.
+	* tests/test-memrchr.c: Likewise.
+	* tests/test-mkdir.c: Likewise.
+	* tests/test-mkdirat.c: Likewise.
+	* tests/test-mkfifo.c: Likewise.
+	* tests/test-mkfifoat.c: Likewise.
+	* tests/test-mknod.c: Likewise.
+	* tests/test-nanosleep.c: Likewise.
+	* tests/test-nl_langinfo.c: Likewise.
+	* tests/test-obstack-printf.c: Likewise.
+	* tests/test-open.c: Likewise.
+	* tests/test-openat.c: Likewise.
+	* tests/test-pipe-filter-gi1.c: Likewise.
+	* tests/test-pipe-filter-gi2-main.c: Likewise.
+	* tests/test-pipe-filter-ii1.c: Likewise.
+	* tests/test-pipe-filter-ii2-main.c: Likewise.
+	* tests/test-pipe2.c: Likewise.
+	* tests/test-popen.h: Likewise.
+	* tests/test-posixtm.c: Likewise.
+	* tests/test-pread.c: Likewise.
+	* tests/test-printf-frexp.c: Likewise.
+	* tests/test-printf-frexpl.c: Likewise.
+	* tests/test-printf-posix.c: Likewise.
+	* tests/test-priv-set.c: Likewise.
+	* tests/test-quotearg.c: Likewise.
+	* tests/test-random_r.c: Likewise.
+	* tests/test-rawmemchr.c: Likewise.
+	* tests/test-rbtree_list.c: Likewise.
+	* tests/test-rbtree_oset.c: Likewise.
+	* tests/test-rbtreehash_list.c: Likewise.
+	* tests/test-readlink.c: Likewise.
+	* tests/test-remove.c: Likewise.
+	* tests/test-rename.c: Likewise.
+	* tests/test-renameat.c: Likewise.
+	* tests/test-rmdir.c: Likewise.
+	* tests/test-round1.c: Likewise.
+	* tests/test-roundf1.c: Likewise.
+	* tests/test-roundl.c: Likewise.
+	* tests/test-safe-alloc.c: Likewise.
+	* tests/test-sameacls.c: Likewise.
+	* tests/test-set-mode-acl.c: Likewise.
+	* tests/test-setenv.c: Likewise.
+	* tests/test-sigaction.c: Likewise.
+	* tests/test-signbit.c: Likewise.
+	* tests/test-sleep.c: Likewise.
+	* tests/test-snprintf-posix.c: Likewise.
+	* tests/test-snprintf.c: Likewise.
+	* tests/test-sprintf-posix.c: Likewise.
+	* tests/test-stat-time.c: Likewise.
+	* tests/test-stat.c: Likewise.
+	* tests/test-strcasestr.c: Likewise.
+	* tests/test-strchrnul.c: Likewise.
+	* tests/test-strerror.c: Likewise.
+	* tests/test-striconv.c: Likewise.
+	* tests/test-striconveh.c: Likewise.
+	* tests/test-striconveha.c: Likewise.
+	* tests/test-strsignal.c: Likewise.
+	* tests/test-strstr.c: Likewise.
+	* tests/test-strtod.c: Likewise.
+	* tests/test-strverscmp.c: Likewise.
+	* tests/test-symlink.c: Likewise.
+	* tests/test-symlinkat.c: Likewise.
+	* tests/test-trunc1.c: Likewise.
+	* tests/test-trunc2.c: Likewise.
+	* tests/test-truncf1.c: Likewise.
+	* tests/test-truncf2.c: Likewise.
+	* tests/test-truncl.c: Likewise.
+	* tests/test-uname.c: Likewise.
+	* tests/test-unlink.c: Likewise.
+	* tests/test-unlinkat.c: Likewise.
+	* tests/test-unsetenv.c: Likewise.
+	* tests/test-usleep.c: Likewise.
+	* tests/test-utimens.c: Likewise.
+	* tests/test-utimensat.c: Likewise.
+	* tests/test-vasnprintf-posix.c: Likewise.
+	* tests/test-vasnprintf-posix2.c: Likewise.
+	* tests/test-vasnprintf.c: Likewise.
+	* tests/test-vasprintf-posix.c: Likewise.
+	* tests/test-vasprintf.c: Likewise.
+	* tests/test-vdprintf-posix.c: Likewise.
+	* tests/test-vfprintf-posix.c: Likewise.
+	* tests/test-vprintf-posix.c: Likewise.
+	* tests/test-vsnprintf-posix.c: Likewise.
+	* tests/test-vsnprintf.c: Likewise.
+	* tests/test-vsprintf-posix.c: Likewise.
+	* tests/test-wcrtomb.c: Likewise.
+	* tests/test-wcsnrtombs.c: Likewise.
+	* tests/test-wcsrtombs.c: Likewise.
+	* tests/test-wctype.c: Likewise.
+	* tests/test-wcwidth.c: Likewise.
+	* tests/test-xfprintf-posix.c: Likewise.
+	* tests/test-xmemdup0.c: Likewise.
+	* tests/test-xprintf-posix.c: Likewise.
+	* tests/test-xvasprintf.c: Likewise.
+	* tests/unicase/test-locale-language.c: Likewise.
+	* tests/unicase/test-mapping-part1.h: Likewise.
+	* tests/unicase/test-predicate-part1.h: Likewise.
+	* tests/unicase/test-u8-casecmp.c: Likewise.
+	* tests/unicase/test-u8-casecoll.c: Likewise.
+	* tests/unicase/test-u8-casefold.c: Likewise.
+	* tests/unicase/test-u8-is-cased.c: Likewise.
+	* tests/unicase/test-u8-is-casefolded.c: Likewise.
+	* tests/unicase/test-u8-is-lowercase.c: Likewise.
+	* tests/unicase/test-u8-is-titlecase.c: Likewise.
+	* tests/unicase/test-u8-is-uppercase.c: Likewise.
+	* tests/unicase/test-u8-tolower.c: Likewise.
+	* tests/unicase/test-u8-totitle.c: Likewise.
+	* tests/unicase/test-u8-toupper.c: Likewise.
+	* tests/unicase/test-u16-casecmp.c: Likewise.
+	* tests/unicase/test-u16-casecoll.c: Likewise.
+	* tests/unicase/test-u16-casefold.c: Likewise.
+	* tests/unicase/test-u16-is-cased.c: Likewise.
+	* tests/unicase/test-u16-is-casefolded.c: Likewise.
+	* tests/unicase/test-u16-is-lowercase.c: Likewise.
+	* tests/unicase/test-u16-is-titlecase.c: Likewise.
+	* tests/unicase/test-u16-is-uppercase.c: Likewise.
+	* tests/unicase/test-u16-tolower.c: Likewise.
+	* tests/unicase/test-u16-totitle.c: Likewise.
+	* tests/unicase/test-u16-toupper.c: Likewise.
+	* tests/unicase/test-u32-casecmp.c: Likewise.
+	* tests/unicase/test-u32-casecoll.c: Likewise.
+	* tests/unicase/test-u32-casefold.c: Likewise.
+	* tests/unicase/test-u32-is-cased.c: Likewise.
+	* tests/unicase/test-u32-is-casefolded.c: Likewise.
+	* tests/unicase/test-u32-is-lowercase.c: Likewise.
+	* tests/unicase/test-u32-is-titlecase.c: Likewise.
+	* tests/unicase/test-u32-is-uppercase.c: Likewise.
+	* tests/unicase/test-u32-tolower.c: Likewise.
+	* tests/unicase/test-u32-totitle.c: Likewise.
+	* tests/unicase/test-u32-toupper.c: Likewise.
+	* tests/unicase/test-ulc-casecmp.c: Likewise.
+	* tests/unicase/test-ulc-casecoll.c: Likewise.
+	* tests/uniconv/test-u8-conv-from-enc.c: Likewise.
+	* tests/uniconv/test-u8-conv-to-enc.c: Likewise.
+	* tests/uniconv/test-u8-strconv-from-enc.c: Likewise.
+	* tests/uniconv/test-u8-strconv-to-enc.c: Likewise.
+	* tests/uniconv/test-u16-conv-from-enc.c: Likewise.
+	* tests/uniconv/test-u16-conv-to-enc.c: Likewise.
+	* tests/uniconv/test-u16-strconv-from-enc.c: Likewise.
+	* tests/uniconv/test-u16-strconv-to-enc.c: Likewise.
+	* tests/uniconv/test-u32-conv-from-enc.c: Likewise.
+	* tests/uniconv/test-u32-conv-to-enc.c: Likewise.
+	* tests/uniconv/test-u32-strconv-from-enc.c: Likewise.
+	* tests/uniconv/test-u32-strconv-to-enc.c: Likewise.
+	* tests/unictype/test-bidi_byname.c: Likewise.
+	* tests/unictype/test-bidi_name.c: Likewise.
+	* tests/unictype/test-bidi_of.c: Likewise.
+	* tests/unictype/test-bidi_test.c: Likewise.
+	* tests/unictype/test-block_list.c: Likewise.
+	* tests/unictype/test-block_of.c: Likewise.
+	* tests/unictype/test-block_test.c: Likewise.
+	* tests/unictype/test-categ_and.c: Likewise.
+	* tests/unictype/test-categ_and_not.c: Likewise.
+	* tests/unictype/test-categ_byname.c: Likewise.
+	* tests/unictype/test-categ_name.c: Likewise.
+	* tests/unictype/test-categ_none.c: Likewise.
+	* tests/unictype/test-categ_of.c: Likewise.
+	* tests/unictype/test-categ_or.c: Likewise.
+	* tests/unictype/test-categ_test_withtable.c: Likewise.
+	* tests/unictype/test-combining.c: Likewise.
+	* tests/unictype/test-decdigit.c: Likewise.
+	* tests/unictype/test-digit.c: Likewise.
+	* tests/unictype/test-mirror.c: Likewise.
+	* tests/unictype/test-numeric.c: Likewise.
+	* tests/unictype/test-pr_byname.c: Likewise.
+	* tests/unictype/test-pr_test.c: Likewise.
+	* tests/unictype/test-predicate-part1.h: Likewise.
+	* tests/unictype/test-scripts.c: Likewise.
+	* tests/unictype/test-sy_c_ident.c: Likewise.
+	* tests/unictype/test-sy_java_ident.c: Likewise.
+	* tests/unilbrk/test-u8-possible-linebreaks.c: Likewise.
+	* tests/unilbrk/test-u8-width-linebreaks.c: Likewise.
+	* tests/unilbrk/test-u16-possible-linebreaks.c: Likewise.
+	* tests/unilbrk/test-u16-width-linebreaks.c: Likewise.
+	* tests/unilbrk/test-u32-possible-linebreaks.c: Likewise.
+	* tests/unilbrk/test-u32-width-linebreaks.c: Likewise.
+	* tests/unilbrk/test-ulc-possible-linebreaks.c: Likewise.
+	* tests/unilbrk/test-ulc-width-linebreaks.c: Likewise.
+	* tests/uninorm/test-canonical-decomposition.c: Likewise.
+	* tests/uninorm/test-compat-decomposition.c: Likewise.
+	* tests/uninorm/test-composition.c: Likewise.
+	* tests/uninorm/test-decomposing-form.c: Likewise.
+	* tests/uninorm/test-decomposition.c: Likewise.
+	* tests/uninorm/test-u8-nfc.c: Likewise.
+	* tests/uninorm/test-u8-nfd.c: Likewise.
+	* tests/uninorm/test-u8-nfkc.c: Likewise.
+	* tests/uninorm/test-u8-nfkd.c: Likewise.
+	* tests/uninorm/test-u8-normcmp.c: Likewise.
+	* tests/uninorm/test-u8-normcoll.c: Likewise.
+	* tests/uninorm/test-u16-nfc.c: Likewise.
+	* tests/uninorm/test-u16-nfd.c: Likewise.
+	* tests/uninorm/test-u16-nfkc.c: Likewise.
+	* tests/uninorm/test-u16-nfkd.c: Likewise.
+	* tests/uninorm/test-u16-normcmp.c: Likewise.
+	* tests/uninorm/test-u16-normcoll.c: Likewise.
+	* tests/uninorm/test-u32-nfc.c: Likewise.
+	* tests/uninorm/test-u32-nfd.c: Likewise.
+	* tests/uninorm/test-u32-nfkc.c: Likewise.
+	* tests/uninorm/test-u32-nfkd.c: Likewise.
+	* tests/uninorm/test-u32-normalize-big.c: Likewise.
+	* tests/uninorm/test-u32-normcmp.c: Likewise.
+	* tests/uninorm/test-u32-normcoll.c: Likewise.
+	* tests/uninorm/test-uninorm-filter-nfc.c: Likewise.
+	* tests/unistdio/test-u8-asnprintf1.c: Likewise.
+	* tests/unistdio/test-u8-vasnprintf1.c: Likewise.
+	* tests/unistdio/test-u8-vasnprintf2.c: Likewise.
+	* tests/unistdio/test-u8-vasnprintf3.c: Likewise.
+	* tests/unistdio/test-u8-vasprintf1.c: Likewise.
+	* tests/unistdio/test-u8-vsnprintf1.c: Likewise.
+	* tests/unistdio/test-u8-vsprintf1.c: Likewise.
+	* tests/unistdio/test-u16-asnprintf1.c: Likewise.
+	* tests/unistdio/test-u16-vasnprintf1.c: Likewise.
+	* tests/unistdio/test-u16-vasnprintf2.c: Likewise.
+	* tests/unistdio/test-u16-vasnprintf3.c: Likewise.
+	* tests/unistdio/test-u16-vasprintf1.c: Likewise.
+	* tests/unistdio/test-u16-vsnprintf1.c: Likewise.
+	* tests/unistdio/test-u16-vsprintf1.c: Likewise.
+	* tests/unistdio/test-u32-asnprintf1.c: Likewise.
+	* tests/unistdio/test-u32-vasnprintf1.c: Likewise.
+	* tests/unistdio/test-u32-vasnprintf2.c: Likewise.
+	* tests/unistdio/test-u32-vasnprintf3.c: Likewise.
+	* tests/unistdio/test-u32-vasprintf1.c: Likewise.
+	* tests/unistdio/test-u32-vsnprintf1.c: Likewise.
+	* tests/unistdio/test-u32-vsprintf1.c: Likewise.
+	* tests/unistdio/test-ulc-asnprintf1.c: Likewise.
+	* tests/unistdio/test-ulc-vasnprintf1.c: Likewise.
+	* tests/unistdio/test-ulc-vasnprintf2.c: Likewise.
+	* tests/unistdio/test-ulc-vasnprintf3.c: Likewise.
+	* tests/unistdio/test-ulc-vasprintf1.c: Likewise.
+	* tests/unistdio/test-ulc-vsnprintf1.c: Likewise.
+	* tests/unistdio/test-ulc-vsprintf1.c: Likewise.
+	* tests/uniwbrk/test-u8-wordbreaks.c: Likewise.
+	* tests/uniwbrk/test-u16-wordbreaks.c: Likewise.
+	* tests/uniwbrk/test-u32-wordbreaks.c: Likewise.
+	* tests/uniwbrk/test-ulc-wordbreaks.c: Likewise.
+	* tests/uniwidth/test-u8-strwidth.c: Likewise.
+	* tests/uniwidth/test-u8-width.c: Likewise.
+	* tests/uniwidth/test-u16-strwidth.c: Likewise.
+	* tests/uniwidth/test-u16-width.c: Likewise.
+	* tests/uniwidth/test-u32-strwidth.c: Likewise.
+	* tests/uniwidth/test-u32-width.c: Likewise.
+	* tests/uniwidth/test-uc_width.c: Likewise.
+	* tests/uniwidth/test-uc_width2.c: Likewise.
+	* modules/acl-tests (Files): Add tests/macros.h.
+	* modules/areadlink-tests (Files): Likewise.
+	* modules/areadlink-with-size-tests (Files): Likewise.
+	* modules/areadlinkat-tests (Files): Likewise.
+	* modules/areadlinkat-with-size-tests (Files): Likewise.
+	* modules/argmatch-tests (Files): Likewise.
+	* modules/argv-iter-tests (Files): Likewise.
+	* modules/array-list-tests (Files): Likewise.
+	* modules/array-mergesort-tests (Files): Likewise.
+	* modules/array-oset-tests (Files): Likewise.
+	* modules/avltree-list-tests (Files): Likewise.
+	* modules/avltree-oset-tests (Files): Likewise.
+	* modules/avltreehash-list-tests (Files): Likewise.
+	* modules/base64-tests (Files): Likewise.
+	* modules/binary-io-tests (Files): Likewise.
+	* modules/bitrotate-tests (Files): Likewise.
+	* modules/btowc-tests (Files): Likewise.
+	* modules/byteswap-tests (Files): Likewise.
+	* modules/c-ctype-tests (Files): Likewise.
+	* modules/c-stack-tests (Files): Likewise.
+	* modules/c-strcase-tests (Files): Likewise.
+	* modules/c-strcasestr-tests (Files): Likewise.
+	* modules/c-strstr-tests (Files): Likewise.
+	* modules/canonicalize-lgpl-tests (Files): Likewise.
+	* modules/canonicalize-tests (Files): Likewise.
+	* modules/carray-list-tests (Files): Likewise.
+	* modules/ceilf-tests (Files): Likewise.
+	* modules/ceill-tests (Files): Likewise.
+	* modules/chown-tests (Files): Likewise.
+	* modules/cloexec-tests (Files): Likewise.
+	* modules/copy-file-tests (Files): Likewise.
+	* modules/count-one-bits-tests (Files): Likewise.
+	* modules/dprintf-posix-tests (Files): Likewise.
+	* modules/dup2-tests (Files): Likewise.
+	* modules/dup3-tests (Files): Likewise.
+	* modules/duplocale-tests (Files): Likewise.
+	* modules/fbufmode-tests (Files): Likewise.
+	* modules/fchdir-tests (Files): Likewise.
+	* modules/fcntl-safer-tests (Files): Likewise.
+	* modules/fcntl-tests (Files): Likewise.
+	* modules/fdopendir-tests (Files): Likewise.
+	* modules/fdutimensat-tests (Files): Likewise.
+	* modules/fflush-tests (Files): Likewise.
+	* modules/filevercmp-tests (Files): Likewise.
+	* modules/flock-tests (Files): Likewise.
+	* modules/floorf-tests (Files): Likewise.
+	* modules/floorl-tests (Files): Likewise.
+	* modules/fnmatch-tests (Files): Likewise.
+	* modules/fopen-safer-tests (Files): Likewise.
+	* modules/fopen-tests (Files): Likewise.
+	* modules/fpending-tests (Files): Likewise.
+	* modules/fprintf-posix-tests (Files): Likewise.
+	* modules/fpurge-tests (Files): Likewise.
+	* modules/freadable-tests (Files): Likewise.
+	* modules/freadahead-tests (Files): Likewise.
+	* modules/freading-tests (Files): Likewise.
+	* modules/freadptr-tests (Files): Likewise.
+	* modules/freadseek-tests (Files): Likewise.
+	* modules/freopen-tests (Files): Likewise.
+	* modules/frexp-nolibm-tests (Files): Likewise.
+	* modules/frexp-tests (Files): Likewise.
+	* modules/frexpl-nolibm-tests (Files): Likewise.
+	* modules/frexpl-tests (Files): Likewise.
+	* modules/fseek-tests (Files): Likewise.
+	* modules/fseeko-tests (Files): Likewise.
+	* modules/fstrcmp-tests (Files): Likewise.
+	* modules/fsync-tests (Files): Likewise.
+	* modules/ftell-tests (Files): Likewise.
+	* modules/ftello-tests (Files): Likewise.
+	* modules/func-tests (Files): Likewise.
+	* modules/futimens-tests (Files): Likewise.
+	* modules/fwritable-tests (Files): Likewise.
+	* modules/fwriting-tests (Files): Likewise.
+	* modules/getcwd-tests (Files): Likewise.
+	* modules/getdate-tests (Files): Likewise.
+	* modules/getdelim-tests (Files): Likewise.
+	* modules/getdtablesize-tests (Files): Likewise.
+	* modules/getgroups-tests (Files): Likewise.
+	* modules/getline-tests (Files): Likewise.
+	* modules/getndelim2-tests (Files): Likewise.
+	* modules/glob-tests (Files): Likewise.
+	* modules/hash-tests (Files): Likewise.
+	* modules/i-ring-tests (Files): Likewise.
+	* modules/iconv-tests (Files): Likewise.
+	* modules/iconv_open-utf-tests (Files): Likewise.
+	* modules/idpriv-drop-tests (Files): Likewise.
+	* modules/idpriv-droptemp-tests (Files): Likewise.
+	* modules/inet_ntop-tests (Files): Likewise.
+	* modules/inet_pton-tests (Files): Likewise.
+	* modules/isblank-tests (Files): Likewise.
+	* modules/isfinite-tests (Files): Likewise.
+	* modules/isinf-tests (Files): Likewise.
+	* modules/isnan-tests (Files): Likewise.
+	* modules/isnand-nolibm-tests (Files): Likewise.
+	* modules/isnand-tests (Files): Likewise.
+	* modules/isnanf-nolibm-tests (Files): Likewise.
+	* modules/isnanf-tests (Files): Likewise.
+	* modules/isnanl-nolibm-tests (Files): Likewise.
+	* modules/isnanl-tests (Files): Likewise.
+	* modules/lchown-tests (Files): Likewise.
+	* modules/ldexpl-tests (Files): Likewise.
+	* modules/link-tests (Files): Likewise.
+	* modules/linkat-tests (Files): Likewise.
+	* modules/linked-list-tests (Files): Likewise.
+	* modules/linkedhash-list-tests (Files): Likewise.
+	* modules/localename-tests (Files): Likewise.
+	* modules/lseek-tests (Files): Likewise.
+	* modules/lstat-tests (Files): Likewise.
+	* modules/mbmemcasecmp-tests (Files): Likewise.
+	* modules/mbmemcasecoll-tests (Files): Likewise.
+	* modules/mbrtowc-tests (Files): Likewise.
+	* modules/mbscasecmp-tests (Files): Likewise.
+	* modules/mbscasestr-tests (Files): Likewise.
+	* modules/mbschr-tests (Files): Likewise.
+	* modules/mbscspn-tests (Files): Likewise.
+	* modules/mbsinit-tests (Files): Likewise.
+	* modules/mbsncasecmp-tests (Files): Likewise.
+	* modules/mbsnrtowcs-tests (Files): Likewise.
+	* modules/mbspbrk-tests (Files): Likewise.
+	* modules/mbspcasecmp-tests (Files): Likewise.
+	* modules/mbsrchr-tests (Files): Likewise.
+	* modules/mbsrtowcs-tests (Files): Likewise.
+	* modules/mbsspn-tests (Files): Likewise.
+	* modules/mbsstr-tests (Files): Likewise.
+	* modules/memchr-tests (Files): Likewise.
+	* modules/memchr2-tests (Files): Likewise.
+	* modules/memcmp-tests (Files): Likewise.
+	* modules/memmem-tests (Files): Likewise.
+	* modules/memrchr-tests (Files): Likewise.
+	* modules/mkdir-tests (Files): Likewise.
+	* modules/mkfifo-tests (Files): Likewise.
+	* modules/mkfifoat-tests (Files): Likewise.
+	* modules/mknod-tests (Files): Likewise.
+	* modules/nanosleep-tests (Files): Likewise.
+	* modules/nl_langinfo-tests (Files): Likewise.
+	* modules/obstack-printf-tests (Files): Likewise.
+	* modules/open-tests (Files): Likewise.
+	* modules/openat-tests (Files): Likewise.
+	* modules/pipe-filter-gi-tests (Files): Likewise.
+	* modules/pipe-filter-ii-tests (Files): Likewise.
+	* modules/pipe2-tests (Files): Likewise.
+	* modules/popen-safer-tests (Files): Likewise.
+	* modules/popen-tests (Files): Likewise.
+	* modules/posixtm-tests (Files): Likewise.
+	* modules/pread-tests (Files): Likewise.
+	* modules/printf-frexp-tests (Files): Likewise.
+	* modules/printf-frexpl-tests (Files): Likewise.
+	* modules/printf-posix-tests (Files): Likewise.
+	* modules/priv-set-tests (Files): Likewise.
+	* modules/quotearg-tests (Files): Likewise.
+	* modules/random_r-tests (Files): Likewise.
+	* modules/rawmemchr-tests (Files): Likewise.
+	* modules/rbtree-list-tests (Files): Likewise.
+	* modules/rbtree-oset-tests (Files): Likewise.
+	* modules/rbtreehash-list-tests (Files): Likewise.
+	* modules/readlink-tests (Files): Likewise.
+	* modules/remove-tests (Files): Likewise.
+	* modules/rename-tests (Files): Likewise.
+	* modules/renameat-tests (Files): Likewise.
+	* modules/rmdir-tests (Files): Likewise.
+	* modules/round-tests (Files): Likewise.
+	* modules/roundf-tests (Files): Likewise.
+	* modules/roundl-tests (Files): Likewise.
+	* modules/safe-alloc-tests (Files): Likewise.
+	* modules/setenv-tests (Files): Likewise.
+	* modules/sigaction-tests (Files): Likewise.
+	* modules/signbit-tests (Files): Likewise.
+	* modules/sleep-tests (Files): Likewise.
+	* modules/snprintf-posix-tests (Files): Likewise.
+	* modules/snprintf-tests (Files): Likewise.
+	* modules/sprintf-posix-tests (Files): Likewise.
+	* modules/stat-tests (Files): Likewise.
+	* modules/stat-time-tests (Files): Likewise.
+	* modules/strcasestr-tests (Files): Likewise.
+	* modules/strchrnul-tests (Files): Likewise.
+	* modules/strerror-tests (Files): Likewise.
+	* modules/striconv-tests (Files): Likewise.
+	* modules/striconveh-tests (Files): Likewise.
+	* modules/striconveha-tests (Files): Likewise.
+	* modules/strsignal-tests (Files): Likewise.
+	* modules/strstr-tests (Files): Likewise.
+	* modules/strtod-tests (Files): Likewise.
+	* modules/strverscmp-tests (Files): Likewise.
+	* modules/symlink-tests (Files): Likewise.
+	* modules/symlinkat-tests (Files): Likewise.
+	* modules/trunc-tests (Files): Likewise.
+	* modules/truncf-tests (Files): Likewise.
+	* modules/truncl-tests (Files): Likewise.
+	* modules/uname-tests (Files): Likewise.
+	* modules/unicase/cased-tests (Files): Likewise.
+	* modules/unicase/ignorable-tests (Files): Likewise.
+	* modules/unicase/locale-language-tests (Files): Likewise.
+	* modules/unicase/tolower-tests (Files): Likewise.
+	* modules/unicase/totitle-tests (Files): Likewise.
+	* modules/unicase/toupper-tests (Files): Likewise.
+	* modules/unicase/u8-casecmp-tests (Files): Likewise.
+	* modules/unicase/u8-casecoll-tests (Files): Likewise.
+	* modules/unicase/u8-casefold-tests (Files): Likewise.
+	* modules/unicase/u8-is-cased-tests (Files): Likewise.
+	* modules/unicase/u8-is-casefolded-tests (Files): Likewise.
+	* modules/unicase/u8-is-lowercase-tests (Files): Likewise.
+	* modules/unicase/u8-is-titlecase-tests (Files): Likewise.
+	* modules/unicase/u8-is-uppercase-tests (Files): Likewise.
+	* modules/unicase/u8-tolower-tests (Files): Likewise.
+	* modules/unicase/u8-totitle-tests (Files): Likewise.
+	* modules/unicase/u8-toupper-tests (Files): Likewise.
+	* modules/unicase/u16-casecmp-tests (Files): Likewise.
+	* modules/unicase/u16-casecoll-tests (Files): Likewise.
+	* modules/unicase/u16-casefold-tests (Files): Likewise.
+	* modules/unicase/u16-is-cased-tests (Files): Likewise.
+	* modules/unicase/u16-is-casefolded-tests (Files): Likewise.
+	* modules/unicase/u16-is-lowercase-tests (Files): Likewise.
+	* modules/unicase/u16-is-titlecase-tests (Files): Likewise.
+	* modules/unicase/u16-is-uppercase-tests (Files): Likewise.
+	* modules/unicase/u16-tolower-tests (Files): Likewise.
+	* modules/unicase/u16-totitle-tests (Files): Likewise.
+	* modules/unicase/u16-toupper-tests (Files): Likewise.
+	* modules/unicase/u32-casecmp-tests (Files): Likewise.
+	* modules/unicase/u32-casecoll-tests (Files): Likewise.
+	* modules/unicase/u32-casefold-tests (Files): Likewise.
+	* modules/unicase/u32-is-cased-tests (Files): Likewise.
+	* modules/unicase/u32-is-casefolded-tests (Files): Likewise.
+	* modules/unicase/u32-is-lowercase-tests (Files): Likewise.
+	* modules/unicase/u32-is-titlecase-tests (Files): Likewise.
+	* modules/unicase/u32-is-uppercase-tests (Files): Likewise.
+	* modules/unicase/u32-tolower-tests (Files): Likewise.
+	* modules/unicase/u32-totitle-tests (Files): Likewise.
+	* modules/unicase/u32-toupper-tests (Files): Likewise.
+	* modules/unicase/ulc-casecmp-tests (Files): Likewise.
+	* modules/unicase/ulc-casecoll-tests (Files): Likewise.
+	* modules/uniconv/u8-conv-from-enc-tests (Files): Likewise.
+	* modules/uniconv/u8-conv-to-enc-tests (Files): Likewise.
+	* modules/uniconv/u8-strconv-from-enc-tests (Files): Likewise.
+	* modules/uniconv/u8-strconv-to-enc-tests (Files): Likewise.
+	* modules/uniconv/u16-conv-from-enc-tests (Files): Likewise.
+	* modules/uniconv/u16-conv-to-enc-tests (Files): Likewise.
+	* modules/uniconv/u16-strconv-from-enc-tests (Files): Likewise.
+	* modules/uniconv/u16-strconv-to-enc-tests (Files): Likewise.
+	* modules/uniconv/u32-conv-from-enc-tests (Files): Likewise.
+	* modules/uniconv/u32-conv-to-enc-tests (Files): Likewise.
+	* modules/uniconv/u32-strconv-from-enc-tests (Files): Likewise.
+	* modules/uniconv/u32-strconv-to-enc-tests (Files): Likewise.
+	* modules/unictype/bidicategory-byname-tests (Files): Likewise.
+	* modules/unictype/bidicategory-name-tests (Files): Likewise.
+	* modules/unictype/bidicategory-of-tests (Files): Likewise.
+	* modules/unictype/bidicategory-test-tests (Files): Likewise.
+	* modules/unictype/block-list-tests (Files): Likewise.
+	* modules/unictype/block-of-tests (Files): Likewise.
+	* modules/unictype/block-test-tests (Files): Likewise.
+	* modules/unictype/category-C-tests (Files): Likewise.
+	* modules/unictype/category-Cc-tests (Files): Likewise.
+	* modules/unictype/category-Cf-tests (Files): Likewise.
+	* modules/unictype/category-Cn-tests (Files): Likewise.
+	* modules/unictype/category-Co-tests (Files): Likewise.
+	* modules/unictype/category-Cs-tests (Files): Likewise.
+	* modules/unictype/category-L-tests (Files): Likewise.
+	* modules/unictype/category-Ll-tests (Files): Likewise.
+	* modules/unictype/category-Lm-tests (Files): Likewise.
+	* modules/unictype/category-Lo-tests (Files): Likewise.
+	* modules/unictype/category-Lt-tests (Files): Likewise.
+	* modules/unictype/category-Lu-tests (Files): Likewise.
+	* modules/unictype/category-M-tests (Files): Likewise.
+	* modules/unictype/category-Mc-tests (Files): Likewise.
+	* modules/unictype/category-Me-tests (Files): Likewise.
+	* modules/unictype/category-Mn-tests (Files): Likewise.
+	* modules/unictype/category-N-tests (Files): Likewise.
+	* modules/unictype/category-Nd-tests (Files): Likewise.
+	* modules/unictype/category-Nl-tests (Files): Likewise.
+	* modules/unictype/category-No-tests (Files): Likewise.
+	* modules/unictype/category-P-tests (Files): Likewise.
+	* modules/unictype/category-Pc-tests (Files): Likewise.
+	* modules/unictype/category-Pd-tests (Files): Likewise.
+	* modules/unictype/category-Pe-tests (Files): Likewise.
+	* modules/unictype/category-Pf-tests (Files): Likewise.
+	* modules/unictype/category-Pi-tests (Files): Likewise.
+	* modules/unictype/category-Po-tests (Files): Likewise.
+	* modules/unictype/category-Ps-tests (Files): Likewise.
+	* modules/unictype/category-S-tests (Files): Likewise.
+	* modules/unictype/category-Sc-tests (Files): Likewise.
+	* modules/unictype/category-Sk-tests (Files): Likewise.
+	* modules/unictype/category-Sm-tests (Files): Likewise.
+	* modules/unictype/category-So-tests (Files): Likewise.
+	* modules/unictype/category-Z-tests (Files): Likewise.
+	* modules/unictype/category-Zl-tests (Files): Likewise.
+	* modules/unictype/category-Zp-tests (Files): Likewise.
+	* modules/unictype/category-Zs-tests (Files): Likewise.
+	* modules/unictype/category-and-not-tests (Files): Likewise.
+	* modules/unictype/category-and-tests (Files): Likewise.
+	* modules/unictype/category-byname-tests (Files): Likewise.
+	* modules/unictype/category-name-tests (Files): Likewise.
+	* modules/unictype/category-none-tests (Files): Likewise.
+	* modules/unictype/category-of-tests (Files): Likewise.
+	* modules/unictype/category-or-tests (Files): Likewise.
+	* modules/unictype/category-test-withtable-tests (Files): Likewise.
+	* modules/unictype/combining-class-tests (Files): Likewise.
+	* modules/unictype/ctype-alnum-tests (Files): Likewise.
+	* modules/unictype/ctype-alpha-tests (Files): Likewise.
+	* modules/unictype/ctype-blank-tests (Files): Likewise.
+	* modules/unictype/ctype-cntrl-tests (Files): Likewise.
+	* modules/unictype/ctype-digit-tests (Files): Likewise.
+	* modules/unictype/ctype-graph-tests (Files): Likewise.
+	* modules/unictype/ctype-lower-tests (Files): Likewise.
+	* modules/unictype/ctype-print-tests (Files): Likewise.
+	* modules/unictype/ctype-punct-tests (Files): Likewise.
+	* modules/unictype/ctype-space-tests (Files): Likewise.
+	* modules/unictype/ctype-upper-tests (Files): Likewise.
+	* modules/unictype/ctype-xdigit-tests (Files): Likewise.
+	* modules/unictype/decimal-digit-tests (Files): Likewise.
+	* modules/unictype/digit-tests (Files): Likewise.
+	* modules/unictype/mirror-tests (Files): Likewise.
+	* modules/unictype/numeric-tests (Files): Likewise.
+	* modules/unictype/property-alphabetic-tests (Files): Likewise.
+	* modules/unictype/property-ascii-hex-digit-tests (Files): Likewise.
+	* modules/unictype/property-bidi-arabic-digit-tests (Files): Likewise.
+	* modules/unictype/property-bidi-arabic-right-to-left-tests (Files):
+	Likewise.
+	* modules/unictype/property-bidi-block-separator-tests (Files):
+	Likewise.
+	* modules/unictype/property-bidi-boundary-neutral-tests (Files):
+	Likewise.
+	* modules/unictype/property-bidi-common-separator-tests (Files):
+	Likewise.
+	* modules/unictype/property-bidi-control-tests (Files): Likewise.
+	* modules/unictype/property-bidi-embedding-or-override-tests (Files):
+	Likewise.
+	* modules/unictype/property-bidi-eur-num-separator-tests (Files):
+	Likewise.
+	* modules/unictype/property-bidi-eur-num-terminator-tests (Files):
+	Likewise.
+	* modules/unictype/property-bidi-european-digit-tests (Files): Likewise.
+	* modules/unictype/property-bidi-hebrew-right-to-left-tests (Files):
+	Likewise.
+	* modules/unictype/property-bidi-left-to-right-tests (Files): Likewise.
+	* modules/unictype/property-bidi-non-spacing-mark-tests (Files):
+	Likewise.
+	* modules/unictype/property-bidi-other-neutral-tests (Files): Likewise.
+	* modules/unictype/property-bidi-pdf-tests (Files): Likewise.
+	* modules/unictype/property-bidi-segment-separator-tests (Files):
+	Likewise.
+	* modules/unictype/property-bidi-whitespace-tests (Files): Likewise.
+	* modules/unictype/property-byname-tests (Files): Likewise.
+	* modules/unictype/property-combining-tests (Files): Likewise.
+	* modules/unictype/property-composite-tests (Files): Likewise.
+	* modules/unictype/property-currency-symbol-tests (Files): Likewise.
+	* modules/unictype/property-dash-tests (Files): Likewise.
+	* modules/unictype/property-decimal-digit-tests (Files): Likewise.
+	* modules/unictype/property-default-ignorable-code-point-tests (Files):
+	Likewise.
+	* modules/unictype/property-deprecated-tests (Files): Likewise.
+	* modules/unictype/property-diacritic-tests (Files): Likewise.
+	* modules/unictype/property-extender-tests (Files): Likewise.
+	* modules/unictype/property-format-control-tests (Files): Likewise.
+	* modules/unictype/property-grapheme-base-tests (Files): Likewise.
+	* modules/unictype/property-grapheme-extend-tests (Files): Likewise.
+	* modules/unictype/property-grapheme-link-tests (Files): Likewise.
+	* modules/unictype/property-hex-digit-tests (Files): Likewise.
+	* modules/unictype/property-hyphen-tests (Files): Likewise.
+	* modules/unictype/property-id-continue-tests (Files): Likewise.
+	* modules/unictype/property-id-start-tests (Files): Likewise.
+	* modules/unictype/property-ideographic-tests (Files): Likewise.
+	* modules/unictype/property-ids-binary-operator-tests (Files): Likewise.
+	* modules/unictype/property-ids-trinary-operator-tests (Files):
+	Likewise.
+	* modules/unictype/property-ignorable-control-tests (Files): Likewise.
+	* modules/unictype/property-iso-control-tests (Files): Likewise.
+	* modules/unictype/property-join-control-tests (Files): Likewise.
+	* modules/unictype/property-left-of-pair-tests (Files): Likewise.
+	* modules/unictype/property-line-separator-tests (Files): Likewise.
+	* modules/unictype/property-logical-order-exception-tests (Files):
+	Likewise.
+	* modules/unictype/property-lowercase-tests (Files): Likewise.
+	* modules/unictype/property-math-tests (Files): Likewise.
+	* modules/unictype/property-non-break-tests (Files): Likewise.
+	* modules/unictype/property-not-a-character-tests (Files): Likewise.
+	* modules/unictype/property-numeric-tests (Files): Likewise.
+	* modules/unictype/property-other-alphabetic-tests (Files): Likewise.
+	* modules/unictype/property-other-default-ignorable-code-point-tests
+	(Files): Likewise.
+	* modules/unictype/property-other-grapheme-extend-tests (Files):
+	Likewise.
+	* modules/unictype/property-other-id-continue-tests (Files): Likewise.
+	* modules/unictype/property-other-id-start-tests (Files): Likewise.
+	* modules/unictype/property-other-lowercase-tests (Files): Likewise.
+	* modules/unictype/property-other-math-tests (Files): Likewise.
+	* modules/unictype/property-other-uppercase-tests (Files): Likewise.
+	* modules/unictype/property-paired-punctuation-tests (Files): Likewise.
+	* modules/unictype/property-paragraph-separator-tests (Files): Likewise.
+	* modules/unictype/property-pattern-syntax-tests (Files): Likewise.
+	* modules/unictype/property-pattern-white-space-tests (Files): Likewise.
+	* modules/unictype/property-private-use-tests (Files): Likewise.
+	* modules/unictype/property-punctuation-tests (Files): Likewise.
+	* modules/unictype/property-quotation-mark-tests (Files): Likewise.
+	* modules/unictype/property-radical-tests (Files): Likewise.
+	* modules/unictype/property-sentence-terminal-tests (Files): Likewise.
+	* modules/unictype/property-soft-dotted-tests (Files): Likewise.
+	* modules/unictype/property-space-tests (Files): Likewise.
+	* modules/unictype/property-terminal-punctuation-tests (Files):
+	Likewise.
+	* modules/unictype/property-test-tests (Files): Likewise.
+	* modules/unictype/property-titlecase-tests (Files): Likewise.
+	* modules/unictype/property-unassigned-code-value-tests (Files):
+	Likewise.
+	* modules/unictype/property-unified-ideograph-tests (Files): Likewise.
+	* modules/unictype/property-uppercase-tests (Files): Likewise.
+	* modules/unictype/property-variation-selector-tests (Files): Likewise.
+	* modules/unictype/property-white-space-tests (Files): Likewise.
+	* modules/unictype/property-xid-continue-tests (Files): Likewise.
+	* modules/unictype/property-xid-start-tests (Files): Likewise.
+	* modules/unictype/property-zero-width-tests (Files): Likewise.
+	* modules/unictype/scripts-tests (Files): Likewise.
+	* modules/unictype/syntax-c-ident-tests (Files): Likewise.
+	* modules/unictype/syntax-c-whitespace-tests (Files): Likewise.
+	* modules/unictype/syntax-java-ident-tests (Files): Likewise.
+	* modules/unictype/syntax-java-whitespace-tests (Files): Likewise.
+	* modules/unilbrk/u8-possible-linebreaks-tests (Files): Likewise.
+	* modules/unilbrk/u8-width-linebreaks-tests (Files): Likewise.
+	* modules/unilbrk/u16-possible-linebreaks-tests (Files): Likewise.
+	* modules/unilbrk/u16-width-linebreaks-tests (Files): Likewise.
+	* modules/unilbrk/u32-possible-linebreaks-tests (Files): Likewise.
+	* modules/unilbrk/u32-width-linebreaks-tests (Files): Likewise.
+	* modules/unilbrk/ulc-possible-linebreaks-tests (Files): Likewise.
+	* modules/unilbrk/ulc-width-linebreaks-tests (Files): Likewise.
+	* modules/uninorm/canonical-decomposition-tests (Files): Likewise.
+	* modules/uninorm/compat-decomposition-tests (Files): Likewise.
+	* modules/uninorm/composition-tests (Files): Likewise.
+	* modules/uninorm/decomposing-form-tests (Files): Likewise.
+	* modules/uninorm/decomposition-tests (Files): Likewise.
+	* modules/uninorm/filter-tests (Files): Likewise.
+	* modules/uninorm/nfc-tests (Files): Likewise.
+	* modules/uninorm/nfd-tests (Files): Likewise.
+	* modules/uninorm/nfkc-tests (Files): Likewise.
+	* modules/uninorm/nfkd-tests (Files): Likewise.
+	* modules/uninorm/u8-normcmp-tests (Files): Likewise.
+	* modules/uninorm/u8-normcoll-tests (Files): Likewise.
+	* modules/uninorm/u16-normcmp-tests (Files): Likewise.
+	* modules/uninorm/u16-normcoll-tests (Files): Likewise.
+	* modules/uninorm/u32-normcmp-tests (Files): Likewise.
+	* modules/uninorm/u32-normcoll-tests (Files): Likewise.
+	* modules/unistdio/u8-asnprintf-tests (Files): Likewise.
+	* modules/unistdio/u8-vasnprintf-tests (Files): Likewise.
+	* modules/unistdio/u8-vasprintf-tests (Files): Likewise.
+	* modules/unistdio/u8-vsnprintf-tests (Files): Likewise.
+	* modules/unistdio/u8-vsprintf-tests (Files): Likewise.
+	* modules/unistdio/u16-asnprintf-tests (Files): Likewise.
+	* modules/unistdio/u16-vasnprintf-tests (Files): Likewise.
+	* modules/unistdio/u16-vasprintf-tests (Files): Likewise.
+	* modules/unistdio/u16-vsnprintf-tests (Files): Likewise.
+	* modules/unistdio/u16-vsprintf-tests (Files): Likewise.
+	* modules/unistdio/u32-asnprintf-tests (Files): Likewise.
+	* modules/unistdio/u32-vasnprintf-tests (Files): Likewise.
+	* modules/unistdio/u32-vasprintf-tests (Files): Likewise.
+	* modules/unistdio/u32-vsnprintf-tests (Files): Likewise.
+	* modules/unistdio/u32-vsprintf-tests (Files): Likewise.
+	* modules/unistdio/ulc-asnprintf-tests (Files): Likewise.
+	* modules/unistdio/ulc-vasnprintf-tests (Files): Likewise.
+	* modules/unistdio/ulc-vasprintf-tests (Files): Likewise.
+	* modules/unistdio/ulc-vsnprintf-tests (Files): Likewise.
+	* modules/unistdio/ulc-vsprintf-tests (Files): Likewise.
+	* modules/uniwbrk/u8-wordbreaks-tests (Files): Likewise.
+	* modules/uniwbrk/u16-wordbreaks-tests (Files): Likewise.
+	* modules/uniwbrk/u32-wordbreaks-tests (Files): Likewise.
+	* modules/uniwbrk/ulc-wordbreaks-tests (Files): Likewise.
+	* modules/uniwidth/u8-strwidth-tests (Files): Likewise.
+	* modules/uniwidth/u8-width-tests (Files): Likewise.
+	* modules/uniwidth/u16-strwidth-tests (Files): Likewise.
+	* modules/uniwidth/u16-width-tests (Files): Likewise.
+	* modules/uniwidth/u32-strwidth-tests (Files): Likewise.
+	* modules/uniwidth/u32-width-tests (Files): Likewise.
+	* modules/uniwidth/width-tests (Files): Likewise.
+	* modules/unlink-tests (Files): Likewise.
+	* modules/unsetenv-tests (Files): Likewise.
+	* modules/usleep-tests (Files): Likewise.
+	* modules/utimens-tests (Files): Likewise.
+	* modules/utimensat-tests (Files): Likewise.
+	* modules/vasnprintf-posix-tests (Files): Likewise.
+	* modules/vasnprintf-tests (Files): Likewise.
+	* modules/vasprintf-posix-tests (Files): Likewise.
+	* modules/vasprintf-tests (Files): Likewise.
+	* modules/vdprintf-posix-tests (Files): Likewise.
+	* modules/vfprintf-posix-tests (Files): Likewise.
+	* modules/vprintf-posix-tests (Files): Likewise.
+	* modules/vsnprintf-posix-tests (Files): Likewise.
+	* modules/vsnprintf-tests (Files): Likewise.
+	* modules/vsprintf-posix-tests (Files): Likewise.
+	* modules/wcrtomb-tests (Files): Likewise.
+	* modules/wcsnrtombs-tests (Files): Likewise.
+	* modules/wcsrtombs-tests (Files): Likewise.
+	* modules/wctype-tests (Files): Likewise.
+	* modules/wcwidth-tests (Files): Likewise.
+	* modules/xmemdup0-tests (Files): Likewise.
+	* modules/xprintf-posix-tests (Files): Likewise.
+	* modules/xvasprintf-tests (Files): Likewise.
+
 2009-12-24  Eric Blake  <ebb9@byu.net>
 
 	test-nanosleep: fix typo
--- a/modules/acl-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/acl-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -6,6 +6,7 @@
 tests/test-set-mode-acl.c
 tests/test-copy-acl.c
 tests/test-sameacls.c
+tests/macros.h
 
 Depends-on:
 progname
--- a/modules/areadlink-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/areadlink-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-areadlink.h
 tests/test-areadlink.c
+tests/macros.h
 
 Depends-on:
 stdbool
--- a/modules/areadlink-with-size-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/areadlink-with-size-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-areadlink.h
 tests/test-areadlink-with-size.c
+tests/macros.h
 
 Depends-on:
 stdbool
--- a/modules/areadlinkat-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/areadlinkat-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-areadlink.h
 tests/test-areadlinkat.c
+tests/macros.h
 
 Depends-on:
 stdbool
--- a/modules/areadlinkat-with-size-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/areadlinkat-with-size-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-areadlink.h
 tests/test-areadlinkat-with-size.c
+tests/macros.h
 
 Depends-on:
 stdbool
--- a/modules/argmatch-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/argmatch-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-argmatch.c
+tests/macros.h
 
 Depends-on:
 progname
--- a/modules/argv-iter-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/argv-iter-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-argv-iter.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/array-list-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/array-list-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-array_list.c
+tests/macros.h
 
 Depends-on:
 progname
--- a/modules/array-mergesort-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/array-mergesort-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-array-mergesort.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/array-oset-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/array-oset-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-array_oset.c
+tests/macros.h
 
 Depends-on:
 xlist
--- a/modules/avltree-list-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/avltree-list-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-avltree_list.c
+tests/macros.h
 
 Depends-on:
 array-list
--- a/modules/avltree-oset-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/avltree-oset-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-avltree_oset.c
+tests/macros.h
 
 Depends-on:
 array-oset
--- a/modules/avltreehash-list-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/avltreehash-list-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-avltreehash_list.c
+tests/macros.h
 
 Depends-on:
 array-list
--- a/modules/base64-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/base64-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-base64.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/binary-io-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/binary-io-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-binary-io.sh
 tests/test-binary-io.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/bitrotate-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/bitrotate-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-bitrotate.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/btowc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/btowc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,8 +1,9 @@
 Files:
-tests/signature.h
 tests/test-btowc1.sh
 tests/test-btowc2.sh
 tests/test-btowc.c
+tests/signature.h
+tests/macros.h
 m4/locale-fr.m4
 m4/codeset.m4
 
--- a/modules/byteswap-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/byteswap-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-byteswap.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/c-ctype-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/c-ctype-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-c-ctype.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/c-stack-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/c-stack-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/test-c-stack.c
 tests/test-c-stack.sh
 tests/test-c-stack2.sh
+tests/macros.h
 
 Depends-on:
 exitfail
--- a/modules/c-strcase-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/c-strcase-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/test-c-strcase.sh
 tests/test-c-strcasecmp.c
 tests/test-c-strncasecmp.c
+tests/macros.h
 m4/locale-fr.m4
 m4/locale-tr.m4
 m4/codeset.m4
--- a/modules/c-strcasestr-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/c-strcasestr-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-c-strcasestr.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/c-strstr-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/c-strstr-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-c-strstr.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/canonicalize-lgpl-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/canonicalize-lgpl-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-canonicalize-lgpl.c
 tests/signature.h
-tests/test-canonicalize-lgpl.c
+tests/macros.h
 
 Depends-on:
 same-inode
--- a/modules/canonicalize-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/canonicalize-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-canonicalize.c
+tests/macros.h
 
 Depends-on:
 progname
--- a/modules/carray-list-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/carray-list-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-carray_list.c
+tests/macros.h
 
 Depends-on:
 array-list
--- a/modules/ceilf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/ceilf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,8 +1,9 @@
 Files:
-tests/signature.h
 tests/test-ceilf1.c
 tests/test-ceilf2.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 float
--- a/modules/ceill-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/ceill-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-ceill.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 fpucw
--- a/modules/chown-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/chown-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,8 +1,9 @@
 Files:
-tests/signature.h
 tests/nap.h
 tests/test-chown.h
 tests/test-chown.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 lstat
--- a/modules/cloexec-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/cloexec-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-cloexec.c
+tests/macros.h
 
 Depends-on:
 binary-io
--- a/modules/copy-file-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/copy-file-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-copy-file.sh
 tests/test-copy-file.c
+tests/macros.h
 
 Depends-on:
 acl
--- a/modules/count-one-bits-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/count-one-bits-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-count-one-bits.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/dprintf-posix-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/dprintf-posix-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,10 +1,11 @@
 Files:
-tests/signature.h
 tests/test-dprintf-posix.sh
 tests/test-dprintf-posix.c
 tests/test-printf-posix.output
 tests/test-dprintf-posix2.sh
 tests/test-dprintf-posix2.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdint
--- a/modules/dup2-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/dup2-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-dup2.c
 tests/signature.h
-tests/test-dup2.c
+tests/macros.h
 
 Depends-on:
 binary-io
--- a/modules/dup3-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/dup3-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-dup3.c
 tests/signature.h
-tests/test-dup3.c
+tests/macros.h
 
 Depends-on:
 open
--- a/modules/duplocale-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/duplocale-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-duplocale.c
 tests/signature.h
-tests/test-duplocale.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/fbufmode-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fbufmode-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-fbufmode.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/fchdir-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fchdir-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-fchdir.c
 tests/signature.h
-tests/test-fchdir.c
+tests/macros.h
 
 Depends-on:
 getcwd
--- a/modules/fcntl-safer-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fcntl-safer-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-open.h
 tests/test-fcntl-safer.c
+tests/macros.h
 
 Depends-on:
 stdbool
--- a/modules/fcntl-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fcntl-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-fcntl.c
 tests/signature.h
-tests/test-fcntl.c
+tests/macros.h
 
 Depends-on:
 binary-io
--- a/modules/fdopendir-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fdopendir-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-fdopendir.c
 tests/signature.h
-tests/test-fdopendir.c
+tests/macros.h
 
 Depends-on:
 open
--- a/modules/fdutimensat-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fdutimensat-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -5,6 +5,7 @@
 tests/test-utimens.h
 tests/test-utimens-common.h
 tests/test-fdutimensat.c
+tests/macros.h
 
 Depends-on:
 progname
--- a/modules/fflush-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fflush-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,8 +1,9 @@
 Files:
-tests/signature.h
 tests/test-fflush.c
 tests/test-fflush2.sh
 tests/test-fflush2.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 binary-io
--- a/modules/filevercmp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/filevercmp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-filevercmp.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/flock-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/flock-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-flock.c
 tests/signature.h
-tests/test-flock.c
+tests/macros.h
 
 Depends-on:
 unistd
--- a/modules/floorf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/floorf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,8 +1,9 @@
 Files:
-tests/signature.h
 tests/test-floorf1.c
 tests/test-floorf2.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 float
--- a/modules/floorl-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/floorl-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-floorl.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 fpucw
--- a/modules/fnmatch-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fnmatch-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-fnmatch.c
 tests/signature.h
-tests/test-fnmatch.c
+tests/macros.h
 
 Makefile.am:
 TESTS += test-fnmatch
--- a/modules/fopen-safer-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fopen-safer-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-fopen.h
 tests/test-fopen-safer.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/fopen-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fopen-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-fopen.h
 tests/test-fopen.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/fpending-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fpending-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-fpending.c
 tests/test-fpending.sh
+tests/macros.h
 
 Depends-on:
 
--- a/modules/fprintf-posix-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fprintf-posix-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,4 @@
 Files:
-tests/signature.h
 tests/test-fprintf-posix.sh
 tests/test-fprintf-posix.c
 tests/test-fprintf-posix.h
@@ -8,6 +7,8 @@
 tests/test-fprintf-posix2.c
 tests/test-fprintf-posix3.sh
 tests/test-fprintf-posix3.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdint
--- a/modules/fpurge-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fpurge-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-fpurge.c
+tests/macros.h
 
 Depends-on:
 fflush
--- a/modules/freadable-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/freadable-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-freadable.c
+tests/macros.h
 
 Depends-on:
 fflush
--- a/modules/freadahead-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/freadahead-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-freadahead.c
 tests/test-freadahead.sh
+tests/macros.h
 
 Depends-on:
 lseek
--- a/modules/freading-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/freading-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-freading.c
+tests/macros.h
 
 Depends-on:
 fflush
--- a/modules/freadptr-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/freadptr-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -3,6 +3,7 @@
 tests/test-freadptr.sh
 tests/test-freadptr2.c
 tests/test-freadptr2.sh
+tests/macros.h
 
 Depends-on:
 lseek
--- a/modules/freadseek-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/freadseek-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-freadseek.c
 tests/test-freadseek.sh
+tests/macros.h
 
 Depends-on:
 unistd
--- a/modules/freopen-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/freopen-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-freopen.c
 tests/signature.h
-tests/test-freopen.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/frexp-nolibm-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/frexp-nolibm-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-frexp.c
 tests/signature.h
-tests/test-frexp.c
+tests/macros.h
 
 Depends-on:
 isnand-nolibm
--- a/modules/frexp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/frexp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-frexp.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 isnand-nolibm
--- a/modules/frexpl-nolibm-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/frexpl-nolibm-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-frexpl.c
 tests/signature.h
-tests/test-frexpl.c
+tests/macros.h
 
 Depends-on:
 fpucw
--- a/modules/frexpl-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/frexpl-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-frexpl.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 fpucw
--- a/modules/fseek-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fseek-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,8 +1,9 @@
 Files:
-tests/signature.h
 tests/test-fseek.c
 tests/test-fseek.sh
 tests/test-fseek2.sh
+tests/signature.h
+tests/macros.h
 m4/ungetc.m4
 
 Depends-on:
--- a/modules/fseeko-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fseeko-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,8 +1,9 @@
 Files:
-tests/signature.h
 tests/test-fseeko.c
 tests/test-fseeko.sh
 tests/test-fseeko2.sh
+tests/signature.h
+tests/macros.h
 m4/ungetc.m4
 
 Depends-on:
--- a/modules/fstrcmp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fstrcmp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-fstrcmp.c
+tests/macros.h
 
 Depends-on:
 stdbool
--- a/modules/fsync-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fsync-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-fsync.c
 tests/signature.h
-tests/test-fsync.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/ftell-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/ftell-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,8 +1,9 @@
 Files:
-tests/signature.h
 tests/test-ftell.c
 tests/test-ftell.sh
 tests/test-ftell2.sh
+tests/signature.h
+tests/macros.h
 m4/ungetc.m4
 
 Depends-on:
--- a/modules/ftello-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/ftello-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,8 +1,9 @@
 Files:
-tests/signature.h
 tests/test-ftello.c
 tests/test-ftello.sh
 tests/test-ftello2.sh
+tests/signature.h
+tests/macros.h
 m4/ungetc.m4
 
 Depends-on:
--- a/modules/func-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/func-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-func.c
+tests/macros.h
 
 configure.ac:
 
--- a/modules/futimens-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/futimens-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,9 +1,10 @@
 Files:
-tests/signature.h
 tests/nap.h
 tests/test-futimens.h
 tests/test-utimens-common.h
 tests/test-futimens.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 timespec
--- a/modules/fwritable-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fwritable-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-fwritable.c
+tests/macros.h
 
 Depends-on:
 fflush
--- a/modules/fwriting-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/fwriting-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-fwriting.c
+tests/macros.h
 
 Depends-on:
 fflush
--- a/modules/getcwd-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/getcwd-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-getcwd.c
 tests/signature.h
-tests/test-getcwd.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/getdate-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/getdate-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-getdate.c
+tests/macros.h
 
 Depends-on:
 progname
--- a/modules/getdelim-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/getdelim-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-getdelim.c
 tests/signature.h
-tests/test-getdelim.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/getdtablesize-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/getdtablesize-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-getdtablesize.c
 tests/signature.h
-tests/test-getdtablesize.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/getgroups-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/getgroups-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-getgroups.c
 tests/signature.h
-tests/test-getgroups.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/getline-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/getline-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-getline.c
 tests/signature.h
-tests/test-getline.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/getndelim2-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/getndelim2-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-getndelim2.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/glob-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/glob-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-glob.c
 tests/signature.h
-tests/test-glob.c
+tests/macros.h
 
 Makefile.am:
 TESTS += test-glob
--- a/modules/hash-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/hash-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-hash.c
+tests/macros.h
 
 Depends-on:
 hash-pjw
--- a/modules/i-ring-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/i-ring-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-i-ring.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/iconv-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/iconv-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-iconv.c
 tests/signature.h
-tests/test-iconv.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/iconv_open-utf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/iconv_open-utf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-iconv-utf.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/idpriv-drop-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/idpriv-drop-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -7,6 +7,7 @@
 tests/test-idpriv-drop.sh
 tests/test-idpriv-drop.su.sh
 tests/test-idpriv-drop.c
+tests/macros.h
 
 Depends-on:
 stdbool
--- a/modules/idpriv-droptemp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/idpriv-droptemp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -7,6 +7,7 @@
 tests/test-idpriv-droptemp.sh
 tests/test-idpriv-droptemp.su.sh
 tests/test-idpriv-droptemp.c
+tests/macros.h
 
 Depends-on:
 stdbool
--- a/modules/inet_ntop-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/inet_ntop-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-inet_ntop.c
 tests/signature.h
-tests/test-inet_ntop.c
+tests/macros.h
 
 Depends-on:
 netinet_in
--- a/modules/inet_pton-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/inet_pton-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-inet_pton.c
 tests/signature.h
-tests/test-inet_pton.c
+tests/macros.h
 
 Depends-on:
 netinet_in
--- a/modules/isblank-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/isblank-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-isblank.c
 tests/signature.h
-tests/test-isblank.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/isfinite-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/isfinite-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-isfinite.c
+tests/macros.h
 
 Depends-on:
 float
--- a/modules/isinf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/isinf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -3,6 +3,7 @@
 m4/exponentd.m4
 m4/exponentl.m4
 tests/test-isinf.c
+tests/macros.h
 
 Depends-on:
 float
--- a/modules/isnan-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/isnan-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-isnan.c
 tests/nan.h
+tests/macros.h
 
 Depends-on:
 float
--- a/modules/isnand-nolibm-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/isnand-nolibm-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/test-isnand-nolibm.c
 tests/test-isnand.h
 tests/nan.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/isnand-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/isnand-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/test-isnand.c
 tests/test-isnand.h
 tests/nan.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/isnanf-nolibm-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/isnanf-nolibm-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/test-isnanf-nolibm.c
 tests/test-isnanf.h
 tests/nan.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/isnanf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/isnanf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/test-isnanf.c
 tests/test-isnanf.h
 tests/nan.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/isnanl-nolibm-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/isnanl-nolibm-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/test-isnanl-nolibm.c
 tests/test-isnanl.h
 tests/nan.h
+tests/macros.h
 
 Depends-on:
 float
--- a/modules/isnanl-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/isnanl-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/test-isnanl.c
 tests/test-isnanl.h
 tests/nan.h
+tests/macros.h
 
 Depends-on:
 float
--- a/modules/lchown-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/lchown-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,8 +1,9 @@
 Files:
-tests/signature.h
 tests/nap.h
 tests/test-lchown.h
 tests/test-lchown.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 mgetgroups
--- a/modules/ldexpl-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/ldexpl-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-ldexpl.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 fpucw
--- a/modules/link-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/link-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-link.h
 tests/test-link.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 errno
--- a/modules/linkat-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/linkat-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-link.h
 tests/test-linkat.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 areadlink-with-size
--- a/modules/linked-list-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/linked-list-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-linked_list.c
+tests/macros.h
 
 Depends-on:
 array-list
--- a/modules/linkedhash-list-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/linkedhash-list-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-linkedhash_list.c
+tests/macros.h
 
 Depends-on:
 array-list
--- a/modules/localename-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/localename-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-localename.c
+tests/macros.h
 
 Depends-on:
 locale
--- a/modules/lseek-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/lseek-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-lseek.c
 tests/test-lseek.sh
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/lstat-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/lstat-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-lstat.h
 tests/test-lstat.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 errno
--- a/modules/mbmemcasecmp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mbmemcasecmp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -4,6 +4,7 @@
 tests/test-mbmemcasecmp3.sh
 tests/test-mbmemcasecmp.c
 tests/test-mbmemcasecmp.h
+tests/macros.h
 m4/locale-fr.m4
 m4/locale-tr.m4
 m4/codeset.m4
--- a/modules/mbmemcasecoll-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mbmemcasecoll-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -4,6 +4,7 @@
 tests/test-mbmemcasecoll3.sh
 tests/test-mbmemcasecoll.c
 tests/test-mbmemcasecmp.h
+tests/macros.h
 m4/locale-fr.m4
 m4/locale-tr.m4
 m4/codeset.m4
--- a/modules/mbrtowc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mbrtowc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,10 +1,11 @@
 Files:
-tests/signature.h
 tests/test-mbrtowc1.sh
 tests/test-mbrtowc2.sh
 tests/test-mbrtowc3.sh
 tests/test-mbrtowc4.sh
 tests/test-mbrtowc.c
+tests/signature.h
+tests/macros.h
 m4/locale-fr.m4
 m4/locale-ja.m4
 m4/locale-zh.m4
--- a/modules/mbscasecmp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mbscasecmp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-mbscasecmp.sh
 tests/test-mbscasecmp.c
+tests/macros.h
 m4/locale-tr.m4
 m4/codeset.m4
 
--- a/modules/mbscasestr-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mbscasestr-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -6,6 +6,7 @@
 tests/test-mbscasestr3.c
 tests/test-mbscasestr4.sh
 tests/test-mbscasestr4.c
+tests/macros.h
 m4/locale-fr.m4
 m4/locale-tr.m4
 m4/locale-zh.m4
--- a/modules/mbschr-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mbschr-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-mbschr.sh
 tests/test-mbschr.c
+tests/macros.h
 m4/locale-zh.m4
 m4/codeset.m4
 
--- a/modules/mbscspn-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mbscspn-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-mbscspn.sh
 tests/test-mbscspn.c
+tests/macros.h
 m4/locale-fr.m4
 m4/codeset.m4
 
--- a/modules/mbsinit-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mbsinit-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-mbsinit.sh
 tests/test-mbsinit.c
+tests/signature.h
+tests/macros.h
 m4/locale-fr.m4
 m4/codeset.m4
 
--- a/modules/mbsncasecmp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mbsncasecmp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-mbsncasecmp.sh
 tests/test-mbsncasecmp.c
+tests/macros.h
 m4/locale-tr.m4
 m4/codeset.m4
 
--- a/modules/mbsnrtowcs-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mbsnrtowcs-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,10 +1,11 @@
 Files:
-tests/signature.h
 tests/test-mbsnrtowcs1.sh
 tests/test-mbsnrtowcs2.sh
 tests/test-mbsnrtowcs3.sh
 tests/test-mbsnrtowcs4.sh
 tests/test-mbsnrtowcs.c
+tests/signature.h
+tests/macros.h
 m4/locale-fr.m4
 m4/locale-ja.m4
 m4/locale-zh.m4
--- a/modules/mbspbrk-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mbspbrk-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-mbspbrk.sh
 tests/test-mbspbrk.c
+tests/macros.h
 m4/locale-fr.m4
 m4/codeset.m4
 
--- a/modules/mbspcasecmp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mbspcasecmp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-mbspcasecmp.sh
 tests/test-mbspcasecmp.c
+tests/macros.h
 m4/locale-tr.m4
 m4/codeset.m4
 
--- a/modules/mbsrchr-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mbsrchr-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-mbsrchr.sh
 tests/test-mbsrchr.c
+tests/macros.h
 m4/locale-zh.m4
 m4/codeset.m4
 
--- a/modules/mbsrtowcs-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mbsrtowcs-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,10 +1,11 @@
 Files:
-tests/signature.h
 tests/test-mbsrtowcs1.sh
 tests/test-mbsrtowcs2.sh
 tests/test-mbsrtowcs3.sh
 tests/test-mbsrtowcs4.sh
 tests/test-mbsrtowcs.c
+tests/signature.h
+tests/macros.h
 m4/locale-fr.m4
 m4/locale-ja.m4
 m4/locale-zh.m4
--- a/modules/mbsspn-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mbsspn-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-mbsspn.sh
 tests/test-mbsspn.c
+tests/macros.h
 m4/locale-fr.m4
 m4/codeset.m4
 
--- a/modules/mbsstr-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mbsstr-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -4,6 +4,7 @@
 tests/test-mbsstr2.c
 tests/test-mbsstr3.sh
 tests/test-mbsstr3.c
+tests/macros.h
 m4/locale-fr.m4
 m4/locale-zh.m4
 m4/codeset.m4
--- a/modules/memchr-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/memchr-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-memchr.c
 tests/zerosize-ptr.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/memchr2-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/memchr2-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-memchr2.c
 tests/zerosize-ptr.h
+tests/macros.h
 m4/mmap-anon.m4
 
 Depends-on:
--- a/modules/memcmp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/memcmp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-memcmp.c
 tests/zerosize-ptr.h
+tests/signature.h
+tests/macros.h
 m4/mmap-anon.m4
 
 Depends-on:
--- a/modules/memmem-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/memmem-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-memmem.c
 tests/zerosize-ptr.h
+tests/signature.h
+tests/macros.h
 m4/mmap-anon.m4
 
 Depends-on:
--- a/modules/memrchr-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/memrchr-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-memrchr.c
 tests/zerosize-ptr.h
+tests/signature.h
+tests/macros.h
 m4/mmap-anon.m4
 
 Depends-on:
--- a/modules/mkdir-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mkdir-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-mkdir.h
 tests/test-mkdir.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdbool
--- a/modules/mkfifo-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mkfifo-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-mkfifo.h
 tests/test-mkfifo.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdbool
--- a/modules/mkfifoat-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mkfifoat-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-mkfifo.h
 tests/test-mkfifoat.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 symlink
--- a/modules/mknod-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/mknod-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-mkfifo.h
 tests/test-mknod.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdbool
--- a/modules/nanosleep-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/nanosleep-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-nanosleep.c
 tests/signature.h
-tests/test-nanosleep.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/nl_langinfo-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/nl_langinfo-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-nl_langinfo.sh
 tests/test-nl_langinfo.c
+tests/signature.h
+tests/macros.h
 m4/locale-fr.m4
 
 Depends-on:
--- a/modules/obstack-printf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/obstack-printf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-obstack-printf.c
 tests/signature.h
-tests/test-obstack-printf.c
+tests/macros.h
 
 Depends-on:
 progname
--- a/modules/open-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/open-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-open.h
 tests/test-open.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdbool
--- a/modules/openat-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/openat-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,4 @@
 Files:
-tests/signature.h
 tests/nap.h
 tests/test-chown.h
 tests/test-lchown.h
@@ -13,6 +12,8 @@
 tests/test-mkdirat.c
 tests/test-openat.c
 tests/test-unlinkat.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 mgetgroups
--- a/modules/pipe-filter-gi-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/pipe-filter-gi-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -5,6 +5,7 @@
 tests/test-pipe-filter-gi2.sh
 tests/test-pipe-filter-gi2-main.c
 tests/test-pipe-filter-gi2-child.c
+tests/macros.h
 
 Depends-on:
 binary-io
--- a/modules/pipe-filter-ii-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/pipe-filter-ii-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -5,6 +5,7 @@
 tests/test-pipe-filter-ii2.sh
 tests/test-pipe-filter-ii2-main.c
 tests/test-pipe-filter-ii2-child.c
+tests/macros.h
 
 Depends-on:
 binary-io
--- a/modules/pipe2-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/pipe2-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-pipe2.c
 tests/signature.h
-tests/test-pipe2.c
+tests/macros.h
 
 Depends-on:
 stdbool
--- a/modules/popen-safer-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/popen-safer-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/test-popen.h
 tests/test-popen-safer.c
 tests/test-popen-safer2.c
+tests/macros.h
 
 Depends-on:
 dup2
--- a/modules/popen-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/popen-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-popen.h
 tests/test-popen.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 dup2
--- a/modules/posixtm-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/posixtm-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-posixtm.c
+tests/macros.h
 
 Depends-on:
 intprops
--- a/modules/pread-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/pread-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,8 +1,9 @@
 Files:
-tests/signature.h
 tests/test-pread.c
 tests/test-pread.sh
 tests/init.sh
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/printf-frexp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/printf-frexp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-printf-frexp.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/printf-frexpl-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/printf-frexpl-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-printf-frexpl.c
+tests/macros.h
 
 Depends-on:
 fpucw
--- a/modules/printf-posix-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/printf-posix-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,11 +1,12 @@
 Files:
-tests/signature.h
 tests/test-printf-posix.sh
 tests/test-printf-posix.c
 tests/test-printf-posix.h
 tests/test-printf-posix.output
 tests/test-printf-posix2.sh
 tests/test-printf-posix2.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdint
--- a/modules/priv-set-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/priv-set-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-priv-set.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/quotearg-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/quotearg-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-quotearg.sh
 tests/test-quotearg.c
+tests/macros.h
 tests/locale/fr/LC_MESSAGES/test-quotearg.po
 tests/locale/fr/LC_MESSAGES/test-quotearg.mo
 m4/locale-fr.m4
--- a/modules/random_r-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/random_r-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-random_r.c
 tests/signature.h
-tests/test-random_r.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/rawmemchr-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/rawmemchr-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-rawmemchr.c
 tests/signature.h
-tests/test-rawmemchr.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/rbtree-list-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/rbtree-list-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-rbtree_list.c
+tests/macros.h
 
 Depends-on:
 array-list
--- a/modules/rbtree-oset-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/rbtree-oset-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-rbtree_oset.c
+tests/macros.h
 
 Depends-on:
 array-oset
--- a/modules/rbtreehash-list-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/rbtreehash-list-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-rbtreehash_list.c
+tests/macros.h
 
 Depends-on:
 array-list
--- a/modules/readlink-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/readlink-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-readlink.h
 tests/test-readlink.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdbool
--- a/modules/remove-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/remove-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-remove.c
 tests/signature.h
-tests/test-remove.c
+tests/macros.h
 
 Depends-on:
 symlink
--- a/modules/rename-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/rename-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-rename.h
 tests/test-rename.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 errno
--- a/modules/renameat-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/renameat-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-rename.h
 tests/test-renameat.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 filenamecat
--- a/modules/rmdir-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/rmdir-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-rmdir.h
 tests/test-rmdir.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdbool
--- a/modules/round-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/round-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,8 +1,9 @@
 Files:
-tests/signature.h
 tests/test-round1.c
 tests/test-round2.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 isnand-nolibm
--- a/modules/roundf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/roundf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,9 +1,10 @@
 Files:
-tests/signature.h
 tests/test-roundf1.c
 tests/test-round2.c
 tests/test-roundf2.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 ceilf
--- a/modules/roundl-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/roundl-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-roundl.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 fpucw
--- a/modules/safe-alloc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/safe-alloc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-safe-alloc.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/setenv-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/setenv-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-setenv.c
 tests/signature.h
-tests/test-setenv.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/sigaction-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/sigaction-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-sigaction.c
 tests/signature.h
-tests/test-sigaction.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/signbit-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/signbit-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-signbit.c
+tests/macros.h
 m4/exponentf.m4
 m4/exponentd.m4
 m4/exponentl.m4
--- a/modules/sleep-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/sleep-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-sleep.c
 tests/signature.h
-tests/test-sleep.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/snprintf-posix-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/snprintf-posix-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,9 +1,10 @@
 Files:
-tests/signature.h
 tests/test-snprintf-posix.c
 tests/test-snprintf-posix.h
 tests/test-snprintf.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdint
--- a/modules/snprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/snprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-snprintf.c
 tests/signature.h
-tests/test-snprintf.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/sprintf-posix-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/sprintf-posix-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,8 +1,9 @@
 Files:
-tests/signature.h
 tests/test-sprintf-posix.c
 tests/test-sprintf-posix.h
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdint
--- a/modules/stat-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/stat-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-stat.h
 tests/test-stat.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 pathmax
--- a/modules/stat-time-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/stat-time-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-stat-time.c
+tests/macros.h
 
 Depends-on:
 time
--- a/modules/strcasestr-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/strcasestr-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-strcasestr.c
 tests/signature.h
-tests/test-strcasestr.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/strchrnul-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/strchrnul-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-strchrnul.c
 tests/signature.h
-tests/test-strchrnul.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/strerror-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/strerror-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-strerror.c
 tests/signature.h
-tests/test-strerror.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/striconv-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/striconv-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-striconv.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/striconveh-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/striconveh-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-striconveh.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/striconveha-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/striconveha-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-striconveha.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/strsignal-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/strsignal-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-strsignal.c
 tests/signature.h
-tests/test-strsignal.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/strstr-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/strstr-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-strstr.c
 tests/zerosize-ptr.h
+tests/signature.h
+tests/macros.h
 m4/mmap-anon.m4
 
 Depends-on:
--- a/modules/strtod-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/strtod-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-strtod.c
 tests/signature.h
-tests/test-strtod.c
+tests/macros.h
 
 Depends-on:
 float
--- a/modules/strverscmp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/strverscmp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-strverscmp.c
 tests/signature.h
-tests/test-strverscmp.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/symlink-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/symlink-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-symlink.h
 tests/test-symlink.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdbool
--- a/modules/symlinkat-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/symlinkat-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,8 +1,9 @@
 Files:
-tests/signature.h
 tests/test-readlink.h
 tests/test-symlink.h
 tests/test-symlinkat.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/trunc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/trunc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,8 +1,9 @@
 Files:
-tests/signature.h
 tests/test-trunc1.c
 tests/test-trunc2.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 float
--- a/modules/truncf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/truncf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,8 +1,9 @@
 Files:
-tests/signature.h
 tests/test-truncf1.c
 tests/test-truncf2.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 float
--- a/modules/truncl-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/truncl-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-truncl.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 fpucw
--- a/modules/uname-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uname-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-uname.c
 tests/signature.h
-tests/test-uname.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/cased-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/cased-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unicase/test-cased.c
 tests/unicase/test-predicate-part1.h
 tests/unicase/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/ignorable-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/ignorable-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unicase/test-ignorable.c
 tests/unicase/test-predicate-part1.h
 tests/unicase/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/locale-language-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/locale-language-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-locale-language.sh
 tests/unicase/test-locale-language.c
+tests/macros.h
 m4/locale-fr.m4
 m4/locale-ja.m4
 m4/locale-tr.m4
--- a/modules/unicase/tolower-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/tolower-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unicase/test-uc_tolower.c
 tests/unicase/test-mapping-part1.h
 tests/unicase/test-mapping-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/totitle-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/totitle-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unicase/test-uc_totitle.c
 tests/unicase/test-mapping-part1.h
 tests/unicase/test-mapping-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/toupper-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/toupper-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unicase/test-uc_toupper.c
 tests/unicase/test-mapping-part1.h
 tests/unicase/test-mapping-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/u16-casecmp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u16-casecmp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u16-casecmp.c
 tests/unicase/test-casecmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfd
--- a/modules/unicase/u16-casecoll-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u16-casecoll-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u16-casecoll.c
 tests/unicase/test-casecmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfc
--- a/modules/unicase/u16-casefold-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u16-casefold-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u16-casefold.c
+tests/macros.h
 
 Depends-on:
 unistr/u16-cmp
--- a/modules/unicase/u16-is-cased-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u16-is-cased-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u16-is-cased.c
 tests/unicase/test-is-cased.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/u16-is-casefolded-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u16-is-casefolded-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u16-is-casefolded.c
 tests/unicase/test-is-casefolded.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/u16-is-lowercase-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u16-is-lowercase-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u16-is-lowercase.c
 tests/unicase/test-is-lowercase.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/u16-is-titlecase-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u16-is-titlecase-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u16-is-titlecase.c
 tests/unicase/test-is-titlecase.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/u16-is-uppercase-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u16-is-uppercase-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u16-is-uppercase.c
 tests/unicase/test-is-uppercase.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/u16-tolower-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u16-tolower-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u16-tolower.c
+tests/macros.h
 
 Depends-on:
 unistr/u16-cmp
--- a/modules/unicase/u16-totitle-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u16-totitle-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u16-totitle.c
+tests/macros.h
 
 Depends-on:
 unistr/u16-cmp
--- a/modules/unicase/u16-toupper-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u16-toupper-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u16-toupper.c
+tests/macros.h
 
 Depends-on:
 unistr/u16-cmp
--- a/modules/unicase/u32-casecmp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u32-casecmp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u32-casecmp.c
 tests/unicase/test-casecmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfd
--- a/modules/unicase/u32-casecoll-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u32-casecoll-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u32-casecoll.c
 tests/unicase/test-casecmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfc
--- a/modules/unicase/u32-casefold-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u32-casefold-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u32-casefold.c
+tests/macros.h
 
 Depends-on:
 unistr/u32-cmp
--- a/modules/unicase/u32-is-cased-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u32-is-cased-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u32-is-cased.c
 tests/unicase/test-is-cased.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/u32-is-casefolded-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u32-is-casefolded-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u32-is-casefolded.c
 tests/unicase/test-is-casefolded.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/u32-is-lowercase-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u32-is-lowercase-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u32-is-lowercase.c
 tests/unicase/test-is-lowercase.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/u32-is-titlecase-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u32-is-titlecase-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u32-is-titlecase.c
 tests/unicase/test-is-titlecase.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/u32-is-uppercase-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u32-is-uppercase-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u32-is-uppercase.c
 tests/unicase/test-is-uppercase.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/u32-tolower-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u32-tolower-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u32-tolower.c
+tests/macros.h
 
 Depends-on:
 unistr/u32-cmp
--- a/modules/unicase/u32-totitle-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u32-totitle-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u32-totitle.c
+tests/macros.h
 
 Depends-on:
 unistr/u32-cmp
--- a/modules/unicase/u32-toupper-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u32-toupper-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u32-toupper.c
+tests/macros.h
 
 Depends-on:
 unistr/u32-cmp
--- a/modules/unicase/u8-casecmp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u8-casecmp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u8-casecmp.c
 tests/unicase/test-casecmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfd
--- a/modules/unicase/u8-casecoll-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u8-casecoll-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u8-casecoll.c
 tests/unicase/test-casecmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfc
--- a/modules/unicase/u8-casefold-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u8-casefold-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u8-casefold.c
+tests/macros.h
 
 Depends-on:
 unistr/u8-cmp
--- a/modules/unicase/u8-is-cased-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u8-is-cased-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u8-is-cased.c
 tests/unicase/test-is-cased.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/u8-is-casefolded-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u8-is-casefolded-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u8-is-casefolded.c
 tests/unicase/test-is-casefolded.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/u8-is-lowercase-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u8-is-lowercase-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u8-is-lowercase.c
 tests/unicase/test-is-lowercase.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/u8-is-titlecase-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u8-is-titlecase-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u8-is-titlecase.c
 tests/unicase/test-is-titlecase.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/u8-is-uppercase-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u8-is-uppercase-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u8-is-uppercase.c
 tests/unicase/test-is-uppercase.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unicase/u8-tolower-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u8-tolower-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u8-tolower.c
+tests/macros.h
 
 Depends-on:
 unistr/u8-cmp
--- a/modules/unicase/u8-totitle-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u8-totitle-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u8-totitle.c
+tests/macros.h
 
 Depends-on:
 unistr/u8-cmp
--- a/modules/unicase/u8-toupper-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/u8-toupper-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u8-toupper.c
+tests/macros.h
 
 Depends-on:
 unistr/u8-cmp
--- a/modules/unicase/ulc-casecmp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/ulc-casecmp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -3,6 +3,7 @@
 tests/unicase/test-ulc-casecmp2.sh
 tests/unicase/test-ulc-casecmp.c
 tests/unicase/test-casecmp.h
+tests/macros.h
 m4/locale-fr.m4
 m4/codeset.m4
 
--- a/modules/unicase/ulc-casecoll-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unicase/ulc-casecoll-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -3,6 +3,7 @@
 tests/unicase/test-ulc-casecoll2.sh
 tests/unicase/test-ulc-casecoll.c
 tests/unicase/test-casecmp.h
+tests/macros.h
 m4/locale-fr.m4
 m4/codeset.m4
 
--- a/modules/uniconv/u16-conv-from-enc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniconv/u16-conv-from-enc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u16-conv-from-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u16-cmp
--- a/modules/uniconv/u16-conv-to-enc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniconv/u16-conv-to-enc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u16-conv-to-enc.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/uniconv/u16-strconv-from-enc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniconv/u16-strconv-from-enc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u16-strconv-from-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u16-strcmp
--- a/modules/uniconv/u16-strconv-to-enc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniconv/u16-strconv-to-enc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u16-strconv-to-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u16-strcmp
--- a/modules/uniconv/u32-conv-from-enc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniconv/u32-conv-from-enc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u32-conv-from-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u32-cmp
--- a/modules/uniconv/u32-conv-to-enc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniconv/u32-conv-to-enc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u32-conv-to-enc.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/uniconv/u32-strconv-from-enc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniconv/u32-strconv-from-enc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u32-strconv-from-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u32-strcmp
--- a/modules/uniconv/u32-strconv-to-enc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniconv/u32-strconv-to-enc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u32-strconv-to-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u32-strcmp
--- a/modules/uniconv/u8-conv-from-enc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniconv/u8-conv-from-enc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u8-conv-from-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u8-strlen
--- a/modules/uniconv/u8-conv-to-enc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniconv/u8-conv-to-enc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u8-conv-to-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u8-strlen
--- a/modules/uniconv/u8-strconv-from-enc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniconv/u8-strconv-from-enc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u8-strconv-from-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u8-strcmp
--- a/modules/uniconv/u8-strconv-to-enc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniconv/u8-strconv-to-enc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u8-strconv-to-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u8-strcmp
--- a/modules/unictype/bidicategory-byname-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/bidicategory-byname-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-bidi_byname.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/bidicategory-name-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/bidicategory-name-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-bidi_name.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/bidicategory-of-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/bidicategory-of-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-bidi_of.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/bidicategory-test-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/bidicategory-test-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-bidi_test.c
+tests/macros.h
 
 Depends-on:
 unictype/bidicategory-of
--- a/modules/unictype/block-list-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/block-list-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-block_list.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/block-of-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/block-of-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-block_of.c
+tests/macros.h
 
 Depends-on:
 unictype/block-list
--- a/modules/unictype/block-test-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/block-test-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-block_test.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/category-C-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-C-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_C.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Cc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Cc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Cc.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Cf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Cf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Cf.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Cn-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Cn-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Cn.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Co-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Co-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Co.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Cs-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Cs-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Cs.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-L-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-L-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_L.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Ll-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Ll-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Ll.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Lm-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Lm-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Lm.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Lo-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Lo-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Lo.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Lt-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Lt-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Lt.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Lu-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Lu-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Lu.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-M-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-M-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_M.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Mc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Mc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Mc.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Me-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Me-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Me.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Mn-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Mn-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Mn.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-N-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-N-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_N.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Nd-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Nd-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Nd.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Nl-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Nl-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Nl.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-No-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-No-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_No.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-P-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-P-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_P.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Pc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Pc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Pc.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Pd-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Pd-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Pd.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Pe-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Pe-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Pe.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Pf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Pf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Pf.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Pi-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Pi-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Pi.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Po-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Po-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Po.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Ps-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Ps-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Ps.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-S-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-S-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_S.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Sc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Sc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Sc.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Sk-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Sk-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Sk.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Sm-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Sm-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Sm.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-So-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-So-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_So.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Z-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Z-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Z.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Zl-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Zl-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Zl.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Zp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Zp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Zp.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-Zs-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-Zs-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-categ_Zs.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-and-not-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-and-not-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-categ_and_not.c
+tests/macros.h
 
 Depends-on:
 unictype/category-or
--- a/modules/unictype/category-and-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-and-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-categ_and.c
+tests/macros.h
 
 Depends-on:
 unictype/category-or
--- a/modules/unictype/category-byname-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-byname-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-categ_byname.c
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-name-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-name-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-categ_name.c
+tests/macros.h
 
 Depends-on:
 unictype/category-or
--- a/modules/unictype/category-none-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-none-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-categ_none.c
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-of-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-of-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-categ_of.c
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-or-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-or-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-categ_or.c
+tests/macros.h
 
 Depends-on:
 unictype/category-test
--- a/modules/unictype/category-test-withtable-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/category-test-withtable-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-categ_test_withtable.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/combining-class-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/combining-class-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-combining.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/ctype-alnum-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/ctype-alnum-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-ctype_alnum.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/ctype-alpha-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/ctype-alpha-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-ctype_alpha.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/ctype-blank-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/ctype-blank-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-ctype_blank.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/ctype-cntrl-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/ctype-cntrl-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-ctype_cntrl.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/ctype-digit-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/ctype-digit-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-ctype_digit.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/ctype-graph-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/ctype-graph-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-ctype_graph.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/ctype-lower-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/ctype-lower-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-ctype_lower.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/ctype-print-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/ctype-print-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-ctype_print.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/ctype-punct-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/ctype-punct-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-ctype_punct.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/ctype-space-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/ctype-space-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-ctype_space.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/ctype-upper-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/ctype-upper-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-ctype_upper.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/ctype-xdigit-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/ctype-xdigit-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-ctype_xdigit.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/decimal-digit-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/decimal-digit-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unictype/test-decdigit.c
 tests/unictype/test-decdigit.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/digit-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/digit-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unictype/test-digit.c
 tests/unictype/test-digit.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/mirror-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/mirror-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-mirror.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/numeric-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/numeric-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unictype/test-numeric.c
 tests/unictype/test-numeric.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-alphabetic-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-alphabetic-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_alphabetic.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-ascii-hex-digit-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-ascii-hex-digit-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_ascii_hex_digit.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-bidi-arabic-digit-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-bidi-arabic-digit-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_bidi_arabic_digit.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-bidi-arabic-right-to-left-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-bidi-arabic-right-to-left-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_bidi_arabic_right_to_left.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-bidi-block-separator-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-bidi-block-separator-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_bidi_block_separator.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-bidi-boundary-neutral-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-bidi-boundary-neutral-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_bidi_boundary_neutral.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-bidi-common-separator-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-bidi-common-separator-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_bidi_common_separator.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-bidi-control-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-bidi-control-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_bidi_control.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-bidi-embedding-or-override-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-bidi-embedding-or-override-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_bidi_embedding_or_override.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-bidi-eur-num-separator-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-bidi-eur-num-separator-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_bidi_eur_num_separator.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-bidi-eur-num-terminator-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-bidi-eur-num-terminator-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_bidi_eur_num_terminator.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-bidi-european-digit-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-bidi-european-digit-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_bidi_european_digit.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-bidi-hebrew-right-to-left-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-bidi-hebrew-right-to-left-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_bidi_hebrew_right_to_left.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-bidi-left-to-right-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-bidi-left-to-right-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_bidi_left_to_right.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-bidi-non-spacing-mark-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-bidi-non-spacing-mark-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_bidi_non_spacing_mark.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-bidi-other-neutral-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-bidi-other-neutral-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_bidi_other_neutral.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-bidi-pdf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-bidi-pdf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_bidi_pdf.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-bidi-segment-separator-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-bidi-segment-separator-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_bidi_segment_separator.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-bidi-whitespace-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-bidi-whitespace-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_bidi_whitespace.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-byname-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-byname-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-pr_byname.c
+tests/macros.h
 
 Depends-on:
 unictype/property-test
--- a/modules/unictype/property-combining-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-combining-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_combining.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-composite-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-composite-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_composite.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-currency-symbol-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-currency-symbol-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_currency_symbol.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-dash-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-dash-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_dash.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-decimal-digit-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-decimal-digit-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_decimal_digit.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-default-ignorable-code-point-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-default-ignorable-code-point-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_default_ignorable_code_point.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-deprecated-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-deprecated-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_deprecated.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-diacritic-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-diacritic-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_diacritic.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-extender-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-extender-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_extender.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-format-control-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-format-control-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_format_control.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-grapheme-base-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-grapheme-base-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_grapheme_base.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-grapheme-extend-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-grapheme-extend-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_grapheme_extend.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-grapheme-link-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-grapheme-link-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_grapheme_link.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-hex-digit-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-hex-digit-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_hex_digit.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-hyphen-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-hyphen-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_hyphen.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-id-continue-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-id-continue-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_id_continue.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-id-start-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-id-start-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_id_start.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-ideographic-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-ideographic-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_ideographic.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-ids-binary-operator-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-ids-binary-operator-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_ids_binary_operator.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-ids-trinary-operator-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-ids-trinary-operator-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_ids_trinary_operator.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-ignorable-control-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-ignorable-control-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_ignorable_control.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-iso-control-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-iso-control-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_iso_control.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-join-control-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-join-control-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_join_control.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-left-of-pair-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-left-of-pair-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_left_of_pair.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-line-separator-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-line-separator-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_line_separator.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-logical-order-exception-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-logical-order-exception-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_logical_order_exception.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-lowercase-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-lowercase-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_lowercase.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-math-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-math-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_math.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-non-break-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-non-break-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_non_break.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-not-a-character-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-not-a-character-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_not_a_character.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-numeric-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-numeric-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_numeric.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-other-alphabetic-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-other-alphabetic-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_other_alphabetic.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-other-default-ignorable-code-point-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-other-default-ignorable-code-point-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_other_default_ignorable_code_point.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-other-grapheme-extend-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-other-grapheme-extend-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_other_grapheme_extend.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-other-id-continue-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-other-id-continue-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_other_id_continue.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-other-id-start-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-other-id-start-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_other_id_start.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-other-lowercase-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-other-lowercase-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_other_lowercase.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-other-math-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-other-math-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_other_math.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-other-uppercase-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-other-uppercase-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_other_uppercase.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-paired-punctuation-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-paired-punctuation-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_paired_punctuation.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-paragraph-separator-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-paragraph-separator-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_paragraph_separator.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-pattern-syntax-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-pattern-syntax-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_pattern_syntax.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-pattern-white-space-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-pattern-white-space-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_pattern_white_space.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-private-use-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-private-use-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_private_use.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-punctuation-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-punctuation-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_punctuation.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-quotation-mark-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-quotation-mark-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_quotation_mark.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-radical-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-radical-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_radical.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-sentence-terminal-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-sentence-terminal-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_sentence_terminal.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-soft-dotted-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-soft-dotted-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_soft_dotted.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-space-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-space-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_space.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-terminal-punctuation-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-terminal-punctuation-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_terminal_punctuation.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-test-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-test-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-pr_test.c
+tests/macros.h
 
 Depends-on:
 unictype/property-composite
--- a/modules/unictype/property-titlecase-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-titlecase-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_titlecase.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-unassigned-code-value-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-unassigned-code-value-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_unassigned_code_value.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-unified-ideograph-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-unified-ideograph-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_unified_ideograph.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-uppercase-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-uppercase-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_uppercase.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-variation-selector-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-variation-selector-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_variation_selector.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-white-space-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-white-space-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_white_space.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-xid-continue-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-xid-continue-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_xid_continue.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-xid-start-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-xid-start-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_xid_start.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/property-zero-width-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/property-zero-width-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-pr_zero_width.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/scripts-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/scripts-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-scripts.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/syntax-c-ident-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/syntax-c-ident-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-sy_c_ident.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/syntax-c-whitespace-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/syntax-c-whitespace-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-sy_c_whitespace.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/syntax-java-ident-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/syntax-java-ident-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-sy_java_ident.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unictype/syntax-java-whitespace-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unictype/syntax-java-whitespace-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unictype/test-sy_java_whitespace.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unilbrk/u16-possible-linebreaks-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unilbrk/u16-possible-linebreaks-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unilbrk/test-u16-possible-linebreaks.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unilbrk/u16-width-linebreaks-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unilbrk/u16-width-linebreaks-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unilbrk/test-u16-width-linebreaks.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unilbrk/u32-possible-linebreaks-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unilbrk/u32-possible-linebreaks-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unilbrk/test-u32-possible-linebreaks.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unilbrk/u32-width-linebreaks-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unilbrk/u32-width-linebreaks-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unilbrk/test-u32-width-linebreaks.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unilbrk/u8-possible-linebreaks-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unilbrk/u8-possible-linebreaks-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unilbrk/test-u8-possible-linebreaks.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unilbrk/u8-width-linebreaks-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unilbrk/u8-width-linebreaks-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unilbrk/test-u8-width-linebreaks.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unilbrk/ulc-possible-linebreaks-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unilbrk/ulc-possible-linebreaks-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unilbrk/test-ulc-possible-linebreaks.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unilbrk/ulc-width-linebreaks-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unilbrk/ulc-width-linebreaks-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/unilbrk/test-ulc-width-linebreaks.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/uninorm/canonical-decomposition-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uninorm/canonical-decomposition-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uninorm/test-canonical-decomposition.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/uninorm/compat-decomposition-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uninorm/compat-decomposition-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uninorm/test-compat-decomposition.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/uninorm/composition-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uninorm/composition-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uninorm/test-composition.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/uninorm/decomposing-form-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uninorm/decomposing-form-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uninorm/test-decomposing-form.c
+tests/macros.h
 
 Depends-on:
 uninorm/nfc
--- a/modules/uninorm/decomposition-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uninorm/decomposition-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uninorm/test-decomposition.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/uninorm/filter-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uninorm/filter-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uninorm/test-uninorm-filter-nfc.c
+tests/macros.h
 
 Depends-on:
 unistr/u32-cmp
--- a/modules/uninorm/nfc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uninorm/nfc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -8,6 +8,7 @@
 tests/uninorm/test-u32-normalize-big.h
 tests/uninorm/test-u32-normalize-big.c
 tests/uninorm/NormalizationTest.txt
+tests/macros.h
 
 Depends-on:
 unistr/u8-cmp
--- a/modules/uninorm/nfd-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uninorm/nfd-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -8,6 +8,7 @@
 tests/uninorm/test-u32-normalize-big.h
 tests/uninorm/test-u32-normalize-big.c
 tests/uninorm/NormalizationTest.txt
+tests/macros.h
 
 Depends-on:
 unistr/u8-cmp
--- a/modules/uninorm/nfkc-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uninorm/nfkc-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -8,6 +8,7 @@
 tests/uninorm/test-u32-normalize-big.h
 tests/uninorm/test-u32-normalize-big.c
 tests/uninorm/NormalizationTest.txt
+tests/macros.h
 
 Depends-on:
 unistr/u8-cmp
--- a/modules/uninorm/nfkd-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uninorm/nfkd-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -8,6 +8,7 @@
 tests/uninorm/test-u32-normalize-big.h
 tests/uninorm/test-u32-normalize-big.c
 tests/uninorm/NormalizationTest.txt
+tests/macros.h
 
 Depends-on:
 unistr/u8-cmp
--- a/modules/uninorm/u16-normcmp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uninorm/u16-normcmp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/uninorm/test-u16-normcmp.c
 tests/uninorm/test-u16-normcmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfd
--- a/modules/uninorm/u16-normcoll-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uninorm/u16-normcoll-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/uninorm/test-u16-normcoll.c
 tests/uninorm/test-u16-normcmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfc
--- a/modules/uninorm/u32-normcmp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uninorm/u32-normcmp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/uninorm/test-u32-normcmp.c
 tests/uninorm/test-u32-normcmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfd
--- a/modules/uninorm/u32-normcoll-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uninorm/u32-normcoll-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/uninorm/test-u32-normcoll.c
 tests/uninorm/test-u32-normcmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfc
--- a/modules/uninorm/u8-normcmp-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uninorm/u8-normcmp-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/uninorm/test-u8-normcmp.c
 tests/uninorm/test-u8-normcmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfd
--- a/modules/uninorm/u8-normcoll-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uninorm/u8-normcoll-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/uninorm/test-u8-normcoll.c
 tests/uninorm/test-u8-normcmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfc
--- a/modules/unistdio/u16-asnprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/u16-asnprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unistdio/test-u16-asnprintf1.c
 tests/unistdio/test-u16-asnprintf1.h
 tests/unistdio/test-u16-printf1.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unistdio/u16-vasnprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/u16-vasnprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -6,6 +6,7 @@
 tests/unistdio/test-u16-vasnprintf2.c
 tests/unistdio/test-u16-vasnprintf3.sh
 tests/unistdio/test-u16-vasnprintf3.c
+tests/macros.h
 m4/locale-fr.m4
 m4/codeset.m4
 
--- a/modules/unistdio/u16-vasprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/u16-vasprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u16-vasprintf1.c
 tests/unistdio/test-u16-printf1.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unistdio/u16-vsnprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/u16-vsnprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u16-vsnprintf1.c
 tests/unistdio/test-u16-printf1.h
+tests/macros.h
 
 Depends-on:
 xalloc
--- a/modules/unistdio/u16-vsprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/u16-vsprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u16-vsprintf1.c
 tests/unistdio/test-u16-printf1.h
+tests/macros.h
 
 Depends-on:
 xalloc
--- a/modules/unistdio/u32-asnprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/u32-asnprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unistdio/test-u32-asnprintf1.c
 tests/unistdio/test-u32-asnprintf1.h
 tests/unistdio/test-u32-printf1.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unistdio/u32-vasnprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/u32-vasnprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -6,6 +6,7 @@
 tests/unistdio/test-u32-vasnprintf2.c
 tests/unistdio/test-u32-vasnprintf3.sh
 tests/unistdio/test-u32-vasnprintf3.c
+tests/macros.h
 m4/locale-fr.m4
 m4/codeset.m4
 
--- a/modules/unistdio/u32-vasprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/u32-vasprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u32-vasprintf1.c
 tests/unistdio/test-u32-printf1.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unistdio/u32-vsnprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/u32-vsnprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u32-vsnprintf1.c
 tests/unistdio/test-u32-printf1.h
+tests/macros.h
 
 Depends-on:
 xalloc
--- a/modules/unistdio/u32-vsprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/u32-vsprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u32-vsprintf1.c
 tests/unistdio/test-u32-printf1.h
+tests/macros.h
 
 Depends-on:
 xalloc
--- a/modules/unistdio/u8-asnprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/u8-asnprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unistdio/test-u8-asnprintf1.c
 tests/unistdio/test-u8-asnprintf1.h
 tests/unistdio/test-u8-printf1.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unistdio/u8-vasnprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/u8-vasnprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -6,6 +6,7 @@
 tests/unistdio/test-u8-vasnprintf2.c
 tests/unistdio/test-u8-vasnprintf3.sh
 tests/unistdio/test-u8-vasnprintf3.c
+tests/macros.h
 m4/locale-fr.m4
 m4/codeset.m4
 
--- a/modules/unistdio/u8-vasprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/u8-vasprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u8-vasprintf1.c
 tests/unistdio/test-u8-printf1.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unistdio/u8-vsnprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/u8-vsnprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u8-vsnprintf1.c
 tests/unistdio/test-u8-printf1.h
+tests/macros.h
 
 Depends-on:
 xalloc
--- a/modules/unistdio/u8-vsprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/u8-vsprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u8-vsprintf1.c
 tests/unistdio/test-u8-printf1.h
+tests/macros.h
 
 Depends-on:
 xalloc
--- a/modules/unistdio/ulc-asnprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/ulc-asnprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/unistdio/test-ulc-asnprintf1.c
 tests/unistdio/test-ulc-asnprintf1.h
 tests/unistdio/test-ulc-printf1.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unistdio/ulc-vasnprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/ulc-vasnprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -6,6 +6,7 @@
 tests/unistdio/test-ulc-vasnprintf2.c
 tests/unistdio/test-ulc-vasnprintf3.sh
 tests/unistdio/test-ulc-vasnprintf3.c
+tests/macros.h
 m4/locale-fr.m4
 m4/codeset.m4
 
--- a/modules/unistdio/ulc-vasprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/ulc-vasprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-ulc-vasprintf1.c
 tests/unistdio/test-ulc-printf1.h
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unistdio/ulc-vsnprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/ulc-vsnprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-ulc-vsnprintf1.c
 tests/unistdio/test-ulc-printf1.h
+tests/macros.h
 
 Depends-on:
 xalloc
--- a/modules/unistdio/ulc-vsprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unistdio/ulc-vsprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-ulc-vsprintf1.c
 tests/unistdio/test-ulc-printf1.h
+tests/macros.h
 
 Depends-on:
 xalloc
--- a/modules/uniwbrk/u16-wordbreaks-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniwbrk/u16-wordbreaks-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniwbrk/test-u16-wordbreaks.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/uniwbrk/u32-wordbreaks-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniwbrk/u32-wordbreaks-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniwbrk/test-u32-wordbreaks.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/uniwbrk/u8-wordbreaks-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniwbrk/u8-wordbreaks-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniwbrk/test-u8-wordbreaks.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/uniwbrk/ulc-wordbreaks-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniwbrk/ulc-wordbreaks-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/uniwbrk/test-ulc-wordbreaks.sh
 tests/uniwbrk/test-ulc-wordbreaks.c
+tests/macros.h
 m4/locale-fr.m4
 m4/codeset.m4
 
--- a/modules/uniwidth/u16-strwidth-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniwidth/u16-strwidth-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniwidth/test-u16-strwidth.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/uniwidth/u16-width-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniwidth/u16-width-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniwidth/test-u16-width.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/uniwidth/u32-strwidth-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniwidth/u32-strwidth-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniwidth/test-u32-strwidth.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/uniwidth/u32-width-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniwidth/u32-width-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniwidth/test-u32-width.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/uniwidth/u8-strwidth-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniwidth/u8-strwidth-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniwidth/test-u8-strwidth.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/uniwidth/u8-width-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniwidth/u8-width-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/uniwidth/test-u8-width.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/uniwidth/width-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/uniwidth/width-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -2,6 +2,7 @@
 tests/uniwidth/test-uc_width.c
 tests/uniwidth/test-uc_width2.c
 tests/uniwidth/test-uc_width2.sh
+tests/macros.h
 
 Depends-on:
 
--- a/modules/unlink-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unlink-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-unlink.h
 tests/test-unlink.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdbool
--- a/modules/unsetenv-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/unsetenv-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-unsetenv.c
 tests/signature.h
-tests/test-unsetenv.c
+tests/macros.h
 
 Depends-on:
 putenv
--- a/modules/usleep-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/usleep-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-usleep.c
 tests/signature.h
-tests/test-usleep.c
+tests/macros.h
 
 Depends-on:
 time
--- a/modules/utimens-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/utimens-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -5,6 +5,7 @@
 tests/test-utimens.h
 tests/test-utimens-common.h
 tests/test-utimens.c
+tests/macros.h
 
 Depends-on:
 symlink
--- a/modules/utimensat-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/utimensat-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,10 +1,11 @@
 Files:
-tests/signature.h
 tests/nap.h
 tests/test-lutimens.h
 tests/test-utimens.h
 tests/test-utimens-common.h
 tests/test-utimensat.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 progname
--- a/modules/vasnprintf-posix-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/vasnprintf-posix-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -3,6 +3,7 @@
 tests/test-vasnprintf-posix2.sh
 tests/test-vasnprintf-posix2.c
 tests/nan.h
+tests/macros.h
 m4/locale-fr.m4
 m4/codeset.m4
 
--- a/modules/vasnprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/vasnprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-vasnprintf.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/vasprintf-posix-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/vasprintf-posix-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
 tests/test-vasprintf-posix.c
 tests/nan.h
+tests/macros.h
 
 Depends-on:
 stdint
--- a/modules/vasprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/vasprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-vasprintf.c
 tests/signature.h
-tests/test-vasprintf.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/vdprintf-posix-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/vdprintf-posix-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,9 +1,10 @@
 Files:
-tests/signature.h
 tests/test-vdprintf-posix.sh
 tests/test-vdprintf-posix.c
 tests/test-fprintf-posix.h
 tests/test-printf-posix.output
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdint
--- a/modules/vfprintf-posix-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/vfprintf-posix-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,9 +1,10 @@
 Files:
-tests/signature.h
 tests/test-vfprintf-posix.sh
 tests/test-vfprintf-posix.c
 tests/test-fprintf-posix.h
 tests/test-printf-posix.output
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdint
--- a/modules/vprintf-posix-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/vprintf-posix-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,9 +1,10 @@
 Files:
-tests/signature.h
 tests/test-vprintf-posix.sh
 tests/test-vprintf-posix.c
 tests/test-printf-posix.h
 tests/test-printf-posix.output
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdint
--- a/modules/vsnprintf-posix-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/vsnprintf-posix-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,9 +1,10 @@
 Files:
-tests/signature.h
 tests/test-vsnprintf-posix.c
 tests/test-snprintf-posix.h
 tests/test-vsnprintf.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdint
--- a/modules/vsnprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/vsnprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-vsnprintf.c
 tests/signature.h
-tests/test-vsnprintf.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/vsprintf-posix-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/vsprintf-posix-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,8 +1,9 @@
 Files:
-tests/signature.h
 tests/test-vsprintf-posix.c
 tests/test-sprintf-posix.h
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdint
--- a/modules/wcrtomb-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/wcrtomb-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-wcrtomb.sh
 tests/test-wcrtomb.c
+tests/signature.h
+tests/macros.h
 m4/locale-fr.m4
 m4/locale-ja.m4
 m4/locale-zh.m4
--- a/modules/wcsnrtombs-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/wcsnrtombs-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,10 +1,11 @@
 Files:
-tests/signature.h
 tests/test-wcsnrtombs1.sh
 tests/test-wcsnrtombs2.sh
 tests/test-wcsnrtombs3.sh
 tests/test-wcsnrtombs4.sh
 tests/test-wcsnrtombs.c
+tests/signature.h
+tests/macros.h
 m4/locale-fr.m4
 m4/locale-ja.m4
 m4/locale-zh.m4
--- a/modules/wcsrtombs-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/wcsrtombs-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,10 +1,11 @@
 Files:
-tests/signature.h
 tests/test-wcsrtombs1.sh
 tests/test-wcsrtombs2.sh
 tests/test-wcsrtombs3.sh
 tests/test-wcsrtombs4.sh
 tests/test-wcsrtombs.c
+tests/signature.h
+tests/macros.h
 m4/locale-fr.m4
 m4/locale-ja.m4
 m4/locale-zh.m4
--- a/modules/wctype-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/wctype-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-wctype.c
+tests/macros.h
 
 Depends-on:
 
--- a/modules/wcwidth-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/wcwidth-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,6 +1,7 @@
 Files:
+tests/test-wcwidth.c
 tests/signature.h
-tests/test-wcwidth.c
+tests/macros.h
 
 Depends-on:
 localcharset
--- a/modules/xmemdup0-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/xmemdup0-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-xmemdup0.c
+tests/macros.h
 
 Depends-on:
 progname
--- a/modules/xprintf-posix-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/xprintf-posix-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -5,6 +5,7 @@
 tests/test-fprintf-posix.h
 tests/test-printf-posix.h
 tests/test-printf-posix.output
+tests/macros.h
 
 Depends-on:
 stdint
--- a/modules/xvasprintf-tests	Thu Dec 24 20:29:33 2009 +0100
+++ b/modules/xvasprintf-tests	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,6 @@
 Files:
 tests/test-xvasprintf.c
+tests/macros.h
 
 Depends-on:
 progname
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/macros.h	Thu Dec 24 21:01:42 2009 +0100
@@ -0,0 +1,56 @@
+/* Common macros used by gnulib tests.
+   Copyright (C) 2006-2009 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program 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 General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+
+/* This file contains macros that are used by many gnulib tests.
+   Put here only frequently used macros, say, used by 10 tests or more.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+/* ASSERT (condition);
+   verifies that the specified condition is fulfilled.  If not, a message
+   is printed to stderr and the program is terminated with an error code.
+
+   This macro has the following properties:
+     - The programmer specifies the expected condition, not the failure
+       condition.  This simplifies thinking.
+     - The condition is tested always, regardless of compilation flags.
+       (Unlike the macro from <assert.h>.)
+     - On Unix platforms, the tester can debug the test program with a
+       debugger (provided core dumps are enabled: "ulimit -c unlimited").
+     - For the sake of platforms where no debugger is available (such as
+       some mingw systems), an error message is printed on stderr that
+       includes the source location of the ASSERT invocation.
+ */
+#define ASSERT(expr) \
+  do                                                                         \
+    {                                                                        \
+      if (!(expr))                                                           \
+        {                                                                    \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          fflush (stderr);                                                   \
+          abort ();                                                          \
+        }                                                                    \
+    }                                                                        \
+  while (0)
+
+/* SIZEOF (array)
+   returns the number of elements of an array.  It works for arrays that are
+   declared outside functions and for local variables of array type.  It does
+   *not* work for function parameters of array type, because they are actually
+   parameters of pointer type.  */
+#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
--- a/tests/test-areadlink-with-size.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-areadlink-with-size.c	Thu Dec 24 21:01:42 2009 +0100
@@ -29,17 +29,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-areadlink-with-size.t"
 
--- a/tests/test-areadlink.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-areadlink.c	Thu Dec 24 21:01:42 2009 +0100
@@ -29,17 +29,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-areadlink.t"
 
--- a/tests/test-areadlinkat-with-size.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-areadlinkat-with-size.c	Thu Dec 24 21:01:42 2009 +0100
@@ -29,17 +29,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-areadlinkat-with-size.t"
 
--- a/tests/test-areadlinkat.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-areadlinkat.c	Thu Dec 24 21:01:42 2009 +0100
@@ -29,17 +29,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-areadlinkat.t"
 
--- a/tests/test-argmatch.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-argmatch.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of exact or abbreviated match search.
-   Copyright (C) 1990, 1998-1999, 2001-2008 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998-1999, 2001-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,22 +21,10 @@
 
 #include "argmatch.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "progname.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Some packages define ARGMATCH_DIE and ARGMATCH_DIE_DECL in <config.h>, and
    thus must link with a definition of that function.  Provide it here.  */
--- a/tests/test-argv-iter.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-argv-iter.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,13 @@
 
 #include "argv-iter.h"
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
+#include "macros.h"
+
 #define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
 #define STREQ(s1, s2) (strcmp (s1, s2) == 0)
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
 
 static FILE *
 write_nul_delimited_argv (char **argv)
--- a/tests/test-array-mergesort.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-array-mergesort.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,20 +24,9 @@
 #define STATIC static
 #include "array-mergesort.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define NMAX 257
 static const struct foo data[NMAX] =
--- a/tests/test-array_list.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-array_list.c	Thu Dec 24 21:01:42 2009 +0100
@@ -19,28 +19,16 @@
 
 #include "gl_array_list.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "progname.h"
+#include "macros.h"
 
 static const char *objects[15] =
   {
     "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o"
   };
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
 #define RANDOM(n) (rand () % (n))
 #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]
 
--- a/tests/test-array_oset.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-array_oset.c	Thu Dec 24 21:01:42 2009 +0100
@@ -19,13 +19,13 @@
 
 #include "gl_array_oset.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "gl_xlist.h"
 #include "gl_array_list.h"
 #include "progname.h"
+#include "macros.h"
 
 static const char *objects[30] =
   {
@@ -33,18 +33,6 @@
     "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "<", ">", "[", "]"
   };
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
 #define RANDOM(n) (rand () % (n))
 #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]
 
--- a/tests/test-avltree_list.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-avltree_list.c	Thu Dec 24 21:01:42 2009 +0100
@@ -19,11 +19,11 @@
 
 #include "gl_avltree_list.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "gl_array_list.h"
 #include "progname.h"
+#include "macros.h"
 
 extern void gl_avltree_list_check_invariants (gl_list_t list);
 
@@ -32,18 +32,6 @@
     "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o"
   };
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
 #define RANDOM(n) (rand () % (n))
 #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]
 
--- a/tests/test-avltree_oset.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-avltree_oset.c	Thu Dec 24 21:01:42 2009 +0100
@@ -19,12 +19,12 @@
 
 #include "gl_avltree_oset.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "gl_array_oset.h"
 #include "progname.h"
+#include "macros.h"
 
 extern void gl_avltree_oset_check_invariants (gl_oset_t set);
 
@@ -34,18 +34,6 @@
     "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "<", ">", "[", "]"
   };
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
 #define RANDOM(n) (rand () % (n))
 #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]
 
--- a/tests/test-avltreehash_list.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-avltreehash_list.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,12 +20,12 @@
 #include "gl_avltreehash_list.h"
 
 #include <limits.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "gl_array_list.h"
 #include "progname.h"
+#include "macros.h"
 
 extern void gl_avltreehash_list_check_invariants (gl_list_t list);
 
@@ -59,18 +59,6 @@
   return h;
 }
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
 #define RANDOM(n) (rand () % (n))
 #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]
 
--- a/tests/test-base64.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-base64.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,12 @@
 #include "base64.h"
 
 #include <stddef.h>
-#include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
 
-#define ASSERT(expr)                                                    \
-  do                                                                    \
-    {                                                                   \
-      if (!(expr))                                                      \
-        {                                                               \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                              \
-          abort ();                                                     \
-        }                                                               \
-    }                                                                   \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-binary-io.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-binary-io.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of binary mode I/O.
-   Copyright (C) 2005, 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,17 +27,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-bitrotate.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-bitrotate.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,21 +20,7 @@
 
 #include "bitrotate.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr)                                                    \
-  do                                                                    \
-    {                                                                   \
-      if (!(expr))                                                      \
-        {                                                               \
-          fprintf (stderr, "%s:%d: assertion failed\n",                 \
-                   __FILE__, __LINE__);                                 \
-          fflush (stderr);                                              \
-          abort ();                                                     \
-        }                                                               \
-    }                                                                   \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-btowc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-btowc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,19 +25,8 @@
 
 #include <locale.h>
 #include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-byteswap.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-byteswap.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of <byteswap.h> substitute.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,20 +20,7 @@
 
 #include <byteswap.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-c-ctype.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-c-ctype.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of character handling in C locale.
-   Copyright (C) 2005, 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,20 +21,8 @@
 #include "c-ctype.h"
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static void
 test_all (void)
--- a/tests/test-c-stack.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-c-stack.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of c-stack module.
-   Copyright (C) 2002, 2004, 2006, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2006, 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@
 
 #include "exitfail.h"
 #include <stdio.h>
-#include <stdlib.h>
 #if HAVE_SETRLIMIT
 /* At least FreeBSD 5.0 needs extra headers before <sys/resource.h>
    will compile.  */
@@ -29,17 +28,7 @@
 # include <sys/resource.h>
 #endif
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 char *program_name;
 
--- a/tests/test-c-strcasecmp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-c-strcasecmp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of case-insensitive string comparison function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,21 +21,9 @@
 #include "c-strcase.h"
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-c-strcasestr.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-c-strcasestr.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of case-insensitive searching in a string.
-   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,21 +20,10 @@
 
 #include "c-strcasestr.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-c-strncasecmp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-c-strncasecmp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of case-insensitive string comparison function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,21 +21,9 @@
 #include "c-strcase.h"
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-c-strstr.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-c-strstr.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of searching in a string.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,21 +20,10 @@
 
 #include "c-strstr.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-canonicalize-lgpl.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-canonicalize-lgpl.c	Thu Dec 24 21:01:42 2009 +0100
@@ -32,18 +32,7 @@
 #include <unistd.h>
 
 #include "same-inode.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "t-can-lgpl.tmp"
 
--- a/tests/test-canonicalize.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-canonicalize.c	Thu Dec 24 21:01:42 2009 +0100
@@ -29,18 +29,7 @@
 #include <unistd.h>
 
 #include "same-inode.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "t-can.tmp"
 
--- a/tests/test-carray_list.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-carray_list.c	Thu Dec 24 21:01:42 2009 +0100
@@ -19,29 +19,17 @@
 
 #include "gl_carray_list.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "gl_array_list.h"
 #include "progname.h"
+#include "macros.h"
 
 static const char *objects[15] =
   {
     "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o"
   };
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
 #define RANDOM(n) (rand () % (n))
 #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]
 
--- a/tests/test-ceilf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-ceilf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,23 +23,9 @@
 #include "signature.h"
 SIGNATURE_CHECK (ceilf, float, (float));
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "isnanf-nolibm.h"
 #include "nan.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0f.
    So we use -zero instead.  */
--- a/tests/test-ceilf2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-ceilf2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of rounding towards positive infinity.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,21 +24,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "isnanf-nolibm.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 
 /* The reference implementation, taken from lib/ceil.c.  */
--- a/tests/test-ceill.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-ceill.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,24 +24,11 @@
 SIGNATURE_CHECK (ceill, long double, (long double));
 
 #include <float.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "fpucw.h"
 #include "isnanl-nolibm.h"
 #include "nan.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* On HP-UX 10.20, negating 0.0L does not yield -0.0L.
    So we use minus_zero instead.
--- a/tests/test-chown.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-chown.c	Thu Dec 24 21:01:42 2009 +0100
@@ -32,18 +32,7 @@
 
 #include "mgetgroups.h"
 #include "stat-time.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-chown.t"
 
--- a/tests/test-cloexec.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-cloexec.c	Thu Dec 24 21:01:42 2009 +0100
@@ -22,8 +22,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
@@ -33,18 +31,7 @@
 #endif
 
 #include "binary-io.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Return non-zero if FD is open and inheritable across exec/spawn.  */
 static int
--- a/tests/test-copy-acl.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-copy-acl.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of copying of files.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -28,18 +28,7 @@
 #include <sys/stat.h>
 
 #include "progname.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-copy-file.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-copy-file.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of copying of files.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,22 +20,8 @@
 
 #include "copy-file.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "progname.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-count-one-bits.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-count-one-bits.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Free Software Foundation
+ * Copyright (C) 2007-2009 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,20 +22,8 @@
 
 #include <limits.h>
 #include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr)                                            \
-  do                                                            \
-    {                                                           \
-      if (!(expr))                                              \
-        {                                                       \
-          fprintf (stderr, "%s:%d: assertion \"%s\" failed\n",  \
-                   __FILE__, __LINE__, #expr);                  \
-          fflush (stderr);                                      \
-          abort ();                                             \
-        }                                                       \
-    }                                                           \
-  while (0)
+#include "macros.h"
 
 #define UINT_BIT (sizeof (unsigned int) * CHAR_BIT)
 #define ULONG_BIT (sizeof (unsigned long int) * CHAR_BIT)
--- a/tests/test-dprintf-posix.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-dprintf-posix.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,20 +25,9 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static void
 test_function (int (*my_dprintf) (int, const char *, ...))
--- a/tests/test-dup2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-dup2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,8 +25,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "binary-io.h"
 #include "cloexec.h"
@@ -37,17 +35,7 @@
 # include <windows.h>
 #endif
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Return non-zero if FD is open.  */
 static int
--- a/tests/test-dup3.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-dup3.c	Thu Dec 24 21:01:42 2009 +0100
@@ -27,8 +27,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 /* Get declarations of the Win32 API functions.  */
@@ -37,18 +35,7 @@
 #endif
 
 #include "binary-io.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Return true if FD is open.  */
 static bool
--- a/tests/test-duplocale.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-duplocale.c	Thu Dec 24 21:01:42 2009 +0100
@@ -28,20 +28,9 @@
 #include <langinfo.h>
 #include <monetary.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 struct locale_dependent_values
 {
--- a/tests/test-fbufmode.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fbufmode.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of fbufmode() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,19 +21,8 @@
 #include "fbufmode.h"
 
 #include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define TESTFILE "t-fbufmode.tmp"
 
--- a/tests/test-fchdir.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fchdir.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,23 +25,11 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "cloexec.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-fchownat.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fchownat.c	Thu Dec 24 21:01:42 2009 +0100
@@ -33,18 +33,7 @@
 #include "mgetgroups.h"
 #include "openat.h"
 #include "stat-time.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-fchownat.t"
 
--- a/tests/test-fcntl-safer.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fcntl-safer.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,20 +23,9 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-fcntl-safer.t"
 
--- a/tests/test-fcntl.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fcntl.c	Thu Dec 24 21:01:42 2009 +0100
@@ -28,8 +28,6 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
@@ -39,6 +37,7 @@
 #endif
 
 #include "binary-io.h"
+#include "macros.h"
 
 /* Use O_CLOEXEC if available, but test works without it.  */
 #ifndef O_CLOEXEC
@@ -50,18 +49,6 @@
 static int zero (void) { return 0; }
 #endif
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-
 /* Return true if FD is open.  */
 static bool
 is_open (int fd)
--- a/tests/test-fdopendir.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fdopendir.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,21 +25,9 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-fdutimensat.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fdutimensat.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,17 +25,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-fdutimensat.t"
 
--- a/tests/test-fflush2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fflush2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -18,21 +18,8 @@
 
 #include <stdio.h>
 
-#include <stdlib.h>
-
 #include "binary-io.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char **argv)
--- a/tests/test-file-has-acl.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-file-has-acl.c	Thu Dec 24 21:01:42 2009 +0100
@@ -27,17 +27,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-filevercmp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-filevercmp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -19,20 +19,9 @@
 
 #include "filevercmp.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <stddef.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* set of well sorted examples */
 static const char *const examples[] =
--- a/tests/test-flock.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-flock.c	Thu Dec 24 21:01:42 2009 +0100
@@ -22,23 +22,10 @@
 SIGNATURE_CHECK (flock, int, (int, int));
 
 #include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 
-#define ASSERT(expr) \
-  do                                                                    \
-    {                                                                   \
-      if (!(expr))                                                      \
-        {                                                               \
-          fprintf (stderr, "%s:%d: assertion failed, errno = %d\n",     \
-                   __FILE__, __LINE__, errno);                          \
-          fflush (stderr);                                              \
-          abort ();                                                     \
-        }                                                               \
-    }                                                                   \
-  while (0)
+#include "macros.h"
 
 static void
 test_shared (const char *file, int fd)
--- a/tests/test-floorf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-floorf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,23 +23,9 @@
 #include "signature.h"
 SIGNATURE_CHECK (floorf, float, (float));
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "isnanf-nolibm.h"
 #include "nan.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0f.
    So we use -zero instead.  */
--- a/tests/test-floorf2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-floorf2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of rounding towards negative infinity.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,21 +24,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "isnanf-nolibm.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 
 /* The reference implementation, taken from lib/floor.c.  */
--- a/tests/test-floorl.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-floorl.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,24 +24,11 @@
 SIGNATURE_CHECK (floorl, long double, (long double));
 
 #include <float.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "fpucw.h"
 #include "isnanl-nolibm.h"
 #include "nan.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* On HP-UX 10.20, negating 0.0L does not yield -0.0L.
    So we use minus_zero instead.
--- a/tests/test-fnmatch.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fnmatch.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,21 +23,7 @@
 #include "signature.h"
 SIGNATURE_CHECK (fnmatch, int, (char const *, char const *, int));
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr)                                                    \
-  do                                                                    \
-    {                                                                   \
-      if (!(expr))                                                      \
-        {                                                               \
-          fprintf (stderr, "%s:%d: assertion failed\n",                 \
-                   __FILE__, __LINE__);                                 \
-          fflush (stderr);                                              \
-          abort ();                                                     \
-        }                                                               \
-    }                                                                   \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-fopen.h	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fopen.h	Thu Dec 24 21:01:42 2009 +0100
@@ -19,20 +19,9 @@
 /* Include <config.h> and a form of <stdio.h> first.  */
 
 #include <errno.h>
-#include <stdlib.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Test fopen.  Assumes BASE is defined.  */
 
--- a/tests/test-fpending.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fpending.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,17 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-fprintf-posix.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fprintf-posix.c	Thu Dec 24 21:01:42 2009 +0100
@@ -26,20 +26,9 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-fprintf-posix.h"
 
--- a/tests/test-fpurge.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fpurge.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,27 +20,16 @@
 
 #include <stdio.h>
 
-#include <stdlib.h>
 #include <string.h>
 
+#include "macros.h"
+
 /* None of the files accessed by this test are large, so disable the
    fseek link warning if we are not using the gnulib fseek module.  */
 #if !GNULIB_FSEEK
 # undef fseek
 #endif
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-
 #define TESTFILE "t-fpurge.tmp"
 
 int
--- a/tests/test-freadable.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-freadable.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,7 +21,8 @@
 #include "freadable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include "macros.h"
 
 /* None of the files accessed by this test are large, so disable the
    fseek link warning if we are not using the gnulib fseek module.  */
@@ -29,18 +30,6 @@
 # undef fseek
 #endif
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-
 #define TESTFILE "t-freadable.tmp"
 
 int
--- a/tests/test-freadahead.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-freadahead.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of freadahead() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,21 +20,10 @@
 
 #include "freadahead.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char **argv)
--- a/tests/test-freading.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-freading.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,7 +21,8 @@
 #include "freading.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include "macros.h"
 
 /* None of the files accessed by this test are large, so disable the
    fseek link warning if we are not using the gnulib fseek module.  */
@@ -29,18 +30,6 @@
 # undef fseek
 #endif
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-
 #define TESTFILE "t-freading.tmp"
 
 int
--- a/tests/test-freadptr.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-freadptr.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of freadptr() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,22 +20,11 @@
 
 #include "freadptr.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char **argv)
--- a/tests/test-freadptr2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-freadptr2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of freadptr() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,17 +24,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 freadptrbufsize (FILE *fp)
--- a/tests/test-freadseek.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-freadseek.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,17 +25,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char **argv)
--- a/tests/test-freopen.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-freopen.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,19 +23,7 @@
 #include "signature.h"
 SIGNATURE_CHECK (freopen, FILE *, (char const *, char const *, FILE *));
 
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-frexp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-frexp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,29 +24,16 @@
 SIGNATURE_CHECK (frexp, double, (double, int *));
 
 #include <float.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "isnand-nolibm.h"
 #include "nan.h"
+#include "macros.h"
 
 /* Avoid some warnings from "gcc -Wshadow".
    This file doesn't use the exp() function.  */
 #undef exp
 #define exp exponent
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-
 /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0.
    So we use -zero instead.  */
 double zero = 0.0;
--- a/tests/test-frexpl.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-frexpl.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,30 +24,17 @@
 SIGNATURE_CHECK (frexpl, long double, (long double, int *));
 
 #include <float.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "fpucw.h"
 #include "isnanl-nolibm.h"
 #include "nan.h"
+#include "macros.h"
 
 /* Avoid some warnings from "gcc -Wshadow".
    This file doesn't use the exp() function.  */
 #undef exp
 #define exp exponent
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-
 /* On MIPS IRIX machines, LDBL_MIN_EXP is -1021, but the smallest reliable
    exponent for 'long double' is -964.  Similarly, on PowerPC machines,
    LDBL_MIN_EXP is -1021, but the smallest reliable exponent for 'long double'
--- a/tests/test-fseek.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fseek.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,19 +23,7 @@
 #include "signature.h"
 SIGNATURE_CHECK (fseek, int, (FILE *, long, int));
 
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #ifndef FUNC_UNGETC_BROKEN
 # define FUNC_UNGETC_BROKEN 0
--- a/tests/test-fseeko.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fseeko.c	Thu Dec 24 21:01:42 2009 +0100
@@ -30,19 +30,8 @@
 #include "signature.h"
 SIGNATURE_CHECK (fseeko, int, (FILE *, off_t, int));
 
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #ifndef FUNC_UNGETC_BROKEN
 # define FUNC_UNGETC_BROKEN 0
--- a/tests/test-fstatat.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fstatat.c	Thu Dec 24 21:01:42 2009 +0100
@@ -33,18 +33,7 @@
 #include "openat.h"
 #include "pathmax.h"
 #include "same-inode.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-fstatat.t"
 
--- a/tests/test-fstrcmp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fstrcmp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,22 +21,9 @@
 #include "fstrcmp.h"
 
 #include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "progname.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static bool
 check_fstrcmp (const char *string1, const char *string2, double expected)
--- a/tests/test-fsync.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fsync.c	Thu Dec 24 21:01:42 2009 +0100
@@ -22,20 +22,9 @@
 SIGNATURE_CHECK (fsync, int, (int));
 
 #include <errno.h>
-#include <stdio.h>
 #include <fcntl.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-ftell.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-ftell.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,9 +23,8 @@
 #include "signature.h"
 SIGNATURE_CHECK (ftell, long, (FILE *));
 
-#include <stdlib.h>
-
 #include "binary-io.h"
+#include "macros.h"
 
 /* None of the files accessed by this test are large, so disable the
    fseek link warning if we are not using the gnulib fseek module.  */
@@ -33,18 +32,6 @@
 # undef fseek
 #endif
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-
 #ifndef FUNC_UNGETC_BROKEN
 # define FUNC_UNGETC_BROKEN 0
 #endif
--- a/tests/test-ftello.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-ftello.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,9 +23,8 @@
 #include "signature.h"
 SIGNATURE_CHECK (ftello, off_t, (FILE *));
 
-#include <stdlib.h>
-
 #include "binary-io.h"
+#include "macros.h"
 
 /* None of the files accessed by this test are large, so disable the
    fseek link warning if we are not using the gnulib fseek module.  */
@@ -33,18 +32,6 @@
 # undef fseek
 #endif
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-
 #ifndef FUNC_UNGETC_BROKEN
 # define FUNC_UNGETC_BROKEN 0
 #endif
--- a/tests/test-func.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-func.c	Thu Dec 24 21:01:42 2009 +0100
@@ -19,20 +19,8 @@
 #include <config.h>
 
 #include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr)                                                         \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-futimens.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-futimens.c	Thu Dec 24 21:01:42 2009 +0100
@@ -34,18 +34,7 @@
 #include "stat-time.h"
 #include "timespec.h"
 #include "utimecmp.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-futimens.t"
 
--- a/tests/test-fwritable.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fwritable.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,7 +21,8 @@
 #include "fwritable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include "macros.h"
 
 /* None of the files accessed by this test are large, so disable the
    fseek link warning if we are not using the gnulib fseek module.  */
@@ -29,18 +30,6 @@
 # undef fseek
 #endif
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-
 #define TESTFILE "t-fwritable.tmp"
 
 int
--- a/tests/test-fwriting.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-fwriting.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,7 +21,8 @@
 #include "fwriting.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include "macros.h"
 
 /* None of the files accessed by this test are large, so disable the
    fseek link warning if we are not using the gnulib fseek module.  */
@@ -29,18 +30,6 @@
 # undef fseek
 #endif
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-
 #define TESTFILE "t-fwriting.tmp"
 
 int
--- a/tests/test-getcwd.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-getcwd.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,17 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char **argv)
--- a/tests/test-getdate.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-getdate.c	Thu Dec 24 21:01:42 2009 +0100
@@ -26,19 +26,7 @@
 #include <string.h>
 
 #include "progname.h"
-
-#define ASSERT(expr)                                                    \
-  do                                                                    \
-    {                                                                   \
-      if (!(expr))                                                      \
-        {                                                               \
-          fprintf (stderr, "%s:%d: assertion failed\n",                 \
-                   __FILE__, __LINE__);                                 \
-          fflush (stderr);                                              \
-          abort ();                                                     \
-        }                                                               \
-    }                                                                   \
-  while (0)
+#include "macros.h"
 
 #ifdef DEBUG
 #define LOG(str, now, res)                                              \
--- a/tests/test-getdelim.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-getdelim.c	Thu Dec 24 21:01:42 2009 +0100
@@ -27,17 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-getdtablesize.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-getdtablesize.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,20 +23,7 @@
 #include "signature.h"
 SIGNATURE_CHECK (getdtablesize, int, (void));
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-getgroups.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-getgroups.c	Thu Dec 24 21:01:42 2009 +0100
@@ -28,17 +28,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char **argv _GL_UNUSED)
--- a/tests/test-getline.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-getline.c	Thu Dec 24 21:01:42 2009 +0100
@@ -27,17 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-getndelim2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-getndelim2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,17 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-glob.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-glob.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,22 +25,9 @@
                              glob_t *));
 SIGNATURE_CHECK (globfree, void, (glob_t *));
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr)                                                    \
-  do                                                                    \
-    {                                                                   \
-      if (!(expr))                                                      \
-        {                                                               \
-          fprintf (stderr, "%s:%d: assertion failed\n",                 \
-                   __FILE__, __LINE__);                                 \
-          fflush (stderr);                                              \
-          abort ();                                                     \
-        }                                                               \
-    }                                                                   \
-  while (0)
+#include "macros.h"
 
 #define GL_NO_SUCH_FILE "/gnulib-magic-does-not-exist"
 
--- a/tests/test-hash.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-hash.c	Thu Dec 24 21:01:42 2009 +0100
@@ -28,21 +28,11 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "macros.h"
+
 #define STREQ(a, b) (strcmp (a, b) == 0)
 #define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-
 static bool
 hash_compare_strings (void const *x, void const *y)
 {
--- a/tests/test-i-ring.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-i-ring.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,20 +20,7 @@
 
 #include "i-ring.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-iconv-utf.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-iconv-utf.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of character set conversion.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,21 +23,9 @@
 #endif
 
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-iconv.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-iconv.c	Thu Dec 24 21:01:42 2009 +0100
@@ -34,21 +34,9 @@
 #endif
 
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-idpriv-drop.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-idpriv-drop.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,17 +24,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static void
 show_uids ()
--- a/tests/test-idpriv-droptemp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-idpriv-droptemp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,17 +24,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static void
 show_uids ()
--- a/tests/test-inet_ntop.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-inet_ntop.c	Thu Dec 24 21:01:42 2009 +0100
@@ -26,21 +26,9 @@
 
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-inet_pton.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-inet_pton.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,20 +25,8 @@
 
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-isblank.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-isblank.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,19 +25,8 @@
 
 #include <limits.h>
 #include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-isfinite.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-isfinite.c	Thu Dec 24 21:01:42 2009 +0100
@@ -28,20 +28,8 @@
 
 #include <float.h>
 #include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 float zerof = 0.0f;
 double zerod = 0.0;
--- a/tests/test-isinf.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-isinf.c	Thu Dec 24 21:01:42 2009 +0100
@@ -28,20 +28,8 @@
 
 #include <float.h>
 #include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 float zerof = 0.0f;
 double zerod = 0.0;
--- a/tests/test-isnan.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-isnan.c	Thu Dec 24 21:01:42 2009 +0100
@@ -28,22 +28,9 @@
 
 #include <float.h>
 #include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "nan.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0f.
    So we use -zero instead.  */
--- a/tests/test-isnand.h	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-isnand.h	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of isnand() substitute.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,22 +17,9 @@
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
 #include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "nan.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0.
    So we use -zero instead.  */
--- a/tests/test-isnanf.h	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-isnanf.h	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of isnanf() substitute.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,22 +17,9 @@
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
 #include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "nan.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0f.
    So we use -zero instead.  */
--- a/tests/test-isnanl.h	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-isnanl.h	Thu Dec 24 21:01:42 2009 +0100
@@ -18,22 +18,9 @@
 
 #include <float.h>
 #include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "nan.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* On HP-UX 10.20, negating 0.0L does not yield -0.0L.
    So we use minus_zero instead.
--- a/tests/test-lchown.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-lchown.c	Thu Dec 24 21:01:42 2009 +0100
@@ -32,18 +32,7 @@
 
 #include "mgetgroups.h"
 #include "stat-time.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-lchown.t"
 
--- a/tests/test-ldexpl.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-ldexpl.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,24 +24,11 @@
 SIGNATURE_CHECK (ldexpl, long double, (long double, int));
 
 #include <float.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "fpucw.h"
 #include "isnanl-nolibm.h"
 #include "nan.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* On HP-UX 10.20, negating 0.0L does not yield -0.0L.
    So we use minus_zero instead.
--- a/tests/test-link.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-link.c	Thu Dec 24 21:01:42 2009 +0100
@@ -30,17 +30,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-link.t"
 
--- a/tests/test-linkat.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-linkat.c	Thu Dec 24 21:01:42 2009 +0100
@@ -34,18 +34,7 @@
 #include "filenamecat.h"
 #include "same-inode.h"
 #include "xgetcwd.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-linkat.t"
 
--- a/tests/test-linked_list.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-linked_list.c	Thu Dec 24 21:01:42 2009 +0100
@@ -19,29 +19,17 @@
 
 #include "gl_linked_list.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "gl_array_list.h"
 #include "progname.h"
+#include "macros.h"
 
 static const char *objects[15] =
   {
     "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o"
   };
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
 #define RANDOM(n) (rand () % (n))
 #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]
 
--- a/tests/test-linkedhash_list.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-linkedhash_list.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,12 +20,12 @@
 #include "gl_linkedhash_list.h"
 
 #include <limits.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "gl_array_list.h"
 #include "progname.h"
+#include "macros.h"
 
 static const char *objects[15] =
   {
@@ -57,18 +57,6 @@
   return h;
 }
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
 #define RANDOM(n) (rand () % (n))
 #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]
 
--- a/tests/test-localename.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-localename.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,22 +21,10 @@
 #include "localename.h"
 
 #include <locale.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static struct { int cat; int mask; const char *string; } const categories[] =
   {
--- a/tests/test-lseek.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-lseek.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,19 +24,8 @@
 SIGNATURE_CHECK (lseek, off_t, (int, off_t, int));
 
 #include <errno.h>
-#include <stdio.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* ARGC must be 2; *ARGV[1] is '0' if stdin and stdout are files, '1'
    if they are pipes, and '2' if they are closed.  Check for proper
--- a/tests/test-lstat.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-lstat.c	Thu Dec 24 21:01:42 2009 +0100
@@ -35,18 +35,7 @@
 #include <unistd.h>
 
 #include "same-inode.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-lstat.t"
 
--- a/tests/test-mbmemcasecmp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbmemcasecmp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -22,22 +22,9 @@
 
 #include <locale.h>
 #include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-mbmemcasecmp.h"
 
--- a/tests/test-mbmemcasecoll.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbmemcasecoll.c	Thu Dec 24 21:01:42 2009 +0100
@@ -22,22 +22,9 @@
 
 #include <locale.h>
 #include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-mbmemcasecmp.h"
 
--- a/tests/test-mbrtowc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbrtowc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -26,20 +26,9 @@
 
 #include <locale.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-mbscasecmp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbscasecmp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of case-insensitive string comparison function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,20 +21,8 @@
 #include <string.h>
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-mbscasestr1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbscasestr1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of case-insensitive searching in a string.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,20 +20,9 @@
 
 #include <string.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-mbscasestr2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbscasestr2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of searching in a string.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,20 +21,9 @@
 #include <string.h>
 
 #include <locale.h>
-#include <stdio.h>
 #include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-mbscasestr3.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbscasestr3.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of case-insensitive searching in a string.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,20 +21,8 @@
 #include <string.h>
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-mbscasestr4.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbscasestr4.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of case-insensitive searching in a string.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,20 +21,8 @@
 #include <string.h>
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-mbschr.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbschr.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of searching a string for a character.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,20 +21,8 @@
 #include <string.h>
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-mbscspn.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbscspn.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of searching a string for a character among a given set of characters.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,20 +21,8 @@
 #include <string.h>
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-mbsinit.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbsinit.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,20 +24,8 @@
 SIGNATURE_CHECK (mbsinit, int, (const mbstate_t *));
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-mbsncasecmp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbsncasecmp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of case-insensitive string comparison function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,20 +21,8 @@
 #include <string.h>
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-mbsnrtowcs.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbsnrtowcs.c	Thu Dec 24 21:01:42 2009 +0100
@@ -26,20 +26,9 @@
 
 #include <locale.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-mbspbrk.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbspbrk.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of searching a string for a character among a given set of characters.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,20 +21,8 @@
 #include <string.h>
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-mbspcasecmp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbspcasecmp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of case-insensitive string comparison function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,20 +21,8 @@
 #include <string.h>
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-mbsrchr.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbsrchr.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of searching a string for the last occurrence of a character.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,20 +21,8 @@
 #include <string.h>
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-mbsrtowcs.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbsrtowcs.c	Thu Dec 24 21:01:42 2009 +0100
@@ -26,20 +26,9 @@
 
 #include <locale.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-mbsspn.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbsspn.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of searching a string for a character outside a given set of characters.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,20 +21,8 @@
 #include <string.h>
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-mbsstr1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbsstr1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of searching in a string.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,20 +20,9 @@
 
 #include <string.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-mbsstr2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbsstr2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of searching in a string.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,20 +21,9 @@
 #include <string.h>
 
 #include <locale.h>
-#include <stdio.h>
 #include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-mbsstr3.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mbsstr3.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of searching in a string.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,20 +21,8 @@
 #include <string.h>
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-memchr.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-memchr.c	Thu Dec 24 21:01:42 2009 +0100
@@ -22,22 +22,10 @@
 #include "signature.h"
 SIGNATURE_CHECK (memchr, void *, (void const *, int, size_t));
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "zerosize-ptr.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Calculating void * + int is not portable, so this wrapper converts
    to char * to make the tests easier to write.  */
--- a/tests/test-memchr2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-memchr2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -19,23 +19,11 @@
 
 #include "memchr2.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "zerosize-ptr.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Calculating void * + int is not portable, so this wrapper converts
    to char * to make the tests easier to write.  */
--- a/tests/test-memcmp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-memcmp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -22,22 +22,8 @@
 #include "signature.h"
 SIGNATURE_CHECK (memcmp, int, (void const *, void const *, size_t));
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "zerosize-ptr.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-memmem.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-memmem.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,23 +23,11 @@
 SIGNATURE_CHECK (memmem, void *, (void const *, size_t, void const *, size_t));
 
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "zerosize-ptr.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static void *
 null_ptr (void)
--- a/tests/test-memrchr.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-memrchr.c	Thu Dec 24 21:01:42 2009 +0100
@@ -22,22 +22,10 @@
 #include "signature.h"
 SIGNATURE_CHECK (memrchr, void *, (void const *, int, size_t));
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "zerosize-ptr.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Calculating void * + int is not portable, so this wrapper converts
    to char * to make the tests easier to write.  */
--- a/tests/test-mkdir.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mkdir.c	Thu Dec 24 21:01:42 2009 +0100
@@ -30,17 +30,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-mkdir.t"
 
--- a/tests/test-mkdirat.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mkdirat.c	Thu Dec 24 21:01:42 2009 +0100
@@ -30,17 +30,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-mkdirat.t"
 
--- a/tests/test-mkfifo.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mkfifo.c	Thu Dec 24 21:01:42 2009 +0100
@@ -30,17 +30,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-mkfifo.t"
 
--- a/tests/test-mkfifoat.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mkfifoat.c	Thu Dec 24 21:01:42 2009 +0100
@@ -32,17 +32,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-mkfifoat.t"
 
--- a/tests/test-mknod.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-mknod.c	Thu Dec 24 21:01:42 2009 +0100
@@ -30,17 +30,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-mknod.t"
 
--- a/tests/test-nanosleep.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-nanosleep.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,23 +25,10 @@
 
 #include <errno.h>
 #include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 
 #include "intprops.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #if HAVE_DECL_ALARM
 static void
--- a/tests/test-nl_langinfo.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-nl_langinfo.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,23 +24,11 @@
 SIGNATURE_CHECK (nl_langinfo, char *, (nl_item));
 
 #include <locale.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "c-strcase.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-obstack-printf.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-obstack-printf.c	Thu Dec 24 21:01:42 2009 +0100
@@ -33,18 +33,7 @@
 #include <string.h>
 
 #include "progname.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free free
--- a/tests/test-open.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-open.c	Thu Dec 24 21:01:42 2009 +0100
@@ -26,20 +26,9 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-open.t"
 
--- a/tests/test-openat.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-openat.c	Thu Dec 24 21:01:42 2009 +0100
@@ -27,20 +27,9 @@
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-openat.t"
 
--- a/tests/test-pipe-filter-gi1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-pipe-filter-gi1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -19,25 +19,11 @@
 
 #include "pipe-filter.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "binary-io.h"
 #include "c-ctype.h"
 #include "read-file.h"
 #include "progname.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 
 /* Pipe a text file through 'tr a-z A-Z', which converts ASCII characters from
--- a/tests/test-pipe-filter-gi2-main.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-pipe-filter-gi2-main.c	Thu Dec 24 21:01:42 2009 +0100
@@ -28,18 +28,7 @@
 
 #include "full-write.h"
 #include "progname.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* 0.1 sec pause */
 static void
--- a/tests/test-pipe-filter-ii1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-pipe-filter-ii1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -19,25 +19,11 @@
 
 #include "pipe-filter.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "binary-io.h"
 #include "c-ctype.h"
 #include "read-file.h"
 #include "progname.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 
 /* Pipe a text file through 'tr a-z A-Z', which converts ASCII characters from
--- a/tests/test-pipe-filter-ii2-main.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-pipe-filter-ii2-main.c	Thu Dec 24 21:01:42 2009 +0100
@@ -28,18 +28,7 @@
 
 #include "full-write.h"
 #include "progname.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 struct locals
 {
--- a/tests/test-pipe2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-pipe2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -32,18 +32,7 @@
 #endif
 
 #include "binary-io.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Return true if FD is open.  */
 static bool
--- a/tests/test-popen.h	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-popen.h	Thu Dec 24 21:01:42 2009 +0100
@@ -24,17 +24,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char **argv)
--- a/tests/test-posixtm.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-posixtm.c	Thu Dec 24 21:01:42 2009 +0100
@@ -27,18 +27,7 @@
 #include <time.h>
 
 #include "intprops.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 struct posixtm_test
 {
--- a/tests/test-pread.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-pread.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,23 +23,11 @@
 #include "signature.h"
 SIGNATURE_CHECK (pread, ssize_t, (int, void *, size_t, off_t));
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <errno.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define N (sizeof buf - 1)
 
--- a/tests/test-printf-frexp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-printf-frexp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of splitting a double into fraction and mantissa.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,20 +21,8 @@
 #include "printf-frexp.h"
 
 #include <float.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static double
 my_ldexp (double x, int d)
--- a/tests/test-printf-frexpl.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-printf-frexpl.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of splitting a 'long double' into fraction and mantissa.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,22 +21,9 @@
 #include "printf-frexpl.h"
 
 #include <float.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "fpucw.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* On MIPS IRIX machines, LDBL_MIN_EXP is -1021, but the smallest reliable
    exponent for 'long double' is -964.  Similarly, on PowerPC machines,
--- a/tests/test-printf-posix.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-printf-posix.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,20 +25,9 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-printf-posix.h"
 
--- a/tests/test-priv-set.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-priv-set.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,22 +24,10 @@
 # include <priv.h>
 #endif
 #include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <errno.h>
 #include <sys/types.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-quotearg.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-quotearg.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,24 +25,12 @@
 #include <locale.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "progname.h"
 #include "gettext.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 struct result_strings {
   char const *str1; /* Translation of "".  */
--- a/tests/test-random_r.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-random_r.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,20 +25,9 @@
 SIGNATURE_CHECK (setstate_r, int, (char *, struct random_data *));
 SIGNATURE_CHECK (random_r, int, (struct random_data *, int32_t *));
 
-#include <stdio.h>
 #include <time.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-rawmemchr.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-rawmemchr.c	Thu Dec 24 21:01:42 2009 +0100
@@ -22,20 +22,9 @@
 #include "signature.h"
 SIGNATURE_CHECK (rawmemchr, void *, (void const *, int));
 
-#include <stdio.h>
 #include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Calculating void * + int is not portable, so this wrapper converts
    to char * to make the tests easier to write.  */
--- a/tests/test-rbtree_list.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-rbtree_list.c	Thu Dec 24 21:01:42 2009 +0100
@@ -19,11 +19,11 @@
 
 #include "gl_rbtree_list.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "gl_array_list.h"
 #include "progname.h"
+#include "macros.h"
 
 extern void gl_rbtree_list_check_invariants (gl_list_t list);
 
@@ -32,18 +32,6 @@
     "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o"
   };
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
 #define RANDOM(n) (rand () % (n))
 #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]
 
--- a/tests/test-rbtree_oset.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-rbtree_oset.c	Thu Dec 24 21:01:42 2009 +0100
@@ -19,12 +19,12 @@
 
 #include "gl_rbtree_oset.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "gl_array_oset.h"
 #include "progname.h"
+#include "macros.h"
 
 extern void gl_rbtree_oset_check_invariants (gl_oset_t set);
 
@@ -34,18 +34,6 @@
     "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "<", ">", "[", "]"
   };
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
 #define RANDOM(n) (rand () % (n))
 #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]
 
--- a/tests/test-rbtreehash_list.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-rbtreehash_list.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,12 +20,12 @@
 #include "gl_rbtreehash_list.h"
 
 #include <limits.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "gl_array_list.h"
 #include "progname.h"
+#include "macros.h"
 
 extern void gl_rbtreehash_list_check_invariants (gl_list_t list);
 
@@ -59,18 +59,6 @@
   return h;
 }
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
 #define RANDOM(n) (rand () % (n))
 #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]
 
--- a/tests/test-readlink.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-readlink.c	Thu Dec 24 21:01:42 2009 +0100
@@ -31,17 +31,7 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-readlink.t"
 
--- a/tests/test-remove.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-remove.c	Thu Dec 24 21:01:42 2009 +0100
@@ -30,17 +30,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-remove.t"
 
--- a/tests/test-rename.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-rename.c	Thu Dec 24 21:01:42 2009 +0100
@@ -29,17 +29,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-rename.t"
 
--- a/tests/test-renameat.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-renameat.c	Thu Dec 24 21:01:42 2009 +0100
@@ -32,18 +32,7 @@
 
 #include "filenamecat.h"
 #include "xgetcwd.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-renameat.t"
 
--- a/tests/test-rmdir.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-rmdir.c	Thu Dec 24 21:01:42 2009 +0100
@@ -30,17 +30,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-rmdir.t"
 
--- a/tests/test-round1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-round1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,23 +25,9 @@
 #include "signature.h"
 SIGNATURE_CHECK (round, double, (double));
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "isnand-nolibm.h"
 #include "nan.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0.
    So we use -zero instead.  */
--- a/tests/test-roundf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-roundf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,23 +25,9 @@
 #include "signature.h"
 SIGNATURE_CHECK (roundf, float, (float));
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "isnanf-nolibm.h"
 #include "nan.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0f.
    So we use -zero instead.  */
--- a/tests/test-roundl.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-roundl.c	Thu Dec 24 21:01:42 2009 +0100
@@ -26,24 +26,11 @@
 SIGNATURE_CHECK (roundl, long double, (long double));
 
 #include <float.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "fpucw.h"
 #include "isnanl-nolibm.h"
 #include "nan.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* On HP-UX 10.20, negating 0.0L does not yield -0.0L.
    So we use minus_zero instead.
--- a/tests/test-safe-alloc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-safe-alloc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,20 +24,7 @@
 
 #include "safe-alloc.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-sameacls.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-sameacls.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test whether two files have the same ACLs.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -32,18 +32,7 @@
 #include "progname.h"
 #include "read-file.h"
 #include "xalloc.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-set-mode-acl.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-set-mode-acl.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of setting an ACL equivalent to a mode.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,22 +20,10 @@
 
 #include "acl.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "progname.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-setenv.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-setenv.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,21 +24,10 @@
 SIGNATURE_CHECK (setenv, int, (char const *, char const *, int));
 
 #include <errno.h>
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-sigaction.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-sigaction.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,21 +24,9 @@
 SIGNATURE_CHECK (sigaction, int, (int, struct sigaction const *,
                                   struct sigaction *));
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <stddef.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          signal (SIGABRT, SIG_DFL);                                         \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #ifndef SA_NOCLDSTOP
 # define SA_NOCLDSTOP 0
--- a/tests/test-signbit.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-signbit.c	Thu Dec 24 21:01:42 2009 +0100
@@ -27,20 +27,8 @@
 
 #include <float.h>
 #include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 float zerof = 0.0f;
 double zerod = 0.0;
--- a/tests/test-sleep.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-sleep.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,20 +24,8 @@
 SIGNATURE_CHECK (sleep, unsigned int, (unsigned int));
 
 #include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #if HAVE_DECL_ALARM
 static void
--- a/tests/test-snprintf-posix.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-snprintf-posix.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of POSIX compatible snprintf() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,18 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-snprintf-posix.h"
 
--- a/tests/test-snprintf.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-snprintf.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,20 +23,9 @@
 #include "signature.h"
 SIGNATURE_CHECK (snprintf, int, (char *, size_t, char const *, ...));
 
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-sprintf-posix.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-sprintf-posix.c	Thu Dec 24 21:01:42 2009 +0100
@@ -29,18 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-sprintf-posix.h"
 
--- a/tests/test-stat-time.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-stat-time.c	Thu Dec 24 21:01:42 2009 +0100
@@ -22,22 +22,10 @@
 
 #include <fcntl.h>
 #include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 enum { NFILES = 4 };
 
--- a/tests/test-stat.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-stat.c	Thu Dec 24 21:01:42 2009 +0100
@@ -31,23 +31,11 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 
 #include "pathmax.h"
 #include "same-inode.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-stat.t"
 
--- a/tests/test-strcasestr.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-strcasestr.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,21 +24,10 @@
 SIGNATURE_CHECK (strcasestr, char *, (char const *, char const *));
 
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-strchrnul.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-strchrnul.c	Thu Dec 24 21:01:42 2009 +0100
@@ -22,20 +22,9 @@
 #include "signature.h"
 SIGNATURE_CHECK (strchrnul, char *, (char const *, int));
 
-#include <stdio.h>
 #include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                        \
-    {                                                                       \
-      if (!(expr))                                                      \
-        {                                                               \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                              \
-          abort ();                                                     \
-        }                                                               \
-    }                                                                   \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-strerror.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-strerror.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,20 +25,8 @@
 SIGNATURE_CHECK (strerror, char *, (int));
 
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-striconv.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-striconv.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of character set conversion.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,21 +25,10 @@
 #endif
 
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-striconveh.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-striconveh.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,22 +25,10 @@
 #endif
 
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Magic number for detecting bounds violations.  */
 #define MAGIC 0x1983EFF1
--- a/tests/test-striconveha.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-striconveha.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of character set conversion with error handling and autodetection.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,22 +25,10 @@
 #endif
 
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Magic number for detecting bounds violations.  */
 #define MAGIC 0x1983EFF1
--- a/tests/test-strsignal.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-strsignal.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,20 +25,8 @@
 SIGNATURE_CHECK (strsignal, char *, (int));
 
 #include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #if HAVE_DECL_SYS_SIGLIST
 # define ASSERT_DESCRIPTION(got, expect)
--- a/tests/test-strstr.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-strstr.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,23 +23,11 @@
 SIGNATURE_CHECK (strstr, char *, (char const *, char const *));
 
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "zerosize-ptr.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-strtod.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-strtod.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,22 +25,10 @@
 #include <errno.h>
 #include <float.h>
 #include <math.h>
-#include <stdio.h>
 #include <string.h>
 
 #include "isnand-nolibm.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          /* FIXME abort ();*/status = 1;                               \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Avoid requiring -lm just for fabs.  */
 #define FABS(d) ((d) < 0.0 ? -(d) : (d))
--- a/tests/test-strverscmp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-strverscmp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,20 +24,7 @@
 #include "signature.h"
 SIGNATURE_CHECK (strverscmp, int, (const char *, const char *));
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-symlink.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-symlink.c	Thu Dec 24 21:01:42 2009 +0100
@@ -30,17 +30,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-symlink.t"
 
--- a/tests/test-symlinkat.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-symlinkat.c	Thu Dec 24 21:01:42 2009 +0100
@@ -32,22 +32,12 @@
 #include <string.h>
 #include <sys/stat.h>
 
+#include "macros.h"
+
 #ifndef HAVE_SYMLINK
 # define HAVE_SYMLINK 0
 #endif
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-
 #define BASE "test-symlinkat.t"
 
 #include "test-readlink.h"
--- a/tests/test-trunc1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-trunc1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,23 +23,9 @@
 #include "signature.h"
 SIGNATURE_CHECK (trunc, double, (double));
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "isnand-nolibm.h"
 #include "nan.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0.
    So we use -zero instead.  */
--- a/tests/test-trunc2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-trunc2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of rounding towards zero.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,21 +24,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "isnand-nolibm.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 
 /* The reference implementation, taken from lib/trunc.c.  */
--- a/tests/test-truncf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-truncf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,23 +23,9 @@
 #include "signature.h"
 SIGNATURE_CHECK (truncf, float, (float));
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "isnanf-nolibm.h"
 #include "nan.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0f.
    So we use -zero instead.  */
--- a/tests/test-truncf2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-truncf2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of rounding towards zero.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,21 +24,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "isnanf-nolibm.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 
 /* The reference implementation, taken from lib/trunc.c.  */
--- a/tests/test-truncl.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-truncl.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,24 +24,11 @@
 SIGNATURE_CHECK (truncl, long double, (long double));
 
 #include <float.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "fpucw.h"
 #include "isnanl-nolibm.h"
 #include "nan.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* On HP-UX 10.20, negating 0.0L does not yield -0.0L.
    So we use minus_zero instead.
--- a/tests/test-uname.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-uname.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,20 +24,9 @@
 SIGNATURE_CHECK (uname, int, (struct utsname *));
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 
 /* This program can be called with no arguments, then it performs a unit
--- a/tests/test-unlink.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-unlink.c	Thu Dec 24 21:01:42 2009 +0100
@@ -32,18 +32,7 @@
 #include <sys/stat.h>
 
 #include "unlinkdir.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-unlink.t"
 
--- a/tests/test-unlinkat.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-unlinkat.c	Thu Dec 24 21:01:42 2009 +0100
@@ -31,18 +31,7 @@
 #include <sys/stat.h>
 
 #include "unlinkdir.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-unlinkat.t"
 
--- a/tests/test-unsetenv.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-unsetenv.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,21 +24,10 @@
 SIGNATURE_CHECK (unsetenv, int, (char const *));
 
 #include <errno.h>
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (void)
--- a/tests/test-usleep.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-usleep.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,21 +23,9 @@
 #include "signature.h"
 SIGNATURE_CHECK (usleep, int, (useconds_t));
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <time.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main(void)
--- a/tests/test-utimens.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-utimens.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,17 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-utimens.t"
 
--- a/tests/test-utimensat.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-utimensat.c	Thu Dec 24 21:01:42 2009 +0100
@@ -35,18 +35,7 @@
 #include "stat-time.h"
 #include "timespec.h"
 #include "utimecmp.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define BASE "test-utimensat.t"
 
--- a/tests/test-vasnprintf-posix.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-vasnprintf-posix.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,26 +23,13 @@
 #include <float.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "macros.h"
 #include "nan.h"
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-
 /* The SGI MIPS floating-point format does not distinguish 0.0 and -0.0.  */
 static int
 have_minus_zero ()
--- a/tests/test-vasnprintf-posix2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-vasnprintf-posix2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of POSIX compatible vasnprintf() and asnprintf() functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,21 +21,10 @@
 #include "vasnprintf.h"
 
 #include <locale.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-vasnprintf.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-vasnprintf.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of vasnprintf() and asnprintf() functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,21 +21,10 @@
 #include "vasnprintf.h"
 
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static char *
 my_asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
--- a/tests/test-vasprintf-posix.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-vasprintf-posix.c	Thu Dec 24 21:01:42 2009 +0100
@@ -27,21 +27,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "macros.h"
 #include "nan.h"
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-
 /* The SGI MIPS floating-point format does not distinguish 0.0 and -0.0.  */
 static int
 have_minus_zero ()
--- a/tests/test-vasprintf.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-vasprintf.c	Thu Dec 24 21:01:42 2009 +0100
@@ -28,17 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 my_asprintf (char **result, const char *format, ...)
--- a/tests/test-vdprintf-posix.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-vdprintf-posix.c	Thu Dec 24 21:01:42 2009 +0100
@@ -26,20 +26,9 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-fprintf-posix.h"
 
--- a/tests/test-vfprintf-posix.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-vfprintf-posix.c	Thu Dec 24 21:01:42 2009 +0100
@@ -26,20 +26,9 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-fprintf-posix.h"
 
--- a/tests/test-vprintf-posix.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-vprintf-posix.c	Thu Dec 24 21:01:42 2009 +0100
@@ -26,20 +26,9 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-printf-posix.h"
 
--- a/tests/test-vsnprintf-posix.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-vsnprintf-posix.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of POSIX compatible vsnprintf() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,18 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-snprintf-posix.h"
 
--- a/tests/test-vsnprintf.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-vsnprintf.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,20 +24,9 @@
 SIGNATURE_CHECK (vsnprintf, int, (char *, size_t, char const *, va_list));
 
 #include <stdarg.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 my_snprintf (char *buf, int size, const char *format, ...)
--- a/tests/test-vsprintf-posix.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-vsprintf-posix.c	Thu Dec 24 21:01:42 2009 +0100
@@ -30,18 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-sprintf-posix.h"
 
--- a/tests/test-wcrtomb.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-wcrtomb.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,21 +24,10 @@
 SIGNATURE_CHECK (wcrtomb, size_t, (char *, wchar_t, mbstate_t *));
 
 #include <locale.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Check the multibyte character s[0..n-1].  */
 static void
--- a/tests/test-wcsnrtombs.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-wcsnrtombs.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,21 +25,10 @@
                                       mbstate_t *));
 
 #include <locale.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-wcsrtombs.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-wcsrtombs.c	Thu Dec 24 21:01:42 2009 +0100
@@ -25,21 +25,10 @@
                                      mbstate_t *));
 
 #include <locale.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/test-wctype.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-wctype.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,20 +20,7 @@
 
 #include <wctype.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Check that the type wint_t is defined.  */
 wint_t a = 'x';
--- a/tests/test-wcwidth.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-wcwidth.c	Thu Dec 24 21:01:42 2009 +0100
@@ -24,23 +24,10 @@
 SIGNATURE_CHECK (wcwidth, int, (wchar_t));
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "localcharset.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/test-xfprintf-posix.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-xfprintf-posix.c	Thu Dec 24 21:01:42 2009 +0100
@@ -22,24 +22,11 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "progname.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-fprintf-posix.h"
 
--- a/tests/test-xmemdup0.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-xmemdup0.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,23 +21,11 @@
 
 #include "xmemdup0.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "progname.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char **argv)
--- a/tests/test-xprintf-posix.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-xprintf-posix.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,24 +21,11 @@
 #include "xprintf.h"
 
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "progname.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-printf-posix.h"
 
--- a/tests/test-xvasprintf.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/test-xvasprintf.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,23 +21,11 @@
 #include "xvasprintf.h"
 
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "progname.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static char *
 my_xasprintf (const char *format, ...)
--- a/tests/unicase/test-locale-language.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-locale-language.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,21 +21,9 @@
 #include "unicase.h"
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
--- a/tests/unicase/test-mapping-part1.h	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-mapping-part1.h	Thu Dec 24 21:01:42 2009 +0100
@@ -18,23 +18,9 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed for c = 0x%04X\n",       \
-                   __FILE__, __LINE__, c);                                   \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
+#include "macros.h"
 
 /* Pair of Unicode characters.  */
 typedef struct { ucs4_t ch; ucs4_t value; } pair_t;
--- a/tests/unicase/test-predicate-part1.h	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-predicate-part1.h	Thu Dec 24 21:01:42 2009 +0100
@@ -18,23 +18,9 @@
 
 #include "unicase/caseprop.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed for c = 0x%04X\n",       \
-                   __FILE__, __LINE__, c);                                   \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
+#include "macros.h"
 
 /* Interval of Unicode characters.  */
 typedef struct { ucs4_t start; ucs4_t end; } interval_t;
--- a/tests/unicase/test-u16-casecmp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u16-casecmp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint16_t
 #include "test-casecmp.h"
--- a/tests/unicase/test-u16-casecoll.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u16-casecoll.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,23 +21,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint16_t
 #include "test-casecmp.h"
--- a/tests/unicase/test-u16-casefold.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u16-casefold.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,24 +20,11 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "unistr.h"
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint16_t *input, size_t input_length,
--- a/tests/unicase/test-u16-is-cased.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u16-is-cased.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint16_t
 #include "test-is-cased.h"
--- a/tests/unicase/test-u16-is-casefolded.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u16-is-casefolded.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint16_t
 #include "test-is-casefolded.h"
--- a/tests/unicase/test-u16-is-lowercase.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u16-is-lowercase.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint16_t
 #include "test-is-lowercase.h"
--- a/tests/unicase/test-u16-is-titlecase.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u16-is-titlecase.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint16_t
 #include "test-is-titlecase.h"
--- a/tests/unicase/test-u16-is-uppercase.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u16-is-uppercase.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint16_t
 #include "test-is-uppercase.h"
--- a/tests/unicase/test-u16-tolower.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u16-tolower.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,24 +20,11 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "unistr.h"
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint16_t *input, size_t input_length,
--- a/tests/unicase/test-u16-totitle.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u16-totitle.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,24 +20,11 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "unistr.h"
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint16_t *input, size_t input_length,
--- a/tests/unicase/test-u16-toupper.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u16-toupper.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,24 +20,11 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "unistr.h"
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint16_t *input, size_t input_length,
--- a/tests/unicase/test-u32-casecmp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u32-casecmp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint32_t
 #include "test-casecmp.h"
--- a/tests/unicase/test-u32-casecoll.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u32-casecoll.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,23 +21,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint32_t
 #include "test-casecmp.h"
--- a/tests/unicase/test-u32-casefold.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u32-casefold.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,24 +20,11 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "unistr.h"
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint32_t *input, size_t input_length,
--- a/tests/unicase/test-u32-is-cased.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u32-is-cased.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint32_t
 #include "test-is-cased.h"
--- a/tests/unicase/test-u32-is-casefolded.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u32-is-casefolded.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint32_t
 #include "test-is-casefolded.h"
--- a/tests/unicase/test-u32-is-lowercase.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u32-is-lowercase.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint32_t
 #include "test-is-lowercase.h"
--- a/tests/unicase/test-u32-is-titlecase.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u32-is-titlecase.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint32_t
 #include "test-is-titlecase.h"
--- a/tests/unicase/test-u32-is-uppercase.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u32-is-uppercase.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint32_t
 #include "test-is-uppercase.h"
--- a/tests/unicase/test-u32-tolower.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u32-tolower.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,24 +20,11 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "unistr.h"
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint32_t *input, size_t input_length,
--- a/tests/unicase/test-u32-totitle.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u32-totitle.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,24 +20,11 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "unistr.h"
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint32_t *input, size_t input_length,
--- a/tests/unicase/test-u32-toupper.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u32-toupper.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,24 +20,11 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "unistr.h"
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint32_t *input, size_t input_length,
--- a/tests/unicase/test-u8-casecmp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u8-casecmp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint8_t
 #include "test-casecmp.h"
--- a/tests/unicase/test-u8-casecoll.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u8-casecoll.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,23 +21,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint8_t
 #include "test-casecmp.h"
--- a/tests/unicase/test-u8-casefold.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u8-casefold.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,24 +20,11 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "unistr.h"
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint8_t *input, size_t input_length,
--- a/tests/unicase/test-u8-is-cased.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u8-is-cased.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint8_t
 #include "test-is-cased.h"
--- a/tests/unicase/test-u8-is-casefolded.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u8-is-casefolded.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint8_t
 #include "test-is-casefolded.h"
--- a/tests/unicase/test-u8-is-lowercase.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u8-is-lowercase.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint8_t
 #include "test-is-lowercase.h"
--- a/tests/unicase/test-u8-is-titlecase.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u8-is-titlecase.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint8_t
 #include "test-is-titlecase.h"
--- a/tests/unicase/test-u8-is-uppercase.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u8-is-uppercase.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,8 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT uint8_t
 #include "test-is-uppercase.h"
--- a/tests/unicase/test-u8-tolower.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u8-tolower.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,24 +20,11 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "unistr.h"
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint8_t *input, size_t input_length,
--- a/tests/unicase/test-u8-totitle.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u8-totitle.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,24 +20,11 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "unistr.h"
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint8_t *input, size_t input_length,
--- a/tests/unicase/test-u8-toupper.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-u8-toupper.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,24 +20,11 @@
 
 #include "unicase.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "unistr.h"
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint8_t *input, size_t input_length,
--- a/tests/unicase/test-ulc-casecmp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-ulc-casecmp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,21 +21,7 @@
 #include "unicase.h"
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT char
 #include "test-casecmp.h"
--- a/tests/unicase/test-ulc-casecoll.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unicase/test-ulc-casecoll.c	Thu Dec 24 21:01:42 2009 +0100
@@ -22,23 +22,9 @@
 #include "unicase.h"
 
 #include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "uninorm.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define UNIT char
 #include "test-casecmp.h"
--- a/tests/uniconv/test-u16-conv-from-enc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniconv/test-u16-conv-from-enc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,24 +20,11 @@
 
 #include "uniconv.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Magic number for detecting bounds violations.  */
 #define MAGIC 0x1983EFF1
--- a/tests/uniconv/test-u16-conv-to-enc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniconv/test-u16-conv-to-enc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,22 +21,10 @@
 #include "uniconv.h"
 
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Magic number for detecting bounds violations.  */
 #define MAGIC 0x1983EFF1
--- a/tests/uniconv/test-u16-strconv-from-enc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniconv/test-u16-strconv-from-enc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,10 @@
 
 #include "uniconv.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uniconv/test-u16-strconv-to-enc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniconv/test-u16-strconv-to-enc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of conversion from UTF-16 to legacy encodings.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,22 +21,10 @@
 #include "uniconv.h"
 
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uniconv/test-u32-conv-from-enc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniconv/test-u32-conv-from-enc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,24 +20,11 @@
 
 #include "uniconv.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Magic number for detecting bounds violations.  */
 #define MAGIC 0x1983EFF1
--- a/tests/uniconv/test-u32-conv-to-enc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniconv/test-u32-conv-to-enc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,22 +21,10 @@
 #include "uniconv.h"
 
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Magic number for detecting bounds violations.  */
 #define MAGIC 0x1983EFF1
--- a/tests/uniconv/test-u32-strconv-from-enc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniconv/test-u32-strconv-from-enc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,10 @@
 
 #include "uniconv.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uniconv/test-u32-strconv-to-enc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniconv/test-u32-strconv-to-enc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of conversion from UTF-32 to legacy encodings.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,22 +21,9 @@
 #include "uniconv.h"
 
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uniconv/test-u8-conv-from-enc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniconv/test-u8-conv-from-enc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,24 +20,11 @@
 
 #include "uniconv.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Magic number for detecting bounds violations.  */
 #define MAGIC 0x1983EFF1
--- a/tests/uniconv/test-u8-conv-to-enc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniconv/test-u8-conv-to-enc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,24 +21,11 @@
 #include "uniconv.h"
 
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* Magic number for detecting bounds violations.  */
 #define MAGIC 0x1983EFF1
--- a/tests/uniconv/test-u8-strconv-from-enc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniconv/test-u8-strconv-from-enc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,10 @@
 
 #include "uniconv.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uniconv/test-u8-strconv-to-enc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniconv/test-u8-strconv-to-enc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of conversion from UTF-8 to legacy encodings.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,22 +21,10 @@
 #include "uniconv.h"
 
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-bidi_byname.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-bidi_byname.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-bidi_name.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-bidi_name.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-bidi_of.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-bidi_of.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-bidi_test.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-bidi_test.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-block_list.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-block_list.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-block_of.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-block_of.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-block_test.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-block_test.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-categ_and.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-categ_and.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-categ_and_not.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-categ_and_not.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-categ_byname.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-categ_byname.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-categ_name.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-categ_name.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-categ_none.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-categ_none.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-categ_of.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-categ_of.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-categ_or.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-categ_or.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-categ_test_withtable.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-categ_test_withtable.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-combining.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-combining.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-decdigit.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-decdigit.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,22 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
+#include "macros.h"
 
 static const struct { unsigned int ch; int value; } mapping[] =
   {
--- a/tests/unictype/test-digit.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-digit.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,22 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
+#include "macros.h"
 
 static const struct { unsigned int ch; int value; } mapping[] =
   {
--- a/tests/unictype/test-mirror.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-mirror.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-numeric.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-numeric.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,22 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
+#include "macros.h"
 
 static const struct { unsigned int ch; int numerator; int denominator; }
   mapping[] =
--- a/tests/unictype/test-pr_byname.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-pr_byname.c	Thu Dec 24 21:01:42 2009 +0100
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-pr_test.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-pr_test.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-predicate-part1.h	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-predicate-part1.h	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,23 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed for c = 0x%04X\n",       \
-                   __FILE__, __LINE__, c);                                   \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
+#include "macros.h"
 
 /* Interval of Unicode characters.  */
 typedef struct { ucs4_t start; ucs4_t end; } interval_t;
--- a/tests/unictype/test-scripts.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-scripts.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-sy_c_ident.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-sy_c_ident.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unictype/test-sy_java_ident.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unictype/test-sy_java_ident.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,9 @@
 
 #include "unictype.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unilbrk/test-u16-possible-linebreaks.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unilbrk/test-u16-possible-linebreaks.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of line breaking of UTF-16 strings.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,21 +20,9 @@
 
 #include "unilbrk.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unilbrk/test-u16-width-linebreaks.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unilbrk/test-u16-width-linebreaks.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of line breaking of UTF-16 strings.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,21 +20,9 @@
 
 #include "unilbrk.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unilbrk/test-u32-possible-linebreaks.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unilbrk/test-u32-possible-linebreaks.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of line breaking of UTF-32 strings.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,21 +20,9 @@
 
 #include "unilbrk.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unilbrk/test-u32-width-linebreaks.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unilbrk/test-u32-width-linebreaks.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of line breaking of UTF-32 strings.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,21 +20,9 @@
 
 #include "unilbrk.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unilbrk/test-u8-possible-linebreaks.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unilbrk/test-u8-possible-linebreaks.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of line breaking of UTF-8 strings.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,21 +20,9 @@
 
 #include "unilbrk.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unilbrk/test-u8-width-linebreaks.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unilbrk/test-u8-width-linebreaks.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of line breaking of UTF-8 strings.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,21 +20,9 @@
 
 #include "unilbrk.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unilbrk/test-ulc-possible-linebreaks.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unilbrk/test-ulc-possible-linebreaks.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of line breaking of strings.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,21 +20,9 @@
 
 #include "unilbrk.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/unilbrk/test-ulc-width-linebreaks.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unilbrk/test-ulc-width-linebreaks.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of line breaking of strings.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,21 +20,9 @@
 
 #include "unilbrk.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uninorm/test-canonical-decomposition.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-canonical-decomposition.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,20 +20,7 @@
 
 #include "uninorm.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uninorm/test-compat-decomposition.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-compat-decomposition.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,22 +20,8 @@
 
 #include "uninorm/decompose-internal.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "uninorm.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uninorm/test-composition.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-composition.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,20 +20,7 @@
 
 #include "uninorm.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uninorm/test-decomposing-form.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-decomposing-form.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,20 +20,7 @@
 
 #include "uninorm.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uninorm/test-decomposition.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-decomposition.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,20 +20,7 @@
 
 #include "uninorm.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uninorm/test-u16-nfc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u16-nfc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,24 +23,11 @@
 #include "uninorm.h"
 
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint16_t *input, size_t input_length,
--- a/tests/uninorm/test-u16-nfd.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u16-nfd.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,24 +23,11 @@
 #include "uninorm.h"
 
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint16_t *input, size_t input_length,
--- a/tests/uninorm/test-u16-nfkc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u16-nfkc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,24 +23,11 @@
 #include "uninorm.h"
 
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint16_t *input, size_t input_length,
--- a/tests/uninorm/test-u16-nfkd.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u16-nfkd.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,24 +23,11 @@
 #include "uninorm.h"
 
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint16_t *input, size_t input_length,
--- a/tests/uninorm/test-u16-normcmp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u16-normcmp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,21 +20,7 @@
 
 #include "uninorm.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u16-normcmp.h"
 
--- a/tests/uninorm/test-u16-normcoll.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u16-normcoll.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,21 +21,7 @@
 
 #include "uninorm.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u16-normcmp.h"
 int
--- a/tests/uninorm/test-u32-nfc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u32-nfc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,24 +23,11 @@
 #include "uninorm.h"
 
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint32_t *input, size_t input_length,
--- a/tests/uninorm/test-u32-nfd.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u32-nfd.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,24 +23,11 @@
 #include "uninorm.h"
 
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint32_t *input, size_t input_length,
--- a/tests/uninorm/test-u32-nfkc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u32-nfkc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,24 +23,11 @@
 #include "uninorm.h"
 
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint32_t *input, size_t input_length,
--- a/tests/uninorm/test-u32-nfkd.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u32-nfkd.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,24 +23,11 @@
 #include "uninorm.h"
 
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint32_t *input, size_t input_length,
--- a/tests/uninorm/test-u32-normalize-big.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u32-normalize-big.c	Thu Dec 24 21:01:42 2009 +0100
@@ -28,18 +28,7 @@
 
 #include "xalloc.h"
 #include "unistr.h"
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #define ASSERT_WITH_LINE(expr, file, line) \
   do                                                                         \
--- a/tests/uninorm/test-u32-normcmp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u32-normcmp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,21 +20,7 @@
 
 #include "uninorm.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u32-normcmp.h"
 
--- a/tests/uninorm/test-u32-normcoll.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u32-normcoll.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,21 +21,7 @@
 
 #include "uninorm.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u32-normcmp.h"
 int
--- a/tests/uninorm/test-u8-nfc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u8-nfc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,24 +23,11 @@
 #include "uninorm.h"
 
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint8_t *input, size_t input_length,
--- a/tests/uninorm/test-u8-nfd.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u8-nfd.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,24 +23,11 @@
 #include "uninorm.h"
 
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint8_t *input, size_t input_length,
--- a/tests/uninorm/test-u8-nfkc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u8-nfkc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,24 +23,11 @@
 #include "uninorm.h"
 
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint8_t *input, size_t input_length,
--- a/tests/uninorm/test-u8-nfkd.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u8-nfkd.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,24 +23,11 @@
 #include "uninorm.h"
 
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static int
 check (const uint8_t *input, size_t input_length,
--- a/tests/uninorm/test-u8-normcmp.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u8-normcmp.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,21 +20,7 @@
 
 #include "uninorm.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u8-normcmp.h"
 
--- a/tests/uninorm/test-u8-normcoll.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-u8-normcoll.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,21 +21,7 @@
 
 #include "uninorm.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u8-normcmp.h"
 int
--- a/tests/uninorm/test-uninorm-filter-nfc.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uninorm/test-uninorm-filter-nfc.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,23 +20,10 @@
 
 #include "uninorm.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* A stream of Unicode characters that simply accumulates the contents.  */
 
--- a/tests/unistdio/test-u16-asnprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u16-asnprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u16_asnprintf() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,25 +23,12 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u16-asnprintf1.h"
 
--- a/tests/unistdio/test-u16-vasnprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u16-vasnprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u16_vasnprintf() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,25 +23,12 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u16-asnprintf1.h"
 #include "test-u16-printf1.h"
--- a/tests/unistdio/test-u16-vasnprintf2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u16-vasnprintf2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u16_vasnprintf() function in an ISO-8859-1 locale.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,25 +22,12 @@
 
 #include <locale.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static void
 test_function (uint16_t * (*my_asnprintf) (uint16_t *, size_t *, const char *, ...))
--- a/tests/unistdio/test-u16-vasnprintf3.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u16-vasnprintf3.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u16_vasnprintf() function in an UTF-8 locale.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,25 +22,12 @@
 
 #include <locale.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static void
 test_function (uint16_t * (*my_asnprintf) (uint16_t *, size_t *, const char *, ...))
--- a/tests/unistdio/test-u16-vasprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u16-vasprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u16_vasprintf() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,25 +23,12 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u16-printf1.h"
 
--- a/tests/unistdio/test-u16-vsnprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u16-vsnprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,19 +30,7 @@
 #include "unistr.h"
 #include "xalloc.h"
 #include "progname.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u16-printf1.h"
 
--- a/tests/unistdio/test-u16-vsprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u16-vsprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,19 +30,7 @@
 #include "unistr.h"
 #include "xalloc.h"
 #include "progname.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u16-printf1.h"
 
--- a/tests/unistdio/test-u32-asnprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u32-asnprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u32_asnprintf() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,25 +23,12 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u32-asnprintf1.h"
 
--- a/tests/unistdio/test-u32-vasnprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u32-vasnprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u32_vasnprintf() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,25 +23,12 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u32-asnprintf1.h"
 #include "test-u32-printf1.h"
--- a/tests/unistdio/test-u32-vasnprintf2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u32-vasnprintf2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u32_vasnprintf() function in an ISO-8859-1 locale.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,25 +22,12 @@
 
 #include <locale.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static void
 test_function (uint32_t * (*my_asnprintf) (uint32_t *, size_t *, const char *, ...))
--- a/tests/unistdio/test-u32-vasnprintf3.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u32-vasnprintf3.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u32_vasnprintf() function in an UTF-8 locale.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,25 +22,12 @@
 
 #include <locale.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static void
 test_function (uint32_t * (*my_asnprintf) (uint32_t *, size_t *, const char *, ...))
--- a/tests/unistdio/test-u32-vasprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u32-vasprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u32_vasprintf() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,25 +23,12 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u32-printf1.h"
 
--- a/tests/unistdio/test-u32-vsnprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u32-vsnprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,19 +30,7 @@
 #include "unistr.h"
 #include "xalloc.h"
 #include "progname.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u32-printf1.h"
 
--- a/tests/unistdio/test-u32-vsprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u32-vsprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,19 +30,7 @@
 #include "unistr.h"
 #include "xalloc.h"
 #include "progname.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u32-printf1.h"
 
--- a/tests/unistdio/test-u8-asnprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u8-asnprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u8_asnprintf() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,25 +23,12 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u8-asnprintf1.h"
 
--- a/tests/unistdio/test-u8-vasnprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u8-vasnprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u8_vasnprintf() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,25 +23,12 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u8-asnprintf1.h"
 #include "test-u8-printf1.h"
--- a/tests/unistdio/test-u8-vasnprintf2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u8-vasnprintf2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u8_vasnprintf() function in an ISO-8859-1 locale.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,25 +22,12 @@
 
 #include <locale.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static void
 test_function (uint8_t * (*my_asnprintf) (uint8_t *, size_t *, const char *, ...))
--- a/tests/unistdio/test-u8-vasnprintf3.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u8-vasnprintf3.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u8_vasnprintf() function in an UTF-8 locale.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,25 +22,12 @@
 
 #include <locale.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static void
 test_function (uint8_t * (*my_asnprintf) (uint8_t *, size_t *, const char *, ...))
--- a/tests/unistdio/test-u8-vasprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u8-vasprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u8_vasprintf() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,25 +23,12 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u8-printf1.h"
 
--- a/tests/unistdio/test-u8-vsnprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u8-vsnprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,19 +30,7 @@
 #include "unistr.h"
 #include "xalloc.h"
 #include "progname.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u8-printf1.h"
 
--- a/tests/unistdio/test-u8-vsprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-u8-vsprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,19 +30,7 @@
 #include "unistr.h"
 #include "xalloc.h"
 #include "progname.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-u8-printf1.h"
 
--- a/tests/unistdio/test-ulc-asnprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-ulc-asnprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of ulc_asnprintf() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,23 +22,11 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-ulc-asnprintf1.h"
 
--- a/tests/unistdio/test-ulc-vasnprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-ulc-vasnprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of ulc_vasnprintf() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,23 +22,11 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-ulc-asnprintf1.h"
 #include "test-ulc-printf1.h"
--- a/tests/unistdio/test-ulc-vasnprintf2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-ulc-vasnprintf2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of ulc_vasnprintf() function in an ISO-8859-1 locale.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,23 +22,11 @@
 
 #include <locale.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static void
 test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
--- a/tests/unistdio/test-ulc-vasnprintf3.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-ulc-vasnprintf3.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of ulc_vasnprintf() function in an UTF-8 locale.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,23 +22,11 @@
 
 #include <locale.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 static void
 test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
--- a/tests/unistdio/test-ulc-vasprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-ulc-vasprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of ulc_vasprintf() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,23 +22,11 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-ulc-printf1.h"
 
--- a/tests/unistdio/test-ulc-vsnprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-ulc-vsnprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -22,26 +22,13 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "xalloc.h"
 #include "progname.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-ulc-printf1.h"
 
--- a/tests/unistdio/test-ulc-vsprintf1.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/unistdio/test-ulc-vsprintf1.c	Thu Dec 24 21:01:42 2009 +0100
@@ -22,26 +22,13 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "xalloc.h"
 #include "progname.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 #include "test-ulc-printf1.h"
 
--- a/tests/uniwbrk/test-u16-wordbreaks.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniwbrk/test-u16-wordbreaks.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,21 +20,9 @@
 
 #include "uniwbrk.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uniwbrk/test-u32-wordbreaks.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniwbrk/test-u32-wordbreaks.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,21 +20,9 @@
 
 #include "uniwbrk.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uniwbrk/test-u8-wordbreaks.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniwbrk/test-u8-wordbreaks.c	Thu Dec 24 21:01:42 2009 +0100
@@ -20,21 +20,9 @@
 
 #include "uniwbrk.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uniwbrk/test-ulc-wordbreaks.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniwbrk/test-ulc-wordbreaks.c	Thu Dec 24 21:01:42 2009 +0100
@@ -21,21 +21,9 @@
 #include "uniwbrk.h"
 
 #include <locale.h>
-#include <stdio.h>
 #include <stdlib.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uniwidth/test-u16-strwidth.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniwidth/test-u16-strwidth.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u16_strwidth() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,20 +20,7 @@
 
 #include "uniwidth.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uniwidth/test-u16-width.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniwidth/test-u16-width.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u16_width() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,20 +20,7 @@
 
 #include "uniwidth.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uniwidth/test-u32-strwidth.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniwidth/test-u32-strwidth.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u32_strwidth() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,20 +20,7 @@
 
 #include "uniwidth.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uniwidth/test-u32-width.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniwidth/test-u32-width.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u32_width() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,20 +20,7 @@
 
 #include "uniwidth.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uniwidth/test-u8-strwidth.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniwidth/test-u8-strwidth.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u8_strwidth() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,20 +20,7 @@
 
 #include "uniwidth.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uniwidth/test-u8-width.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniwidth/test-u8-width.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of u8_width() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,20 +20,7 @@
 
 #include "uniwidth.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uniwidth/test-uc_width.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniwidth/test-uc_width.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of uc_width() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,20 +20,7 @@
 
 #include "uniwidth.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 int
 main ()
--- a/tests/uniwidth/test-uc_width2.c	Thu Dec 24 20:29:33 2009 +0100
+++ b/tests/uniwidth/test-uc_width2.c	Thu Dec 24 21:01:42 2009 +0100
@@ -1,5 +1,5 @@
 /* Test of uc_width() function.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,19 +21,8 @@
 #include "uniwidth.h"
 
 #include <stdio.h>
-#include <stdlib.h>
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#include "macros.h"
 
 /* One of 0, '0', '1', 'A', '2'.  */
 static char current_width;