Refactor common macros used in tests.

diff --git a/ChangeLog b/ChangeLog
index 16e5a99..98ea48c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/modules/acl-tests b/modules/acl-tests
index b0a3b73..c9c04cd 100644 (file)
--- a/modules/acl-tests
+++ b/modules/acl-tests
@@ -6,6 +6,7 @@ tests/test-file-has-acl.c
 tests/test-set-mode-acl.c
 tests/test-copy-acl.c
 tests/test-sameacls.c
+tests/macros.h
 
 Depends-on:
 progname

diff --git a/modules/areadlink-tests b/modules/areadlink-tests
index 0e7796e..37c26c2 100644 (file)
--- a/modules/areadlink-tests
+++ b/modules/areadlink-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-areadlink.h
 tests/test-areadlink.c
+tests/macros.h
 
 Depends-on:
 stdbool

diff --git a/modules/areadlink-with-size-tests b/modules/areadlink-with-size-tests
index 9752034..1dddea8 100644 (file)
--- a/modules/areadlink-with-size-tests
+++ b/modules/areadlink-with-size-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-areadlink.h
 tests/test-areadlink-with-size.c
+tests/macros.h
 
 Depends-on:
 stdbool

diff --git a/modules/areadlinkat-tests b/modules/areadlinkat-tests
index ca0adc4..45a8d48 100644 (file)
--- a/modules/areadlinkat-tests
+++ b/modules/areadlinkat-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-areadlink.h
 tests/test-areadlinkat.c
+tests/macros.h
 
 Depends-on:
 stdbool

diff --git a/modules/areadlinkat-with-size-tests b/modules/areadlinkat-with-size-tests
index f3d3878..972bc3e 100644 (file)
--- a/modules/areadlinkat-with-size-tests
+++ b/modules/areadlinkat-with-size-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-areadlink.h
 tests/test-areadlinkat-with-size.c
+tests/macros.h
 
 Depends-on:
 stdbool

diff --git a/modules/argmatch-tests b/modules/argmatch-tests
index 253d4d6..85ac3a2 100644 (file)
--- a/modules/argmatch-tests
+++ b/modules/argmatch-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-argmatch.c
+tests/macros.h
 
 Depends-on:
 progname

diff --git a/modules/argv-iter-tests b/modules/argv-iter-tests
index af0405b..92c5c82 100644 (file)
--- a/modules/argv-iter-tests
+++ b/modules/argv-iter-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-argv-iter.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/array-list-tests b/modules/array-list-tests
index 83dc54c..1e9524d 100644 (file)
--- a/modules/array-list-tests
+++ b/modules/array-list-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-array_list.c
+tests/macros.h
 
 Depends-on:
 progname

diff --git a/modules/array-mergesort-tests b/modules/array-mergesort-tests
index ab12308..5bf9b67 100644 (file)
--- a/modules/array-mergesort-tests
+++ b/modules/array-mergesort-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-array-mergesort.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/array-oset-tests b/modules/array-oset-tests
index 89f071d..5791316 100644 (file)
--- a/modules/array-oset-tests
+++ b/modules/array-oset-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-array_oset.c
+tests/macros.h
 
 Depends-on:
 xlist

diff --git a/modules/avltree-list-tests b/modules/avltree-list-tests
index c87eda3..cbd47c7 100644 (file)
--- a/modules/avltree-list-tests
+++ b/modules/avltree-list-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-avltree_list.c
+tests/macros.h
 
 Depends-on:
 array-list

diff --git a/modules/avltree-oset-tests b/modules/avltree-oset-tests
index a33b6c6..a29ad58 100644 (file)
--- a/modules/avltree-oset-tests
+++ b/modules/avltree-oset-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-avltree_oset.c
+tests/macros.h
 
 Depends-on:
 array-oset

diff --git a/modules/avltreehash-list-tests b/modules/avltreehash-list-tests
index dd013d2..eae613e 100644 (file)
--- a/modules/avltreehash-list-tests
+++ b/modules/avltreehash-list-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-avltreehash_list.c
+tests/macros.h
 
 Depends-on:
 array-list

diff --git a/modules/base64-tests b/modules/base64-tests
index 6406768..b8659a8 100644 (file)
--- a/modules/base64-tests
+++ b/modules/base64-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-base64.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/binary-io-tests b/modules/binary-io-tests
index 1cdc88a..e59f056 100644 (file)
--- a/modules/binary-io-tests
+++ b/modules/binary-io-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-binary-io.sh
 tests/test-binary-io.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/bitrotate-tests b/modules/bitrotate-tests
index 405607a..c686019 100644 (file)
--- a/modules/bitrotate-tests
+++ b/modules/bitrotate-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-bitrotate.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/btowc-tests b/modules/btowc-tests
index c5e73ce..371bde9 100644 (file)
--- a/modules/btowc-tests
+++ b/modules/btowc-tests
@@ -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
 

diff --git a/modules/byteswap-tests b/modules/byteswap-tests
index 0ac626e..08ffc83 100644 (file)
--- a/modules/byteswap-tests
+++ b/modules/byteswap-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-byteswap.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/c-ctype-tests b/modules/c-ctype-tests
index 35a47c1..196f529 100644 (file)
--- a/modules/c-ctype-tests
+++ b/modules/c-ctype-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-c-ctype.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/c-stack-tests b/modules/c-stack-tests
index dfed076..808e59e 100644 (file)
--- a/modules/c-stack-tests
+++ b/modules/c-stack-tests
@@ -2,6 +2,7 @@ Files:
 tests/test-c-stack.c
 tests/test-c-stack.sh
 tests/test-c-stack2.sh
+tests/macros.h
 
 Depends-on:
 exitfail

diff --git a/modules/c-strcase-tests b/modules/c-strcase-tests
index f223ffd..aec09db 100644 (file)
--- a/modules/c-strcase-tests
+++ b/modules/c-strcase-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/c-strcasestr-tests b/modules/c-strcasestr-tests
index 857a592..f671086 100644 (file)
--- a/modules/c-strcasestr-tests
+++ b/modules/c-strcasestr-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-c-strcasestr.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/c-strstr-tests b/modules/c-strstr-tests
index 381d7a3..78565b2 100644 (file)
--- a/modules/c-strstr-tests
+++ b/modules/c-strstr-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-c-strstr.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/canonicalize-lgpl-tests b/modules/canonicalize-lgpl-tests
index 5ddb199..bc07ea3 100644 (file)
--- a/modules/canonicalize-lgpl-tests
+++ b/modules/canonicalize-lgpl-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-canonicalize-lgpl.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 same-inode

diff --git a/modules/canonicalize-tests b/modules/canonicalize-tests
index b10b61d..fb18d66 100644 (file)
--- a/modules/canonicalize-tests
+++ b/modules/canonicalize-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-canonicalize.c
+tests/macros.h
 
 Depends-on:
 progname

diff --git a/modules/carray-list-tests b/modules/carray-list-tests
index 82e7b78..4f13705 100644 (file)
--- a/modules/carray-list-tests
+++ b/modules/carray-list-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-carray_list.c
+tests/macros.h
 
 Depends-on:
 array-list

diff --git a/modules/ceilf-tests b/modules/ceilf-tests
index 2599ab1..f58cbed 100644 (file)
--- a/modules/ceilf-tests
+++ b/modules/ceilf-tests
@@ -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

diff --git a/modules/ceill-tests b/modules/ceill-tests
index 0d5f0fd..6ac9b5a 100644 (file)
--- a/modules/ceill-tests
+++ b/modules/ceill-tests
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-ceill.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 fpucw

diff --git a/modules/chown-tests b/modules/chown-tests
index a320328..68f74f0 100644 (file)
--- a/modules/chown-tests
+++ b/modules/chown-tests
@@ -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

diff --git a/modules/cloexec-tests b/modules/cloexec-tests
index 22792db..3a76b9e 100644 (file)
--- a/modules/cloexec-tests
+++ b/modules/cloexec-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-cloexec.c
+tests/macros.h
 
 Depends-on:
 binary-io

diff --git a/modules/copy-file-tests b/modules/copy-file-tests
index a683dee..c4fe4fd 100644 (file)
--- a/modules/copy-file-tests
+++ b/modules/copy-file-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-copy-file.sh
 tests/test-copy-file.c
+tests/macros.h
 
 Depends-on:
 acl

diff --git a/modules/count-one-bits-tests b/modules/count-one-bits-tests
index c8241b3..bf0a543 100644 (file)
--- a/modules/count-one-bits-tests
+++ b/modules/count-one-bits-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-count-one-bits.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/dprintf-posix-tests b/modules/dprintf-posix-tests
index 5b865ce..e4df83d 100644 (file)
--- a/modules/dprintf-posix-tests
+++ b/modules/dprintf-posix-tests
@@ -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

diff --git a/modules/dup2-tests b/modules/dup2-tests
index b24ef67..679f4b1 100644 (file)
--- a/modules/dup2-tests
+++ b/modules/dup2-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-dup2.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 binary-io

diff --git a/modules/dup3-tests b/modules/dup3-tests
index 2886d60..26dd5d8 100644 (file)
--- a/modules/dup3-tests
+++ b/modules/dup3-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-dup3.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 open

diff --git a/modules/duplocale-tests b/modules/duplocale-tests
index f0e9064..af9dc98 100644 (file)
--- a/modules/duplocale-tests
+++ b/modules/duplocale-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-duplocale.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/fbufmode-tests b/modules/fbufmode-tests
index 8a9041f..fa36a61 100644 (file)
--- a/modules/fbufmode-tests
+++ b/modules/fbufmode-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-fbufmode.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/fchdir-tests b/modules/fchdir-tests
index 2e202f3..462e709 100644 (file)
--- a/modules/fchdir-tests
+++ b/modules/fchdir-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-fchdir.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 getcwd

diff --git a/modules/fcntl-safer-tests b/modules/fcntl-safer-tests
index 3e8a2f6..cb35aed 100644 (file)
--- a/modules/fcntl-safer-tests
+++ b/modules/fcntl-safer-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-open.h
 tests/test-fcntl-safer.c
+tests/macros.h
 
 Depends-on:
 stdbool

diff --git a/modules/fcntl-tests b/modules/fcntl-tests
index e47f2d6..44b040c 100644 (file)
--- a/modules/fcntl-tests
+++ b/modules/fcntl-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-fcntl.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 binary-io

diff --git a/modules/fdopendir-tests b/modules/fdopendir-tests
index c0bafb6..bee2df7 100644 (file)
--- a/modules/fdopendir-tests
+++ b/modules/fdopendir-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-fdopendir.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 open

diff --git a/modules/fdutimensat-tests b/modules/fdutimensat-tests
index 16cf82c..dc55c45 100644 (file)
--- a/modules/fdutimensat-tests
+++ b/modules/fdutimensat-tests
@@ -5,6 +5,7 @@ tests/test-lutimens.h
 tests/test-utimens.h
 tests/test-utimens-common.h
 tests/test-fdutimensat.c
+tests/macros.h
 
 Depends-on:
 progname

diff --git a/modules/fflush-tests b/modules/fflush-tests
index db5a5c0..e439c2c 100644 (file)
--- a/modules/fflush-tests
+++ b/modules/fflush-tests
@@ -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

diff --git a/modules/filevercmp-tests b/modules/filevercmp-tests
index 165ecfe..46cf401 100644 (file)
--- a/modules/filevercmp-tests
+++ b/modules/filevercmp-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-filevercmp.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/flock-tests b/modules/flock-tests
index 441e23e..ece4b48 100644 (file)
--- a/modules/flock-tests
+++ b/modules/flock-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-flock.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 unistd

diff --git a/modules/floorf-tests b/modules/floorf-tests
index d6a8185..988d892 100644 (file)
--- a/modules/floorf-tests
+++ b/modules/floorf-tests
@@ -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

diff --git a/modules/floorl-tests b/modules/floorl-tests
index 1031092..4cffee6 100644 (file)
--- a/modules/floorl-tests
+++ b/modules/floorl-tests
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-floorl.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 fpucw

diff --git a/modules/fnmatch-tests b/modules/fnmatch-tests
index c83b905..cb16de4 100644 (file)
--- a/modules/fnmatch-tests
+++ b/modules/fnmatch-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-fnmatch.c
+tests/signature.h
+tests/macros.h
 
 Makefile.am:
 TESTS += test-fnmatch

diff --git a/modules/fopen-safer-tests b/modules/fopen-safer-tests
index 21116e6..256c54c 100644 (file)
--- a/modules/fopen-safer-tests
+++ b/modules/fopen-safer-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-fopen.h
 tests/test-fopen-safer.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/fopen-tests b/modules/fopen-tests
index 208ec3b..69ff6ac 100644 (file)
--- a/modules/fopen-tests
+++ b/modules/fopen-tests
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-fopen.h
 tests/test-fopen.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/fpending-tests b/modules/fpending-tests
index c6261a5..bc8394c 100644 (file)
--- a/modules/fpending-tests
+++ b/modules/fpending-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-fpending.c
 tests/test-fpending.sh
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/fprintf-posix-tests b/modules/fprintf-posix-tests
index 4ac9a12..1473544 100644 (file)
--- a/modules/fprintf-posix-tests
+++ b/modules/fprintf-posix-tests
@@ -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.sh
 tests/test-fprintf-posix2.c
 tests/test-fprintf-posix3.sh
 tests/test-fprintf-posix3.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdint

diff --git a/modules/fpurge-tests b/modules/fpurge-tests
index b5c99c9..74e898d 100644 (file)
--- a/modules/fpurge-tests
+++ b/modules/fpurge-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-fpurge.c
+tests/macros.h
 
 Depends-on:
 fflush

diff --git a/modules/freadable-tests b/modules/freadable-tests
index bace519..9e6f415 100644 (file)
--- a/modules/freadable-tests
+++ b/modules/freadable-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-freadable.c
+tests/macros.h
 
 Depends-on:
 fflush

diff --git a/modules/freadahead-tests b/modules/freadahead-tests
index d834963..13e95cd 100644 (file)
--- a/modules/freadahead-tests
+++ b/modules/freadahead-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-freadahead.c
 tests/test-freadahead.sh
+tests/macros.h
 
 Depends-on:
 lseek

diff --git a/modules/freading-tests b/modules/freading-tests
index 78cb96a..10c2311 100644 (file)
--- a/modules/freading-tests
+++ b/modules/freading-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-freading.c
+tests/macros.h
 
 Depends-on:
 fflush

diff --git a/modules/freadptr-tests b/modules/freadptr-tests
index c9e3155..783aea7 100644 (file)
--- a/modules/freadptr-tests
+++ b/modules/freadptr-tests
@@ -3,6 +3,7 @@ tests/test-freadptr.c
 tests/test-freadptr.sh
 tests/test-freadptr2.c
 tests/test-freadptr2.sh
+tests/macros.h
 
 Depends-on:
 lseek

diff --git a/modules/freadseek-tests b/modules/freadseek-tests
index 6fb1548..e89607a 100644 (file)
--- a/modules/freadseek-tests
+++ b/modules/freadseek-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-freadseek.c
 tests/test-freadseek.sh
+tests/macros.h
 
 Depends-on:
 unistd

diff --git a/modules/freopen-tests b/modules/freopen-tests
index 0f9ae21..95b5915 100644 (file)
--- a/modules/freopen-tests
+++ b/modules/freopen-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-freopen.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/frexp-nolibm-tests b/modules/frexp-nolibm-tests
index acbfec7..abde575 100644 (file)
--- a/modules/frexp-nolibm-tests
+++ b/modules/frexp-nolibm-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-frexp.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 isnand-nolibm

diff --git a/modules/frexp-tests b/modules/frexp-tests
index e90189b..a5cfeaf 100644 (file)
--- a/modules/frexp-tests
+++ b/modules/frexp-tests
@@ -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

diff --git a/modules/frexpl-nolibm-tests b/modules/frexpl-nolibm-tests
index 8579956..90b8ee4 100644 (file)
--- a/modules/frexpl-nolibm-tests
+++ b/modules/frexpl-nolibm-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-frexpl.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 fpucw

diff --git a/modules/frexpl-tests b/modules/frexpl-tests
index 5382cec..54fe2ae 100644 (file)
--- a/modules/frexpl-tests
+++ b/modules/frexpl-tests
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-frexpl.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 fpucw

diff --git a/modules/fseek-tests b/modules/fseek-tests
index cd76a95..6de889b 100644 (file)
--- a/modules/fseek-tests
+++ b/modules/fseek-tests
@@ -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:

diff --git a/modules/fseeko-tests b/modules/fseeko-tests
index e2fb27e..1359970 100644 (file)
--- a/modules/fseeko-tests
+++ b/modules/fseeko-tests
@@ -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:

diff --git a/modules/fstrcmp-tests b/modules/fstrcmp-tests
index c7dcda5..b82f414 100644 (file)
--- a/modules/fstrcmp-tests
+++ b/modules/fstrcmp-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-fstrcmp.c
+tests/macros.h
 
 Depends-on:
 stdbool

diff --git a/modules/fsync-tests b/modules/fsync-tests
index a3db419..e3df22d 100644 (file)
--- a/modules/fsync-tests
+++ b/modules/fsync-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-fsync.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/ftell-tests b/modules/ftell-tests
index 717b48e..c669a98 100644 (file)
--- a/modules/ftell-tests
+++ b/modules/ftell-tests
@@ -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:

diff --git a/modules/ftello-tests b/modules/ftello-tests
index c4937d0..73f659e 100644 (file)
--- a/modules/ftello-tests
+++ b/modules/ftello-tests
@@ -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:

diff --git a/modules/func-tests b/modules/func-tests
index 9be3324..cb53b6d 100644 (file)
--- a/modules/func-tests
+++ b/modules/func-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-func.c
+tests/macros.h
 
 configure.ac:
 

diff --git a/modules/futimens-tests b/modules/futimens-tests
index 702dbc2..330711d 100644 (file)
--- a/modules/futimens-tests
+++ b/modules/futimens-tests
@@ -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

diff --git a/modules/fwritable-tests b/modules/fwritable-tests
index 7c7cedc..803a331 100644 (file)
--- a/modules/fwritable-tests
+++ b/modules/fwritable-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-fwritable.c
+tests/macros.h
 
 Depends-on:
 fflush

diff --git a/modules/fwriting-tests b/modules/fwriting-tests
index 5594223..2b74b64 100644 (file)
--- a/modules/fwriting-tests
+++ b/modules/fwriting-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-fwriting.c
+tests/macros.h
 
 Depends-on:
 fflush

diff --git a/modules/getcwd-tests b/modules/getcwd-tests
index 75897cb..016961f 100644 (file)
--- a/modules/getcwd-tests
+++ b/modules/getcwd-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-getcwd.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/getdate-tests b/modules/getdate-tests
index 6b7c92b..ff2945d 100644 (file)
--- a/modules/getdate-tests
+++ b/modules/getdate-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-getdate.c
+tests/macros.h
 
 Depends-on:
 progname

diff --git a/modules/getdelim-tests b/modules/getdelim-tests
index 880c380..a2f2aa0 100644 (file)
--- a/modules/getdelim-tests
+++ b/modules/getdelim-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-getdelim.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/getdtablesize-tests b/modules/getdtablesize-tests
index 8bf1a2c..5f78c5f 100644 (file)
--- a/modules/getdtablesize-tests
+++ b/modules/getdtablesize-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-getdtablesize.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/getgroups-tests b/modules/getgroups-tests
index 69e2647..3db9224 100644 (file)
--- a/modules/getgroups-tests
+++ b/modules/getgroups-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-getgroups.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/getline-tests b/modules/getline-tests
index 676a04f..33eb2b7 100644 (file)
--- a/modules/getline-tests
+++ b/modules/getline-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-getline.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/getndelim2-tests b/modules/getndelim2-tests
index 7081b3a..d7e4dfc 100644 (file)
--- a/modules/getndelim2-tests
+++ b/modules/getndelim2-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-getndelim2.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/glob-tests b/modules/glob-tests
index bedaef0..3cf2c90 100644 (file)
--- a/modules/glob-tests
+++ b/modules/glob-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-glob.c
+tests/signature.h
+tests/macros.h
 
 Makefile.am:
 TESTS += test-glob

diff --git a/modules/hash-tests b/modules/hash-tests
index f67a085..a77bfe7 100644 (file)
--- a/modules/hash-tests
+++ b/modules/hash-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-hash.c
+tests/macros.h
 
 Depends-on:
 hash-pjw

diff --git a/modules/i-ring-tests b/modules/i-ring-tests
index 3385ca5..96361c9 100644 (file)
--- a/modules/i-ring-tests
+++ b/modules/i-ring-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-i-ring.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/iconv-tests b/modules/iconv-tests
index 46fcb1a..91e17f0 100644 (file)
--- a/modules/iconv-tests
+++ b/modules/iconv-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-iconv.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/iconv_open-utf-tests b/modules/iconv_open-utf-tests
index d5eb684..3e3c988 100644 (file)
--- a/modules/iconv_open-utf-tests
+++ b/modules/iconv_open-utf-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-iconv-utf.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/idpriv-drop-tests b/modules/idpriv-drop-tests
index 2a9c999..5416463 100644 (file)
--- a/modules/idpriv-drop-tests
+++ b/modules/idpriv-drop-tests
@@ -7,6 +7,7 @@ Files:
 tests/test-idpriv-drop.sh
 tests/test-idpriv-drop.su.sh
 tests/test-idpriv-drop.c
+tests/macros.h
 
 Depends-on:
 stdbool

diff --git a/modules/idpriv-droptemp-tests b/modules/idpriv-droptemp-tests
index 26b9136..d6c2097 100644 (file)
--- a/modules/idpriv-droptemp-tests
+++ b/modules/idpriv-droptemp-tests
@@ -7,6 +7,7 @@ Files:
 tests/test-idpriv-droptemp.sh
 tests/test-idpriv-droptemp.su.sh
 tests/test-idpriv-droptemp.c
+tests/macros.h
 
 Depends-on:
 stdbool

diff --git a/modules/inet_ntop-tests b/modules/inet_ntop-tests
index e8236d6..cab3d51 100644 (file)
--- a/modules/inet_ntop-tests
+++ b/modules/inet_ntop-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-inet_ntop.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 netinet_in

diff --git a/modules/inet_pton-tests b/modules/inet_pton-tests
index 1404e31..cc7408a 100644 (file)
--- a/modules/inet_pton-tests
+++ b/modules/inet_pton-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-inet_pton.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 netinet_in

diff --git a/modules/isblank-tests b/modules/isblank-tests
index cd140ee..43d29ad 100644 (file)
--- a/modules/isblank-tests
+++ b/modules/isblank-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-isblank.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/isfinite-tests b/modules/isfinite-tests
index 673aa1c..78971d9 100644 (file)
--- a/modules/isfinite-tests
+++ b/modules/isfinite-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-isfinite.c
+tests/macros.h
 
 Depends-on:
 float

diff --git a/modules/isinf-tests b/modules/isinf-tests
index 8e15f65..e5b6387 100644 (file)
--- a/modules/isinf-tests
+++ b/modules/isinf-tests
@@ -3,6 +3,7 @@ m4/exponentf.m4
 m4/exponentd.m4
 m4/exponentl.m4
 tests/test-isinf.c
+tests/macros.h
 
 Depends-on:
 float

diff --git a/modules/isnan-tests b/modules/isnan-tests
index d5aff2a..a63b7cf 100644 (file)
--- a/modules/isnan-tests
+++ b/modules/isnan-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-isnan.c
 tests/nan.h
+tests/macros.h
 
 Depends-on:
 float

diff --git a/modules/isnand-nolibm-tests b/modules/isnand-nolibm-tests
index 6327334..2ce8b6c 100644 (file)
--- a/modules/isnand-nolibm-tests
+++ b/modules/isnand-nolibm-tests
@@ -2,6 +2,7 @@ Files:
 tests/test-isnand-nolibm.c
 tests/test-isnand.h
 tests/nan.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/isnand-tests b/modules/isnand-tests
index 8d406fe..b9964cc 100644 (file)
--- a/modules/isnand-tests
+++ b/modules/isnand-tests
@@ -2,6 +2,7 @@ Files:
 tests/test-isnand.c
 tests/test-isnand.h
 tests/nan.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/isnanf-nolibm-tests b/modules/isnanf-nolibm-tests
index 0e83930..6aab7e0 100644 (file)
--- a/modules/isnanf-nolibm-tests
+++ b/modules/isnanf-nolibm-tests
@@ -2,6 +2,7 @@ Files:
 tests/test-isnanf-nolibm.c
 tests/test-isnanf.h
 tests/nan.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/isnanf-tests b/modules/isnanf-tests
index 6bd5adc..2c09485 100644 (file)
--- a/modules/isnanf-tests
+++ b/modules/isnanf-tests
@@ -2,6 +2,7 @@ Files:
 tests/test-isnanf.c
 tests/test-isnanf.h
 tests/nan.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/isnanl-nolibm-tests b/modules/isnanl-nolibm-tests
index f9414e3..6d2f08e 100644 (file)
--- a/modules/isnanl-nolibm-tests
+++ b/modules/isnanl-nolibm-tests
@@ -2,6 +2,7 @@ Files:
 tests/test-isnanl-nolibm.c
 tests/test-isnanl.h
 tests/nan.h
+tests/macros.h
 
 Depends-on:
 float

diff --git a/modules/isnanl-tests b/modules/isnanl-tests
index 518420f..5cff0dd 100644 (file)
--- a/modules/isnanl-tests
+++ b/modules/isnanl-tests
@@ -2,6 +2,7 @@ Files:
 tests/test-isnanl.c
 tests/test-isnanl.h
 tests/nan.h
+tests/macros.h
 
 Depends-on:
 float

diff --git a/modules/lchown-tests b/modules/lchown-tests
index 4fc7eaf..f3935d6 100644 (file)
--- a/modules/lchown-tests
+++ b/modules/lchown-tests
@@ -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

diff --git a/modules/ldexpl-tests b/modules/ldexpl-tests
index 7b76ff4..7148f26 100644 (file)
--- a/modules/ldexpl-tests
+++ b/modules/ldexpl-tests
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-ldexpl.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 fpucw

diff --git a/modules/link-tests b/modules/link-tests
index 2bdb3ee..b7fb2ff 100644 (file)
--- a/modules/link-tests
+++ b/modules/link-tests
@@ -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

diff --git a/modules/linkat-tests b/modules/linkat-tests
index 72e8a51..602d18a 100644 (file)
--- a/modules/linkat-tests
+++ b/modules/linkat-tests
@@ -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

diff --git a/modules/linked-list-tests b/modules/linked-list-tests
index fca22a6..d6fd5aa 100644 (file)
--- a/modules/linked-list-tests
+++ b/modules/linked-list-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-linked_list.c
+tests/macros.h
 
 Depends-on:
 array-list

diff --git a/modules/linkedhash-list-tests b/modules/linkedhash-list-tests
index 4f13d9a..5109149 100644 (file)
--- a/modules/linkedhash-list-tests
+++ b/modules/linkedhash-list-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-linkedhash_list.c
+tests/macros.h
 
 Depends-on:
 array-list

diff --git a/modules/localename-tests b/modules/localename-tests
index 51972e7..3fbca14 100644 (file)
--- a/modules/localename-tests
+++ b/modules/localename-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-localename.c
+tests/macros.h
 
 Depends-on:
 locale

diff --git a/modules/lseek-tests b/modules/lseek-tests
index 6b05a92..fa9a1ab 100644 (file)
--- a/modules/lseek-tests
+++ b/modules/lseek-tests
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-lseek.c
 tests/test-lseek.sh
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/lstat-tests b/modules/lstat-tests
index 43ebd94..a0296a6 100644 (file)
--- a/modules/lstat-tests
+++ b/modules/lstat-tests
@@ -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

diff --git a/modules/mbmemcasecmp-tests b/modules/mbmemcasecmp-tests
index 0560f22..e4db04d 100644 (file)
--- a/modules/mbmemcasecmp-tests
+++ b/modules/mbmemcasecmp-tests
@@ -4,6 +4,7 @@ tests/test-mbmemcasecmp2.sh
 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

diff --git a/modules/mbmemcasecoll-tests b/modules/mbmemcasecoll-tests
index a5e3451..82f117f 100644 (file)
--- a/modules/mbmemcasecoll-tests
+++ b/modules/mbmemcasecoll-tests
@@ -4,6 +4,7 @@ tests/test-mbmemcasecoll2.sh
 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

diff --git a/modules/mbrtowc-tests b/modules/mbrtowc-tests
index 0237aca..e97ff2f 100644 (file)
--- a/modules/mbrtowc-tests
+++ b/modules/mbrtowc-tests
@@ -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

diff --git a/modules/mbscasecmp-tests b/modules/mbscasecmp-tests
index 19581b6..572c838 100644 (file)
--- a/modules/mbscasecmp-tests
+++ b/modules/mbscasecmp-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-mbscasecmp.sh
 tests/test-mbscasecmp.c
+tests/macros.h
 m4/locale-tr.m4
 m4/codeset.m4
 

diff --git a/modules/mbscasestr-tests b/modules/mbscasestr-tests
index 0c6e9ba..4c6b474 100644 (file)
--- a/modules/mbscasestr-tests
+++ b/modules/mbscasestr-tests
@@ -6,6 +6,7 @@ tests/test-mbscasestr3.sh
 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

diff --git a/modules/mbschr-tests b/modules/mbschr-tests
index 4f8d831..e084423 100644 (file)
--- a/modules/mbschr-tests
+++ b/modules/mbschr-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-mbschr.sh
 tests/test-mbschr.c
+tests/macros.h
 m4/locale-zh.m4
 m4/codeset.m4
 

diff --git a/modules/mbscspn-tests b/modules/mbscspn-tests
index 66fae89..bdb8e6a 100644 (file)
--- a/modules/mbscspn-tests
+++ b/modules/mbscspn-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-mbscspn.sh
 tests/test-mbscspn.c
+tests/macros.h
 m4/locale-fr.m4
 m4/codeset.m4
 

diff --git a/modules/mbsinit-tests b/modules/mbsinit-tests
index 24777f9..8ee370e 100644 (file)
--- a/modules/mbsinit-tests
+++ b/modules/mbsinit-tests
@@ -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
 

diff --git a/modules/mbsncasecmp-tests b/modules/mbsncasecmp-tests
index 570da7a..cdfe377 100644 (file)
--- a/modules/mbsncasecmp-tests
+++ b/modules/mbsncasecmp-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-mbsncasecmp.sh
 tests/test-mbsncasecmp.c
+tests/macros.h
 m4/locale-tr.m4
 m4/codeset.m4
 

diff --git a/modules/mbsnrtowcs-tests b/modules/mbsnrtowcs-tests
index ceb5479..378d2a2 100644 (file)
--- a/modules/mbsnrtowcs-tests
+++ b/modules/mbsnrtowcs-tests
@@ -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

diff --git a/modules/mbspbrk-tests b/modules/mbspbrk-tests
index 4c90352..5582121 100644 (file)
--- a/modules/mbspbrk-tests
+++ b/modules/mbspbrk-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-mbspbrk.sh
 tests/test-mbspbrk.c
+tests/macros.h
 m4/locale-fr.m4
 m4/codeset.m4
 

diff --git a/modules/mbspcasecmp-tests b/modules/mbspcasecmp-tests
index d93a084..aab12ca 100644 (file)
--- a/modules/mbspcasecmp-tests
+++ b/modules/mbspcasecmp-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-mbspcasecmp.sh
 tests/test-mbspcasecmp.c
+tests/macros.h
 m4/locale-tr.m4
 m4/codeset.m4
 

diff --git a/modules/mbsrchr-tests b/modules/mbsrchr-tests
index 11e8146..64d3603 100644 (file)
--- a/modules/mbsrchr-tests
+++ b/modules/mbsrchr-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-mbsrchr.sh
 tests/test-mbsrchr.c
+tests/macros.h
 m4/locale-zh.m4
 m4/codeset.m4
 

diff --git a/modules/mbsrtowcs-tests b/modules/mbsrtowcs-tests
index 7b65531..3d7ed88 100644 (file)
--- a/modules/mbsrtowcs-tests
+++ b/modules/mbsrtowcs-tests
@@ -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

diff --git a/modules/mbsspn-tests b/modules/mbsspn-tests
index d84e7c4..95da3f2 100644 (file)
--- a/modules/mbsspn-tests
+++ b/modules/mbsspn-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-mbsspn.sh
 tests/test-mbsspn.c
+tests/macros.h
 m4/locale-fr.m4
 m4/codeset.m4
 

diff --git a/modules/mbsstr-tests b/modules/mbsstr-tests
index e75d4ab..c36c02d 100644 (file)
--- a/modules/mbsstr-tests
+++ b/modules/mbsstr-tests
@@ -4,6 +4,7 @@ tests/test-mbsstr2.sh
 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

diff --git a/modules/memchr-tests b/modules/memchr-tests
index 79d6f48..4fafa8d 100644 (file)
--- a/modules/memchr-tests
+++ b/modules/memchr-tests
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-memchr.c
 tests/zerosize-ptr.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/memchr2-tests b/modules/memchr2-tests
index 99c02b1..66901ae 100644 (file)
--- a/modules/memchr2-tests
+++ b/modules/memchr2-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-memchr2.c
 tests/zerosize-ptr.h
+tests/macros.h
 m4/mmap-anon.m4
 
 Depends-on:

diff --git a/modules/memcmp-tests b/modules/memcmp-tests
index 33d740d..15f099c 100644 (file)
--- a/modules/memcmp-tests
+++ b/modules/memcmp-tests
@@ -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:

diff --git a/modules/memmem-tests b/modules/memmem-tests
index 88301ed..4738d5c 100644 (file)
--- a/modules/memmem-tests
+++ b/modules/memmem-tests
@@ -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:

diff --git a/modules/memrchr-tests b/modules/memrchr-tests
index d5bc773..e3af277 100644 (file)
--- a/modules/memrchr-tests
+++ b/modules/memrchr-tests
@@ -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:

diff --git a/modules/mkdir-tests b/modules/mkdir-tests
index 5f22b23..5f455c7 100644 (file)
--- a/modules/mkdir-tests
+++ b/modules/mkdir-tests
@@ -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

diff --git a/modules/mkfifo-tests b/modules/mkfifo-tests
index d3d0887..1f92a41 100644 (file)
--- a/modules/mkfifo-tests
+++ b/modules/mkfifo-tests
@@ -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

diff --git a/modules/mkfifoat-tests b/modules/mkfifoat-tests
index ea8c414..5e72b94 100644 (file)
--- a/modules/mkfifoat-tests
+++ b/modules/mkfifoat-tests
@@ -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

diff --git a/modules/mknod-tests b/modules/mknod-tests
index 3f4bbab..c273f66 100644 (file)
--- a/modules/mknod-tests
+++ b/modules/mknod-tests
@@ -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

diff --git a/modules/nanosleep-tests b/modules/nanosleep-tests
index ddc57c1..c3b5f2f 100644 (file)
--- a/modules/nanosleep-tests
+++ b/modules/nanosleep-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-nanosleep.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/nl_langinfo-tests b/modules/nl_langinfo-tests
index 7c9ce97..944b1d0 100644 (file)
--- a/modules/nl_langinfo-tests
+++ b/modules/nl_langinfo-tests
@@ -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:

diff --git a/modules/obstack-printf-tests b/modules/obstack-printf-tests
index 8bff6bd..f1c99ca 100644 (file)
--- a/modules/obstack-printf-tests
+++ b/modules/obstack-printf-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-obstack-printf.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 progname

diff --git a/modules/open-tests b/modules/open-tests
index cb8affb..5bc4e0f 100644 (file)
--- a/modules/open-tests
+++ b/modules/open-tests
@@ -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

diff --git a/modules/openat-tests b/modules/openat-tests
index a3a08ac..489601c 100644 (file)
--- a/modules/openat-tests
+++ b/modules/openat-tests
@@ -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-fstatat.c
 tests/test-mkdirat.c
 tests/test-openat.c
 tests/test-unlinkat.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 mgetgroups

diff --git a/modules/pipe-filter-gi-tests b/modules/pipe-filter-gi-tests
index f0b2969..263c766 100644 (file)
--- a/modules/pipe-filter-gi-tests
+++ b/modules/pipe-filter-gi-tests
@@ -5,6 +5,7 @@ tests/test-vasnprintf-posix.c
 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

diff --git a/modules/pipe-filter-ii-tests b/modules/pipe-filter-ii-tests
index 725d7be..abb5fef 100644 (file)
--- a/modules/pipe-filter-ii-tests
+++ b/modules/pipe-filter-ii-tests
@@ -5,6 +5,7 @@ tests/test-vasnprintf-posix.c
 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

diff --git a/modules/pipe2-tests b/modules/pipe2-tests
index 7ed4c87..5d24bd7 100644 (file)
--- a/modules/pipe2-tests
+++ b/modules/pipe2-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-pipe2.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 stdbool

diff --git a/modules/popen-safer-tests b/modules/popen-safer-tests
index 0e1b93a..8b212ae 100644 (file)
--- a/modules/popen-safer-tests
+++ b/modules/popen-safer-tests
@@ -2,6 +2,7 @@ Files:
 tests/test-popen.h
 tests/test-popen-safer.c
 tests/test-popen-safer2.c
+tests/macros.h
 
 Depends-on:
 dup2

diff --git a/modules/popen-tests b/modules/popen-tests
index c0d128c..f3465b6 100644 (file)
--- a/modules/popen-tests
+++ b/modules/popen-tests
@@ -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

diff --git a/modules/posixtm-tests b/modules/posixtm-tests
index de4d12c..216d602 100644 (file)
--- a/modules/posixtm-tests
+++ b/modules/posixtm-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-posixtm.c
+tests/macros.h
 
 Depends-on:
 intprops

diff --git a/modules/pread-tests b/modules/pread-tests
index 415f9b9..8a10c18 100644 (file)
--- a/modules/pread-tests
+++ b/modules/pread-tests
@@ -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:
 

diff --git a/modules/printf-frexp-tests b/modules/printf-frexp-tests
index adfadb3..37a40d0 100644 (file)
--- a/modules/printf-frexp-tests
+++ b/modules/printf-frexp-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-printf-frexp.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/printf-frexpl-tests b/modules/printf-frexpl-tests
index 7eb6983..d70339c 100644 (file)
--- a/modules/printf-frexpl-tests
+++ b/modules/printf-frexpl-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-printf-frexpl.c
+tests/macros.h
 
 Depends-on:
 fpucw

diff --git a/modules/printf-posix-tests b/modules/printf-posix-tests
index dfbb5e1..08c6834 100644 (file)
--- a/modules/printf-posix-tests
+++ b/modules/printf-posix-tests
@@ -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

diff --git a/modules/priv-set-tests b/modules/priv-set-tests
index cf87bc6..af329dd 100644 (file)
--- a/modules/priv-set-tests
+++ b/modules/priv-set-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-priv-set.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/quotearg-tests b/modules/quotearg-tests
index 8c8f008..5afb986 100644 (file)
--- a/modules/quotearg-tests
+++ b/modules/quotearg-tests
@@ -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

diff --git a/modules/random_r-tests b/modules/random_r-tests
index 72f54c0..b9dd6bf 100644 (file)
--- a/modules/random_r-tests
+++ b/modules/random_r-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-random_r.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/rawmemchr-tests b/modules/rawmemchr-tests
index a638459..bca145e 100644 (file)
--- a/modules/rawmemchr-tests
+++ b/modules/rawmemchr-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-rawmemchr.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/rbtree-list-tests b/modules/rbtree-list-tests
index 2cd042e..c4262ab 100644 (file)
--- a/modules/rbtree-list-tests
+++ b/modules/rbtree-list-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-rbtree_list.c
+tests/macros.h
 
 Depends-on:
 array-list

diff --git a/modules/rbtree-oset-tests b/modules/rbtree-oset-tests
index 0ac783d..db69078 100644 (file)
--- a/modules/rbtree-oset-tests
+++ b/modules/rbtree-oset-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-rbtree_oset.c
+tests/macros.h
 
 Depends-on:
 array-oset

diff --git a/modules/rbtreehash-list-tests b/modules/rbtreehash-list-tests
index 2d17f01..446e44d 100644 (file)
--- a/modules/rbtreehash-list-tests
+++ b/modules/rbtreehash-list-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-rbtreehash_list.c
+tests/macros.h
 
 Depends-on:
 array-list

diff --git a/modules/readlink-tests b/modules/readlink-tests
index efadd0c..1aeac92 100644 (file)
--- a/modules/readlink-tests
+++ b/modules/readlink-tests
@@ -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

diff --git a/modules/remove-tests b/modules/remove-tests
index ecdbcf3..9e2e49c 100644 (file)
--- a/modules/remove-tests
+++ b/modules/remove-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-remove.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 symlink

diff --git a/modules/rename-tests b/modules/rename-tests
index 52b69e2..84c4a3f 100644 (file)
--- a/modules/rename-tests
+++ b/modules/rename-tests
@@ -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

diff --git a/modules/renameat-tests b/modules/renameat-tests
index 982a8ef..53467db 100644 (file)
--- a/modules/renameat-tests
+++ b/modules/renameat-tests
@@ -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

diff --git a/modules/rmdir-tests b/modules/rmdir-tests
index 59b1211..5619ad5 100644 (file)
--- a/modules/rmdir-tests
+++ b/modules/rmdir-tests
@@ -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

diff --git a/modules/round-tests b/modules/round-tests
index 79fe048..002fc8b 100644 (file)
--- a/modules/round-tests
+++ b/modules/round-tests
@@ -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

diff --git a/modules/roundf-tests b/modules/roundf-tests
index 56baa29..84d5723 100644 (file)
--- a/modules/roundf-tests
+++ b/modules/roundf-tests
@@ -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

diff --git a/modules/roundl-tests b/modules/roundl-tests
index 0375176..73dcd9c 100644 (file)
--- a/modules/roundl-tests
+++ b/modules/roundl-tests
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-roundl.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 fpucw

diff --git a/modules/safe-alloc-tests b/modules/safe-alloc-tests
index dbd9c8f..06f771c 100644 (file)
--- a/modules/safe-alloc-tests
+++ b/modules/safe-alloc-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-safe-alloc.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/setenv-tests b/modules/setenv-tests
index 09ebf6f..b7b8bad 100644 (file)
--- a/modules/setenv-tests
+++ b/modules/setenv-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-setenv.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/sigaction-tests b/modules/sigaction-tests
index 6589ef4..e683614 100644 (file)
--- a/modules/sigaction-tests
+++ b/modules/sigaction-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-sigaction.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/signbit-tests b/modules/signbit-tests
index 25851c9..10d7d7b 100644 (file)
--- a/modules/signbit-tests
+++ b/modules/signbit-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-signbit.c
+tests/macros.h
 m4/exponentf.m4
 m4/exponentd.m4
 m4/exponentl.m4

diff --git a/modules/sleep-tests b/modules/sleep-tests
index 7e975b7..93a28f8 100644 (file)
--- a/modules/sleep-tests
+++ b/modules/sleep-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-sleep.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/snprintf-posix-tests b/modules/snprintf-posix-tests
index 0658ea4..4448cf5 100644 (file)
--- a/modules/snprintf-posix-tests
+++ b/modules/snprintf-posix-tests
@@ -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

diff --git a/modules/snprintf-tests b/modules/snprintf-tests
index 4db5f4a..df0a316 100644 (file)
--- a/modules/snprintf-tests
+++ b/modules/snprintf-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-snprintf.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/sprintf-posix-tests b/modules/sprintf-posix-tests
index 354cf73..f6e4ce0 100644 (file)
--- a/modules/sprintf-posix-tests
+++ b/modules/sprintf-posix-tests
@@ -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

diff --git a/modules/stat-tests b/modules/stat-tests
index 489ff64..74d558c 100644 (file)
--- a/modules/stat-tests
+++ b/modules/stat-tests
@@ -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

diff --git a/modules/stat-time-tests b/modules/stat-time-tests
index 0c0b66a..2e72444 100644 (file)
--- a/modules/stat-time-tests
+++ b/modules/stat-time-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-stat-time.c
+tests/macros.h
 
 Depends-on:
 time

diff --git a/modules/strcasestr-tests b/modules/strcasestr-tests
index 292c40d..78b64cd 100644 (file)
--- a/modules/strcasestr-tests
+++ b/modules/strcasestr-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-strcasestr.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/strchrnul-tests b/modules/strchrnul-tests
index 7ca1a58..e16518d 100644 (file)
--- a/modules/strchrnul-tests
+++ b/modules/strchrnul-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-strchrnul.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/strerror-tests b/modules/strerror-tests
index 0a6bc75..14e9694 100644 (file)
--- a/modules/strerror-tests
+++ b/modules/strerror-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-strerror.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/striconv-tests b/modules/striconv-tests
index 5efc9e0..d4482f8 100644 (file)
--- a/modules/striconv-tests
+++ b/modules/striconv-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-striconv.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/striconveh-tests b/modules/striconveh-tests
index 1569f2b..bfb68ef 100644 (file)
--- a/modules/striconveh-tests
+++ b/modules/striconveh-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-striconveh.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/striconveha-tests b/modules/striconveha-tests
index 1effb57..46ad0cf 100644 (file)
--- a/modules/striconveha-tests
+++ b/modules/striconveha-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-striconveha.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/strsignal-tests b/modules/strsignal-tests
index 330a8a9..e845ba5 100644 (file)
--- a/modules/strsignal-tests
+++ b/modules/strsignal-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-strsignal.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/strstr-tests b/modules/strstr-tests
index 231e0eb..4817177 100644 (file)
--- a/modules/strstr-tests
+++ b/modules/strstr-tests
@@ -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:

diff --git a/modules/strtod-tests b/modules/strtod-tests
index ad5a560..8d5be7f 100644 (file)
--- a/modules/strtod-tests
+++ b/modules/strtod-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-strtod.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 float

diff --git a/modules/strverscmp-tests b/modules/strverscmp-tests
index 89b6795..b34b4b0 100644 (file)
--- a/modules/strverscmp-tests
+++ b/modules/strverscmp-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-strverscmp.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/symlink-tests b/modules/symlink-tests
index ef18d47..3f94fd2 100644 (file)
--- a/modules/symlink-tests
+++ b/modules/symlink-tests
@@ -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

diff --git a/modules/symlinkat-tests b/modules/symlinkat-tests
index 4368537..e3ee6c3 100644 (file)
--- a/modules/symlinkat-tests
+++ b/modules/symlinkat-tests
@@ -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:
 

diff --git a/modules/trunc-tests b/modules/trunc-tests
index c3d5243..1f0f0de 100644 (file)
--- a/modules/trunc-tests
+++ b/modules/trunc-tests
@@ -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

diff --git a/modules/truncf-tests b/modules/truncf-tests
index 70ecb1f..175ae88 100644 (file)
--- a/modules/truncf-tests
+++ b/modules/truncf-tests
@@ -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

diff --git a/modules/truncl-tests b/modules/truncl-tests
index 3d92508..82cfeb9 100644 (file)
--- a/modules/truncl-tests
+++ b/modules/truncl-tests
@@ -1,7 +1,8 @@
 Files:
-tests/signature.h
 tests/test-truncl.c
 tests/nan.h
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 fpucw

diff --git a/modules/uname-tests b/modules/uname-tests
index 89d256c..daee490 100644 (file)
--- a/modules/uname-tests
+++ b/modules/uname-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-uname.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/cased-tests b/modules/unicase/cased-tests
index 018a225..fb8c535 100644 (file)
--- a/modules/unicase/cased-tests
+++ b/modules/unicase/cased-tests
@@ -2,6 +2,7 @@ Files:
 tests/unicase/test-cased.c
 tests/unicase/test-predicate-part1.h
 tests/unicase/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/ignorable-tests b/modules/unicase/ignorable-tests
index 3c9135b..ca241aa 100644 (file)
--- a/modules/unicase/ignorable-tests
+++ b/modules/unicase/ignorable-tests
@@ -2,6 +2,7 @@ Files:
 tests/unicase/test-ignorable.c
 tests/unicase/test-predicate-part1.h
 tests/unicase/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/locale-language-tests b/modules/unicase/locale-language-tests
index d4764e9..7ea8f0e 100644 (file)
--- a/modules/unicase/locale-language-tests
+++ b/modules/unicase/locale-language-tests
@@ -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

diff --git a/modules/unicase/tolower-tests b/modules/unicase/tolower-tests
index 254325e..8dc87f8 100644 (file)
--- a/modules/unicase/tolower-tests
+++ b/modules/unicase/tolower-tests
@@ -2,6 +2,7 @@ Files:
 tests/unicase/test-uc_tolower.c
 tests/unicase/test-mapping-part1.h
 tests/unicase/test-mapping-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/totitle-tests b/modules/unicase/totitle-tests
index 4082809..f0856dd 100644 (file)
--- a/modules/unicase/totitle-tests
+++ b/modules/unicase/totitle-tests
@@ -2,6 +2,7 @@ Files:
 tests/unicase/test-uc_totitle.c
 tests/unicase/test-mapping-part1.h
 tests/unicase/test-mapping-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/toupper-tests b/modules/unicase/toupper-tests
index 93adf9a..f0c2002 100644 (file)
--- a/modules/unicase/toupper-tests
+++ b/modules/unicase/toupper-tests
@@ -2,6 +2,7 @@ Files:
 tests/unicase/test-uc_toupper.c
 tests/unicase/test-mapping-part1.h
 tests/unicase/test-mapping-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/u16-casecmp-tests b/modules/unicase/u16-casecmp-tests
index 07b2c0e..f0a9845 100644 (file)
--- a/modules/unicase/u16-casecmp-tests
+++ b/modules/unicase/u16-casecmp-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u16-casecmp.c
 tests/unicase/test-casecmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfd

diff --git a/modules/unicase/u16-casecoll-tests b/modules/unicase/u16-casecoll-tests
index b6f1c0c..9b643e6 100644 (file)
--- a/modules/unicase/u16-casecoll-tests
+++ b/modules/unicase/u16-casecoll-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u16-casecoll.c
 tests/unicase/test-casecmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfc

diff --git a/modules/unicase/u16-casefold-tests b/modules/unicase/u16-casefold-tests
index f6aa5e9..0c4d50c 100644 (file)
--- a/modules/unicase/u16-casefold-tests
+++ b/modules/unicase/u16-casefold-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u16-casefold.c
+tests/macros.h
 
 Depends-on:
 unistr/u16-cmp

diff --git a/modules/unicase/u16-is-cased-tests b/modules/unicase/u16-is-cased-tests
index 81f4a79..ebff592 100644 (file)
--- a/modules/unicase/u16-is-cased-tests
+++ b/modules/unicase/u16-is-cased-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u16-is-cased.c
 tests/unicase/test-is-cased.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/u16-is-casefolded-tests b/modules/unicase/u16-is-casefolded-tests
index f9f7138..6f32c37 100644 (file)
--- a/modules/unicase/u16-is-casefolded-tests
+++ b/modules/unicase/u16-is-casefolded-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u16-is-casefolded.c
 tests/unicase/test-is-casefolded.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/u16-is-lowercase-tests b/modules/unicase/u16-is-lowercase-tests
index 94ef38a..f5a0a79 100644 (file)
--- a/modules/unicase/u16-is-lowercase-tests
+++ b/modules/unicase/u16-is-lowercase-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u16-is-lowercase.c
 tests/unicase/test-is-lowercase.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/u16-is-titlecase-tests b/modules/unicase/u16-is-titlecase-tests
index ff7736e..701098a 100644 (file)
--- a/modules/unicase/u16-is-titlecase-tests
+++ b/modules/unicase/u16-is-titlecase-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u16-is-titlecase.c
 tests/unicase/test-is-titlecase.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/u16-is-uppercase-tests b/modules/unicase/u16-is-uppercase-tests
index b97b741..28d3d84 100644 (file)
--- a/modules/unicase/u16-is-uppercase-tests
+++ b/modules/unicase/u16-is-uppercase-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u16-is-uppercase.c
 tests/unicase/test-is-uppercase.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/u16-tolower-tests b/modules/unicase/u16-tolower-tests
index 1e5bf19..d4d4810 100644 (file)
--- a/modules/unicase/u16-tolower-tests
+++ b/modules/unicase/u16-tolower-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u16-tolower.c
+tests/macros.h
 
 Depends-on:
 unistr/u16-cmp

diff --git a/modules/unicase/u16-totitle-tests b/modules/unicase/u16-totitle-tests
index a15faaf..00889be 100644 (file)
--- a/modules/unicase/u16-totitle-tests
+++ b/modules/unicase/u16-totitle-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u16-totitle.c
+tests/macros.h
 
 Depends-on:
 unistr/u16-cmp

diff --git a/modules/unicase/u16-toupper-tests b/modules/unicase/u16-toupper-tests
index a1194f5..86958fe 100644 (file)
--- a/modules/unicase/u16-toupper-tests
+++ b/modules/unicase/u16-toupper-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u16-toupper.c
+tests/macros.h
 
 Depends-on:
 unistr/u16-cmp

diff --git a/modules/unicase/u32-casecmp-tests b/modules/unicase/u32-casecmp-tests
index 289588a..a62a5d1 100644 (file)
--- a/modules/unicase/u32-casecmp-tests
+++ b/modules/unicase/u32-casecmp-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u32-casecmp.c
 tests/unicase/test-casecmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfd

diff --git a/modules/unicase/u32-casecoll-tests b/modules/unicase/u32-casecoll-tests
index c059b05..1f96a0d 100644 (file)
--- a/modules/unicase/u32-casecoll-tests
+++ b/modules/unicase/u32-casecoll-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u32-casecoll.c
 tests/unicase/test-casecmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfc

diff --git a/modules/unicase/u32-casefold-tests b/modules/unicase/u32-casefold-tests
index 767044b..fb3f4e6 100644 (file)
--- a/modules/unicase/u32-casefold-tests
+++ b/modules/unicase/u32-casefold-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u32-casefold.c
+tests/macros.h
 
 Depends-on:
 unistr/u32-cmp

diff --git a/modules/unicase/u32-is-cased-tests b/modules/unicase/u32-is-cased-tests
index e81d647..48342c5 100644 (file)
--- a/modules/unicase/u32-is-cased-tests
+++ b/modules/unicase/u32-is-cased-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u32-is-cased.c
 tests/unicase/test-is-cased.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/u32-is-casefolded-tests b/modules/unicase/u32-is-casefolded-tests
index 8e3434b..78f2747 100644 (file)
--- a/modules/unicase/u32-is-casefolded-tests
+++ b/modules/unicase/u32-is-casefolded-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u32-is-casefolded.c
 tests/unicase/test-is-casefolded.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/u32-is-lowercase-tests b/modules/unicase/u32-is-lowercase-tests
index 5e458d1..6376566 100644 (file)
--- a/modules/unicase/u32-is-lowercase-tests
+++ b/modules/unicase/u32-is-lowercase-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u32-is-lowercase.c
 tests/unicase/test-is-lowercase.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/u32-is-titlecase-tests b/modules/unicase/u32-is-titlecase-tests
index 1083ebd..955542e 100644 (file)
--- a/modules/unicase/u32-is-titlecase-tests
+++ b/modules/unicase/u32-is-titlecase-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u32-is-titlecase.c
 tests/unicase/test-is-titlecase.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/u32-is-uppercase-tests b/modules/unicase/u32-is-uppercase-tests
index 47b8fef..a0689bc 100644 (file)
--- a/modules/unicase/u32-is-uppercase-tests
+++ b/modules/unicase/u32-is-uppercase-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u32-is-uppercase.c
 tests/unicase/test-is-uppercase.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/u32-tolower-tests b/modules/unicase/u32-tolower-tests
index 2a286d2..b481a09 100644 (file)
--- a/modules/unicase/u32-tolower-tests
+++ b/modules/unicase/u32-tolower-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u32-tolower.c
+tests/macros.h
 
 Depends-on:
 unistr/u32-cmp

diff --git a/modules/unicase/u32-totitle-tests b/modules/unicase/u32-totitle-tests
index 1d1f089..32202e2 100644 (file)
--- a/modules/unicase/u32-totitle-tests
+++ b/modules/unicase/u32-totitle-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u32-totitle.c
+tests/macros.h
 
 Depends-on:
 unistr/u32-cmp

diff --git a/modules/unicase/u32-toupper-tests b/modules/unicase/u32-toupper-tests
index 8050186..177caed 100644 (file)
--- a/modules/unicase/u32-toupper-tests
+++ b/modules/unicase/u32-toupper-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u32-toupper.c
+tests/macros.h
 
 Depends-on:
 unistr/u32-cmp

diff --git a/modules/unicase/u8-casecmp-tests b/modules/unicase/u8-casecmp-tests
index 8db4b27..799a82e 100644 (file)
--- a/modules/unicase/u8-casecmp-tests
+++ b/modules/unicase/u8-casecmp-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u8-casecmp.c
 tests/unicase/test-casecmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfd

diff --git a/modules/unicase/u8-casecoll-tests b/modules/unicase/u8-casecoll-tests
index f87af8b..c58020a 100644 (file)
--- a/modules/unicase/u8-casecoll-tests
+++ b/modules/unicase/u8-casecoll-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u8-casecoll.c
 tests/unicase/test-casecmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfc

diff --git a/modules/unicase/u8-casefold-tests b/modules/unicase/u8-casefold-tests
index 8b76544..db22f39 100644 (file)
--- a/modules/unicase/u8-casefold-tests
+++ b/modules/unicase/u8-casefold-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u8-casefold.c
+tests/macros.h
 
 Depends-on:
 unistr/u8-cmp

diff --git a/modules/unicase/u8-is-cased-tests b/modules/unicase/u8-is-cased-tests
index 032c98a..cfc6527 100644 (file)
--- a/modules/unicase/u8-is-cased-tests
+++ b/modules/unicase/u8-is-cased-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u8-is-cased.c
 tests/unicase/test-is-cased.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/u8-is-casefolded-tests b/modules/unicase/u8-is-casefolded-tests
index e7af3f3..7a4b048 100644 (file)
--- a/modules/unicase/u8-is-casefolded-tests
+++ b/modules/unicase/u8-is-casefolded-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u8-is-casefolded.c
 tests/unicase/test-is-casefolded.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/u8-is-lowercase-tests b/modules/unicase/u8-is-lowercase-tests
index 929e388..c1ef0b5 100644 (file)
--- a/modules/unicase/u8-is-lowercase-tests
+++ b/modules/unicase/u8-is-lowercase-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u8-is-lowercase.c
 tests/unicase/test-is-lowercase.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/u8-is-titlecase-tests b/modules/unicase/u8-is-titlecase-tests
index dc2c502..c35c2ac 100644 (file)
--- a/modules/unicase/u8-is-titlecase-tests
+++ b/modules/unicase/u8-is-titlecase-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u8-is-titlecase.c
 tests/unicase/test-is-titlecase.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/u8-is-uppercase-tests b/modules/unicase/u8-is-uppercase-tests
index 9efc93d..9bf0811 100644 (file)
--- a/modules/unicase/u8-is-uppercase-tests
+++ b/modules/unicase/u8-is-uppercase-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unicase/test-u8-is-uppercase.c
 tests/unicase/test-is-uppercase.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unicase/u8-tolower-tests b/modules/unicase/u8-tolower-tests
index 3133e13..f07483d 100644 (file)
--- a/modules/unicase/u8-tolower-tests
+++ b/modules/unicase/u8-tolower-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u8-tolower.c
+tests/macros.h
 
 Depends-on:
 unistr/u8-cmp

diff --git a/modules/unicase/u8-totitle-tests b/modules/unicase/u8-totitle-tests
index 0df5825..bccf5a3 100644 (file)
--- a/modules/unicase/u8-totitle-tests
+++ b/modules/unicase/u8-totitle-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u8-totitle.c
+tests/macros.h
 
 Depends-on:
 unistr/u8-cmp

diff --git a/modules/unicase/u8-toupper-tests b/modules/unicase/u8-toupper-tests
index a6676c9..d6ffa17 100644 (file)
--- a/modules/unicase/u8-toupper-tests
+++ b/modules/unicase/u8-toupper-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unicase/test-u8-toupper.c
+tests/macros.h
 
 Depends-on:
 unistr/u8-cmp

diff --git a/modules/unicase/ulc-casecmp-tests b/modules/unicase/ulc-casecmp-tests
index c7816b4..60dfe87 100644 (file)
--- a/modules/unicase/ulc-casecmp-tests
+++ b/modules/unicase/ulc-casecmp-tests
@@ -3,6 +3,7 @@ tests/unicase/test-ulc-casecmp1.sh
 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
 

diff --git a/modules/unicase/ulc-casecoll-tests b/modules/unicase/ulc-casecoll-tests
index da66cd1..879156d 100644 (file)
--- a/modules/unicase/ulc-casecoll-tests
+++ b/modules/unicase/ulc-casecoll-tests
@@ -3,6 +3,7 @@ tests/unicase/test-ulc-casecoll1.sh
 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
 

diff --git a/modules/uniconv/u16-conv-from-enc-tests b/modules/uniconv/u16-conv-from-enc-tests
index 5539ccb..df46e17 100644 (file)
--- a/modules/uniconv/u16-conv-from-enc-tests
+++ b/modules/uniconv/u16-conv-from-enc-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u16-conv-from-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u16-cmp

diff --git a/modules/uniconv/u16-conv-to-enc-tests b/modules/uniconv/u16-conv-to-enc-tests
index 399537a..cb0dd01 100644 (file)
--- a/modules/uniconv/u16-conv-to-enc-tests
+++ b/modules/uniconv/u16-conv-to-enc-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u16-conv-to-enc.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/uniconv/u16-strconv-from-enc-tests b/modules/uniconv/u16-strconv-from-enc-tests
index b9c162a..67f96de 100644 (file)
--- a/modules/uniconv/u16-strconv-from-enc-tests
+++ b/modules/uniconv/u16-strconv-from-enc-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u16-strconv-from-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u16-strcmp

diff --git a/modules/uniconv/u16-strconv-to-enc-tests b/modules/uniconv/u16-strconv-to-enc-tests
index 0548b01..c1865bf 100644 (file)
--- a/modules/uniconv/u16-strconv-to-enc-tests
+++ b/modules/uniconv/u16-strconv-to-enc-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u16-strconv-to-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u16-strcmp

diff --git a/modules/uniconv/u32-conv-from-enc-tests b/modules/uniconv/u32-conv-from-enc-tests
index e35a75a..94a3b8c 100644 (file)
--- a/modules/uniconv/u32-conv-from-enc-tests
+++ b/modules/uniconv/u32-conv-from-enc-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u32-conv-from-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u32-cmp

diff --git a/modules/uniconv/u32-conv-to-enc-tests b/modules/uniconv/u32-conv-to-enc-tests
index a46e9b5..934d7e4 100644 (file)
--- a/modules/uniconv/u32-conv-to-enc-tests
+++ b/modules/uniconv/u32-conv-to-enc-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u32-conv-to-enc.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/uniconv/u32-strconv-from-enc-tests b/modules/uniconv/u32-strconv-from-enc-tests
index 2370b58..a01fbf2 100644 (file)
--- a/modules/uniconv/u32-strconv-from-enc-tests
+++ b/modules/uniconv/u32-strconv-from-enc-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u32-strconv-from-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u32-strcmp

diff --git a/modules/uniconv/u32-strconv-to-enc-tests b/modules/uniconv/u32-strconv-to-enc-tests
index 19f5eca..7188c32 100644 (file)
--- a/modules/uniconv/u32-strconv-to-enc-tests
+++ b/modules/uniconv/u32-strconv-to-enc-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u32-strconv-to-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u32-strcmp

diff --git a/modules/uniconv/u8-conv-from-enc-tests b/modules/uniconv/u8-conv-from-enc-tests
index 4dc02cb..d11cd52 100644 (file)
--- a/modules/uniconv/u8-conv-from-enc-tests
+++ b/modules/uniconv/u8-conv-from-enc-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u8-conv-from-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u8-strlen

diff --git a/modules/uniconv/u8-conv-to-enc-tests b/modules/uniconv/u8-conv-to-enc-tests
index 00aa37f..9fe4134 100644 (file)
--- a/modules/uniconv/u8-conv-to-enc-tests
+++ b/modules/uniconv/u8-conv-to-enc-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u8-conv-to-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u8-strlen

diff --git a/modules/uniconv/u8-strconv-from-enc-tests b/modules/uniconv/u8-strconv-from-enc-tests
index 971786e..90119d5 100644 (file)
--- a/modules/uniconv/u8-strconv-from-enc-tests
+++ b/modules/uniconv/u8-strconv-from-enc-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u8-strconv-from-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u8-strcmp

diff --git a/modules/uniconv/u8-strconv-to-enc-tests b/modules/uniconv/u8-strconv-to-enc-tests
index b572443..12409ed 100644 (file)
--- a/modules/uniconv/u8-strconv-to-enc-tests
+++ b/modules/uniconv/u8-strconv-to-enc-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniconv/test-u8-strconv-to-enc.c
+tests/macros.h
 
 Depends-on:
 unistr/u8-strcmp

diff --git a/modules/unictype/bidicategory-byname-tests b/modules/unictype/bidicategory-byname-tests
index f516e71..cfb67cd 100644 (file)
--- a/modules/unictype/bidicategory-byname-tests
+++ b/modules/unictype/bidicategory-byname-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-bidi_byname.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/bidicategory-name-tests b/modules/unictype/bidicategory-name-tests
index f216c38..a34a016 100644 (file)
--- a/modules/unictype/bidicategory-name-tests
+++ b/modules/unictype/bidicategory-name-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-bidi_name.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/bidicategory-of-tests b/modules/unictype/bidicategory-of-tests
index b1a04be..e581903 100644 (file)
--- a/modules/unictype/bidicategory-of-tests
+++ b/modules/unictype/bidicategory-of-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-bidi_of.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/bidicategory-test-tests b/modules/unictype/bidicategory-test-tests
index 038621f..3410d65 100644 (file)
--- a/modules/unictype/bidicategory-test-tests
+++ b/modules/unictype/bidicategory-test-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-bidi_test.c
+tests/macros.h
 
 Depends-on:
 unictype/bidicategory-of

diff --git a/modules/unictype/block-list-tests b/modules/unictype/block-list-tests
index b75e7c7..8f11c39 100644 (file)
--- a/modules/unictype/block-list-tests
+++ b/modules/unictype/block-list-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-block_list.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/block-of-tests b/modules/unictype/block-of-tests
index bbe2a68..4e71260 100644 (file)
--- a/modules/unictype/block-of-tests
+++ b/modules/unictype/block-of-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-block_of.c
+tests/macros.h
 
 Depends-on:
 unictype/block-list

diff --git a/modules/unictype/block-test-tests b/modules/unictype/block-test-tests
index 2fb5fbe..33367f0 100644 (file)
--- a/modules/unictype/block-test-tests
+++ b/modules/unictype/block-test-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-block_test.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/category-C-tests b/modules/unictype/category-C-tests
index 69e5a37..9b4a18e 100644 (file)
--- a/modules/unictype/category-C-tests
+++ b/modules/unictype/category-C-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Cc-tests b/modules/unictype/category-Cc-tests
index bc33c32..da8c0f8 100644 (file)
--- a/modules/unictype/category-Cc-tests
+++ b/modules/unictype/category-Cc-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Cf-tests b/modules/unictype/category-Cf-tests
index aad039a..a1d8138 100644 (file)
--- a/modules/unictype/category-Cf-tests
+++ b/modules/unictype/category-Cf-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Cn-tests b/modules/unictype/category-Cn-tests
index df97a0c..ca0a824 100644 (file)
--- a/modules/unictype/category-Cn-tests
+++ b/modules/unictype/category-Cn-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Co-tests b/modules/unictype/category-Co-tests
index 19a905e..93ef8a3 100644 (file)
--- a/modules/unictype/category-Co-tests
+++ b/modules/unictype/category-Co-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Cs-tests b/modules/unictype/category-Cs-tests
index a746472..17c1c22 100644 (file)
--- a/modules/unictype/category-Cs-tests
+++ b/modules/unictype/category-Cs-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-L-tests b/modules/unictype/category-L-tests
index 2b7e4c5..1272534 100644 (file)
--- a/modules/unictype/category-L-tests
+++ b/modules/unictype/category-L-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Ll-tests b/modules/unictype/category-Ll-tests
index 7d23af1..756d26c 100644 (file)
--- a/modules/unictype/category-Ll-tests
+++ b/modules/unictype/category-Ll-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Lm-tests b/modules/unictype/category-Lm-tests
index 8d98e68..362e88c 100644 (file)
--- a/modules/unictype/category-Lm-tests
+++ b/modules/unictype/category-Lm-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Lo-tests b/modules/unictype/category-Lo-tests
index 49e1678..12b7696 100644 (file)
--- a/modules/unictype/category-Lo-tests
+++ b/modules/unictype/category-Lo-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Lt-tests b/modules/unictype/category-Lt-tests
index bb2ff63..c284256 100644 (file)
--- a/modules/unictype/category-Lt-tests
+++ b/modules/unictype/category-Lt-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Lu-tests b/modules/unictype/category-Lu-tests
index b999936..a8e94a6 100644 (file)
--- a/modules/unictype/category-Lu-tests
+++ b/modules/unictype/category-Lu-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-M-tests b/modules/unictype/category-M-tests
index 85a21de..c883a86 100644 (file)
--- a/modules/unictype/category-M-tests
+++ b/modules/unictype/category-M-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Mc-tests b/modules/unictype/category-Mc-tests
index bc3aa9e..dbbee20 100644 (file)
--- a/modules/unictype/category-Mc-tests
+++ b/modules/unictype/category-Mc-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Me-tests b/modules/unictype/category-Me-tests
index 1c31ec5..1025c7e 100644 (file)
--- a/modules/unictype/category-Me-tests
+++ b/modules/unictype/category-Me-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Mn-tests b/modules/unictype/category-Mn-tests
index 4716867..a201a8c 100644 (file)
--- a/modules/unictype/category-Mn-tests
+++ b/modules/unictype/category-Mn-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-N-tests b/modules/unictype/category-N-tests
index 43fc849..5550003 100644 (file)
--- a/modules/unictype/category-N-tests
+++ b/modules/unictype/category-N-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Nd-tests b/modules/unictype/category-Nd-tests
index f32771c..463ff8f 100644 (file)
--- a/modules/unictype/category-Nd-tests
+++ b/modules/unictype/category-Nd-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Nl-tests b/modules/unictype/category-Nl-tests
index 8c42f3b..340aa24 100644 (file)
--- a/modules/unictype/category-Nl-tests
+++ b/modules/unictype/category-Nl-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-No-tests b/modules/unictype/category-No-tests
index 004c323..0aa828a 100644 (file)
--- a/modules/unictype/category-No-tests
+++ b/modules/unictype/category-No-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-P-tests b/modules/unictype/category-P-tests
index 9eae438..57f591e 100644 (file)
--- a/modules/unictype/category-P-tests
+++ b/modules/unictype/category-P-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Pc-tests b/modules/unictype/category-Pc-tests
index 9a8376e..c6e1e90 100644 (file)
--- a/modules/unictype/category-Pc-tests
+++ b/modules/unictype/category-Pc-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Pd-tests b/modules/unictype/category-Pd-tests
index 2092061..238ae1c 100644 (file)
--- a/modules/unictype/category-Pd-tests
+++ b/modules/unictype/category-Pd-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Pe-tests b/modules/unictype/category-Pe-tests
index 182d131..f9c3145 100644 (file)
--- a/modules/unictype/category-Pe-tests
+++ b/modules/unictype/category-Pe-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Pf-tests b/modules/unictype/category-Pf-tests
index 4667279..2e1a035 100644 (file)
--- a/modules/unictype/category-Pf-tests
+++ b/modules/unictype/category-Pf-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Pi-tests b/modules/unictype/category-Pi-tests
index 272be1b..d210ad2 100644 (file)
--- a/modules/unictype/category-Pi-tests
+++ b/modules/unictype/category-Pi-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Po-tests b/modules/unictype/category-Po-tests
index 936afd4..f652bd6 100644 (file)
--- a/modules/unictype/category-Po-tests
+++ b/modules/unictype/category-Po-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Ps-tests b/modules/unictype/category-Ps-tests
index 85bfe9a..ce9da49 100644 (file)
--- a/modules/unictype/category-Ps-tests
+++ b/modules/unictype/category-Ps-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-S-tests b/modules/unictype/category-S-tests
index e1a3f84..4eb24e2 100644 (file)
--- a/modules/unictype/category-S-tests
+++ b/modules/unictype/category-S-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Sc-tests b/modules/unictype/category-Sc-tests
index 792db1b..20fc989 100644 (file)
--- a/modules/unictype/category-Sc-tests
+++ b/modules/unictype/category-Sc-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Sk-tests b/modules/unictype/category-Sk-tests
index d1ee546..ff30f24 100644 (file)
--- a/modules/unictype/category-Sk-tests
+++ b/modules/unictype/category-Sk-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Sm-tests b/modules/unictype/category-Sm-tests
index db54286..0d75ece 100644 (file)
--- a/modules/unictype/category-Sm-tests
+++ b/modules/unictype/category-Sm-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-So-tests b/modules/unictype/category-So-tests
index 0492d97..a0c28a4 100644 (file)
--- a/modules/unictype/category-So-tests
+++ b/modules/unictype/category-So-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Z-tests b/modules/unictype/category-Z-tests
index bf8405e..a85eed1 100644 (file)
--- a/modules/unictype/category-Z-tests
+++ b/modules/unictype/category-Z-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Zl-tests b/modules/unictype/category-Zl-tests
index 8c46a5c..75be72a 100644 (file)
--- a/modules/unictype/category-Zl-tests
+++ b/modules/unictype/category-Zl-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Zp-tests b/modules/unictype/category-Zp-tests
index 472d34c..8b5d3b9 100644 (file)
--- a/modules/unictype/category-Zp-tests
+++ b/modules/unictype/category-Zp-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-Zs-tests b/modules/unictype/category-Zs-tests
index c9fe89f..a72f5e6 100644 (file)
--- a/modules/unictype/category-Zs-tests
+++ b/modules/unictype/category-Zs-tests
@@ -2,6 +2,7 @@ Files:
 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

diff --git a/modules/unictype/category-and-not-tests b/modules/unictype/category-and-not-tests
index 41145a6..b2a988b 100644 (file)
--- a/modules/unictype/category-and-not-tests
+++ b/modules/unictype/category-and-not-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-categ_and_not.c
+tests/macros.h
 
 Depends-on:
 unictype/category-or

diff --git a/modules/unictype/category-and-tests b/modules/unictype/category-and-tests
index 2bcdf72..99de11a 100644 (file)
--- a/modules/unictype/category-and-tests
+++ b/modules/unictype/category-and-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-categ_and.c
+tests/macros.h
 
 Depends-on:
 unictype/category-or

diff --git a/modules/unictype/category-byname-tests b/modules/unictype/category-byname-tests
index fdafaee..3d47795 100644 (file)
--- a/modules/unictype/category-byname-tests
+++ b/modules/unictype/category-byname-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-categ_byname.c
+tests/macros.h
 
 Depends-on:
 unictype/category-test

diff --git a/modules/unictype/category-name-tests b/modules/unictype/category-name-tests
index 414797a..bc0c82a 100644 (file)
--- a/modules/unictype/category-name-tests
+++ b/modules/unictype/category-name-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-categ_name.c
+tests/macros.h
 
 Depends-on:
 unictype/category-or

diff --git a/modules/unictype/category-none-tests b/modules/unictype/category-none-tests
index a891157..c78e416 100644 (file)
--- a/modules/unictype/category-none-tests
+++ b/modules/unictype/category-none-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-categ_none.c
+tests/macros.h
 
 Depends-on:
 unictype/category-test

diff --git a/modules/unictype/category-of-tests b/modules/unictype/category-of-tests
index 0a9a63d..fe1aa6b 100644 (file)
--- a/modules/unictype/category-of-tests
+++ b/modules/unictype/category-of-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-categ_of.c
+tests/macros.h
 
 Depends-on:
 unictype/category-test

diff --git a/modules/unictype/category-or-tests b/modules/unictype/category-or-tests
index b3a5f63..a6b740d 100644 (file)
--- a/modules/unictype/category-or-tests
+++ b/modules/unictype/category-or-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-categ_or.c
+tests/macros.h
 
 Depends-on:
 unictype/category-test

diff --git a/modules/unictype/category-test-withtable-tests b/modules/unictype/category-test-withtable-tests
index d5ff63f..c74027e 100644 (file)
--- a/modules/unictype/category-test-withtable-tests
+++ b/modules/unictype/category-test-withtable-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-categ_test_withtable.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/combining-class-tests b/modules/unictype/combining-class-tests
index ea4706b..eafbdd0 100644 (file)
--- a/modules/unictype/combining-class-tests
+++ b/modules/unictype/combining-class-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-combining.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/ctype-alnum-tests b/modules/unictype/ctype-alnum-tests
index f90d700..db33ed4 100644 (file)
--- a/modules/unictype/ctype-alnum-tests
+++ b/modules/unictype/ctype-alnum-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-ctype_alnum.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/ctype-alpha-tests b/modules/unictype/ctype-alpha-tests
index 2bd16db..abdfc50 100644 (file)
--- a/modules/unictype/ctype-alpha-tests
+++ b/modules/unictype/ctype-alpha-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-ctype_alpha.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/ctype-blank-tests b/modules/unictype/ctype-blank-tests
index 94a8331..d1daa91 100644 (file)
--- a/modules/unictype/ctype-blank-tests
+++ b/modules/unictype/ctype-blank-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-ctype_blank.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/ctype-cntrl-tests b/modules/unictype/ctype-cntrl-tests
index d46076f..4c195c4 100644 (file)
--- a/modules/unictype/ctype-cntrl-tests
+++ b/modules/unictype/ctype-cntrl-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-ctype_cntrl.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/ctype-digit-tests b/modules/unictype/ctype-digit-tests
index e3ec97f..2f7833e 100644 (file)
--- a/modules/unictype/ctype-digit-tests
+++ b/modules/unictype/ctype-digit-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-ctype_digit.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/ctype-graph-tests b/modules/unictype/ctype-graph-tests
index 91bcc89..646a00b 100644 (file)
--- a/modules/unictype/ctype-graph-tests
+++ b/modules/unictype/ctype-graph-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-ctype_graph.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/ctype-lower-tests b/modules/unictype/ctype-lower-tests
index 310053c..707cec6 100644 (file)
--- a/modules/unictype/ctype-lower-tests
+++ b/modules/unictype/ctype-lower-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-ctype_lower.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/ctype-print-tests b/modules/unictype/ctype-print-tests
index eb10d66..a590a4d 100644 (file)
--- a/modules/unictype/ctype-print-tests
+++ b/modules/unictype/ctype-print-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-ctype_print.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/ctype-punct-tests b/modules/unictype/ctype-punct-tests
index 667a0b8..7f39283 100644 (file)
--- a/modules/unictype/ctype-punct-tests
+++ b/modules/unictype/ctype-punct-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-ctype_punct.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/ctype-space-tests b/modules/unictype/ctype-space-tests
index b721648..124b107 100644 (file)
--- a/modules/unictype/ctype-space-tests
+++ b/modules/unictype/ctype-space-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-ctype_space.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/ctype-upper-tests b/modules/unictype/ctype-upper-tests
index 180655c..b32e1b6 100644 (file)
--- a/modules/unictype/ctype-upper-tests
+++ b/modules/unictype/ctype-upper-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-ctype_upper.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/ctype-xdigit-tests b/modules/unictype/ctype-xdigit-tests
index 0ba075b..4cc5678 100644 (file)
--- a/modules/unictype/ctype-xdigit-tests
+++ b/modules/unictype/ctype-xdigit-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-ctype_xdigit.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/decimal-digit-tests b/modules/unictype/decimal-digit-tests
index 8fbbf0d..f0451d9 100644 (file)
--- a/modules/unictype/decimal-digit-tests
+++ b/modules/unictype/decimal-digit-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unictype/test-decdigit.c
 tests/unictype/test-decdigit.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/digit-tests b/modules/unictype/digit-tests
index 9ee1f51..58b6c00 100644 (file)
--- a/modules/unictype/digit-tests
+++ b/modules/unictype/digit-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unictype/test-digit.c
 tests/unictype/test-digit.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/mirror-tests b/modules/unictype/mirror-tests
index 3766ace..dc2ad1e 100644 (file)
--- a/modules/unictype/mirror-tests
+++ b/modules/unictype/mirror-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-mirror.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/numeric-tests b/modules/unictype/numeric-tests
index 291f0ae..759ae2e 100644 (file)
--- a/modules/unictype/numeric-tests
+++ b/modules/unictype/numeric-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unictype/test-numeric.c
 tests/unictype/test-numeric.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-alphabetic-tests b/modules/unictype/property-alphabetic-tests
index f3e3a85..a4a757d 100644 (file)
--- a/modules/unictype/property-alphabetic-tests
+++ b/modules/unictype/property-alphabetic-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_alphabetic.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-ascii-hex-digit-tests b/modules/unictype/property-ascii-hex-digit-tests
index f679c68..edf2cad 100644 (file)
--- a/modules/unictype/property-ascii-hex-digit-tests
+++ b/modules/unictype/property-ascii-hex-digit-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-bidi-arabic-digit-tests b/modules/unictype/property-bidi-arabic-digit-tests
index 2ad1d1c..f6fa5ec 100644 (file)
--- a/modules/unictype/property-bidi-arabic-digit-tests
+++ b/modules/unictype/property-bidi-arabic-digit-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-bidi-arabic-right-to-left-tests b/modules/unictype/property-bidi-arabic-right-to-left-tests
index c27389a..2efe831 100644 (file)
--- a/modules/unictype/property-bidi-arabic-right-to-left-tests
+++ b/modules/unictype/property-bidi-arabic-right-to-left-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-bidi-block-separator-tests b/modules/unictype/property-bidi-block-separator-tests
index 220db90..3377c17 100644 (file)
--- a/modules/unictype/property-bidi-block-separator-tests
+++ b/modules/unictype/property-bidi-block-separator-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-bidi-boundary-neutral-tests b/modules/unictype/property-bidi-boundary-neutral-tests
index f9c5f18..dedc4ab 100644 (file)
--- a/modules/unictype/property-bidi-boundary-neutral-tests
+++ b/modules/unictype/property-bidi-boundary-neutral-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-bidi-common-separator-tests b/modules/unictype/property-bidi-common-separator-tests
index d11d8dd..6964ed6 100644 (file)
--- a/modules/unictype/property-bidi-common-separator-tests
+++ b/modules/unictype/property-bidi-common-separator-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-bidi-control-tests b/modules/unictype/property-bidi-control-tests
index 5c6609f..52a1102 100644 (file)
--- a/modules/unictype/property-bidi-control-tests
+++ b/modules/unictype/property-bidi-control-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_bidi_control.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-bidi-embedding-or-override-tests b/modules/unictype/property-bidi-embedding-or-override-tests
index eb59179..c64e232 100644 (file)
--- a/modules/unictype/property-bidi-embedding-or-override-tests
+++ b/modules/unictype/property-bidi-embedding-or-override-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-bidi-eur-num-separator-tests b/modules/unictype/property-bidi-eur-num-separator-tests
index 9c3c76d..3442fcf 100644 (file)
--- a/modules/unictype/property-bidi-eur-num-separator-tests
+++ b/modules/unictype/property-bidi-eur-num-separator-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-bidi-eur-num-terminator-tests b/modules/unictype/property-bidi-eur-num-terminator-tests
index 7289a98..fda0c48 100644 (file)
--- a/modules/unictype/property-bidi-eur-num-terminator-tests
+++ b/modules/unictype/property-bidi-eur-num-terminator-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-bidi-european-digit-tests b/modules/unictype/property-bidi-european-digit-tests
index 1461e02..c7196f9 100644 (file)
--- a/modules/unictype/property-bidi-european-digit-tests
+++ b/modules/unictype/property-bidi-european-digit-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-bidi-hebrew-right-to-left-tests b/modules/unictype/property-bidi-hebrew-right-to-left-tests
index 0498552..3d3985a 100644 (file)
--- a/modules/unictype/property-bidi-hebrew-right-to-left-tests
+++ b/modules/unictype/property-bidi-hebrew-right-to-left-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-bidi-left-to-right-tests b/modules/unictype/property-bidi-left-to-right-tests
index fc32cd6..4097553 100644 (file)
--- a/modules/unictype/property-bidi-left-to-right-tests
+++ b/modules/unictype/property-bidi-left-to-right-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-bidi-non-spacing-mark-tests b/modules/unictype/property-bidi-non-spacing-mark-tests
index cf4bfa9..ce4ac00 100644 (file)
--- a/modules/unictype/property-bidi-non-spacing-mark-tests
+++ b/modules/unictype/property-bidi-non-spacing-mark-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-bidi-other-neutral-tests b/modules/unictype/property-bidi-other-neutral-tests
index 0d6b1d7..4a54080 100644 (file)
--- a/modules/unictype/property-bidi-other-neutral-tests
+++ b/modules/unictype/property-bidi-other-neutral-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-bidi-pdf-tests b/modules/unictype/property-bidi-pdf-tests
index df765eb..9096a56 100644 (file)
--- a/modules/unictype/property-bidi-pdf-tests
+++ b/modules/unictype/property-bidi-pdf-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_bidi_pdf.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-bidi-segment-separator-tests b/modules/unictype/property-bidi-segment-separator-tests
index c21ef53..081050c 100644 (file)
--- a/modules/unictype/property-bidi-segment-separator-tests
+++ b/modules/unictype/property-bidi-segment-separator-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-bidi-whitespace-tests b/modules/unictype/property-bidi-whitespace-tests
index 1077776..0bcde48 100644 (file)
--- a/modules/unictype/property-bidi-whitespace-tests
+++ b/modules/unictype/property-bidi-whitespace-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_bidi_whitespace.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-byname-tests b/modules/unictype/property-byname-tests
index 9678ff8..ff6a60d 100644 (file)
--- a/modules/unictype/property-byname-tests
+++ b/modules/unictype/property-byname-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-pr_byname.c
+tests/macros.h
 
 Depends-on:
 unictype/property-test

diff --git a/modules/unictype/property-combining-tests b/modules/unictype/property-combining-tests
index e2f5930..bafe54e 100644 (file)
--- a/modules/unictype/property-combining-tests
+++ b/modules/unictype/property-combining-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_combining.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-composite-tests b/modules/unictype/property-composite-tests
index b528ab1..2d5652f 100644 (file)
--- a/modules/unictype/property-composite-tests
+++ b/modules/unictype/property-composite-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_composite.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-currency-symbol-tests b/modules/unictype/property-currency-symbol-tests
index 8d4e234..034db16 100644 (file)
--- a/modules/unictype/property-currency-symbol-tests
+++ b/modules/unictype/property-currency-symbol-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_currency_symbol.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-dash-tests b/modules/unictype/property-dash-tests
index 06a403e..9ca620f 100644 (file)
--- a/modules/unictype/property-dash-tests
+++ b/modules/unictype/property-dash-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_dash.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-decimal-digit-tests b/modules/unictype/property-decimal-digit-tests
index 536e547..9dc5dab 100644 (file)
--- a/modules/unictype/property-decimal-digit-tests
+++ b/modules/unictype/property-decimal-digit-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_decimal_digit.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-default-ignorable-code-point-tests b/modules/unictype/property-default-ignorable-code-point-tests
index 881108d..f8992b6 100644 (file)
--- a/modules/unictype/property-default-ignorable-code-point-tests
+++ b/modules/unictype/property-default-ignorable-code-point-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-deprecated-tests b/modules/unictype/property-deprecated-tests
index 891fe65..40fc7ed 100644 (file)
--- a/modules/unictype/property-deprecated-tests
+++ b/modules/unictype/property-deprecated-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_deprecated.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-diacritic-tests b/modules/unictype/property-diacritic-tests
index 63e65c0..f1e77ca 100644 (file)
--- a/modules/unictype/property-diacritic-tests
+++ b/modules/unictype/property-diacritic-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_diacritic.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-extender-tests b/modules/unictype/property-extender-tests
index 2737dcd..9e1d6fa 100644 (file)
--- a/modules/unictype/property-extender-tests
+++ b/modules/unictype/property-extender-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_extender.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-format-control-tests b/modules/unictype/property-format-control-tests
index b1c55df..bfda08e 100644 (file)
--- a/modules/unictype/property-format-control-tests
+++ b/modules/unictype/property-format-control-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_format_control.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-grapheme-base-tests b/modules/unictype/property-grapheme-base-tests
index 5dca86e..b534c39 100644 (file)
--- a/modules/unictype/property-grapheme-base-tests
+++ b/modules/unictype/property-grapheme-base-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_grapheme_base.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-grapheme-extend-tests b/modules/unictype/property-grapheme-extend-tests
index a13e6cf..b5bc724 100644 (file)
--- a/modules/unictype/property-grapheme-extend-tests
+++ b/modules/unictype/property-grapheme-extend-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_grapheme_extend.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-grapheme-link-tests b/modules/unictype/property-grapheme-link-tests
index 5a65dc1..5168325 100644 (file)
--- a/modules/unictype/property-grapheme-link-tests
+++ b/modules/unictype/property-grapheme-link-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_grapheme_link.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-hex-digit-tests b/modules/unictype/property-hex-digit-tests
index 67d9f09..043b0cd 100644 (file)
--- a/modules/unictype/property-hex-digit-tests
+++ b/modules/unictype/property-hex-digit-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_hex_digit.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-hyphen-tests b/modules/unictype/property-hyphen-tests
index a3be868..b4a4e7e 100644 (file)
--- a/modules/unictype/property-hyphen-tests
+++ b/modules/unictype/property-hyphen-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_hyphen.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-id-continue-tests b/modules/unictype/property-id-continue-tests
index 09f6593..33362ed 100644 (file)
--- a/modules/unictype/property-id-continue-tests
+++ b/modules/unictype/property-id-continue-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_id_continue.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-id-start-tests b/modules/unictype/property-id-start-tests
index 4ad9c53..d0e8256 100644 (file)
--- a/modules/unictype/property-id-start-tests
+++ b/modules/unictype/property-id-start-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_id_start.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-ideographic-tests b/modules/unictype/property-ideographic-tests
index 691e5fd..1b6a725 100644 (file)
--- a/modules/unictype/property-ideographic-tests
+++ b/modules/unictype/property-ideographic-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_ideographic.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-ids-binary-operator-tests b/modules/unictype/property-ids-binary-operator-tests
index 00c4d1b..195c854 100644 (file)
--- a/modules/unictype/property-ids-binary-operator-tests
+++ b/modules/unictype/property-ids-binary-operator-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-ids-trinary-operator-tests b/modules/unictype/property-ids-trinary-operator-tests
index 31fb902..e9e448e 100644 (file)
--- a/modules/unictype/property-ids-trinary-operator-tests
+++ b/modules/unictype/property-ids-trinary-operator-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-ignorable-control-tests b/modules/unictype/property-ignorable-control-tests
index 1dedc29..1e72a68 100644 (file)
--- a/modules/unictype/property-ignorable-control-tests
+++ b/modules/unictype/property-ignorable-control-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_ignorable_control.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-iso-control-tests b/modules/unictype/property-iso-control-tests
index 57742da..8923607 100644 (file)
--- a/modules/unictype/property-iso-control-tests
+++ b/modules/unictype/property-iso-control-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_iso_control.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-join-control-tests b/modules/unictype/property-join-control-tests
index eefebd1..17deabb 100644 (file)
--- a/modules/unictype/property-join-control-tests
+++ b/modules/unictype/property-join-control-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_join_control.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-left-of-pair-tests b/modules/unictype/property-left-of-pair-tests
index 764622f..ea9bd6e 100644 (file)
--- a/modules/unictype/property-left-of-pair-tests
+++ b/modules/unictype/property-left-of-pair-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-line-separator-tests b/modules/unictype/property-line-separator-tests
index 31a25d9..15a519d 100644 (file)
--- a/modules/unictype/property-line-separator-tests
+++ b/modules/unictype/property-line-separator-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_line_separator.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-logical-order-exception-tests b/modules/unictype/property-logical-order-exception-tests
index 5935e83..4441183 100644 (file)
--- a/modules/unictype/property-logical-order-exception-tests
+++ b/modules/unictype/property-logical-order-exception-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-lowercase-tests b/modules/unictype/property-lowercase-tests
index 8f3ec2f..302110a 100644 (file)
--- a/modules/unictype/property-lowercase-tests
+++ b/modules/unictype/property-lowercase-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_lowercase.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-math-tests b/modules/unictype/property-math-tests
index cb80e54..04010a0 100644 (file)
--- a/modules/unictype/property-math-tests
+++ b/modules/unictype/property-math-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_math.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-non-break-tests b/modules/unictype/property-non-break-tests
index 61941fc..0ba6b8f 100644 (file)
--- a/modules/unictype/property-non-break-tests
+++ b/modules/unictype/property-non-break-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_non_break.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-not-a-character-tests b/modules/unictype/property-not-a-character-tests
index c46d003..5c96ba5 100644 (file)
--- a/modules/unictype/property-not-a-character-tests
+++ b/modules/unictype/property-not-a-character-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-numeric-tests b/modules/unictype/property-numeric-tests
index c07a0d7..ac4c4b8 100644 (file)
--- a/modules/unictype/property-numeric-tests
+++ b/modules/unictype/property-numeric-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_numeric.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-other-alphabetic-tests b/modules/unictype/property-other-alphabetic-tests
index 107e0ac..1c5a83c 100644 (file)
--- a/modules/unictype/property-other-alphabetic-tests
+++ b/modules/unictype/property-other-alphabetic-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_other_alphabetic.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-other-default-ignorable-code-point-tests b/modules/unictype/property-other-default-ignorable-code-point-tests
index 55afbdf..213aea7 100644 (file)
--- a/modules/unictype/property-other-default-ignorable-code-point-tests
+++ b/modules/unictype/property-other-default-ignorable-code-point-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-other-grapheme-extend-tests b/modules/unictype/property-other-grapheme-extend-tests
index 57dd4e0..7a5fce5 100644 (file)
--- a/modules/unictype/property-other-grapheme-extend-tests
+++ b/modules/unictype/property-other-grapheme-extend-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-other-id-continue-tests b/modules/unictype/property-other-id-continue-tests
index 7ec421e..f40de9e 100644 (file)
--- a/modules/unictype/property-other-id-continue-tests
+++ b/modules/unictype/property-other-id-continue-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-other-id-start-tests b/modules/unictype/property-other-id-start-tests
index 4a121bd..cf1b2e4 100644 (file)
--- a/modules/unictype/property-other-id-start-tests
+++ b/modules/unictype/property-other-id-start-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-other-lowercase-tests b/modules/unictype/property-other-lowercase-tests
index 01bcf11..ba13d39 100644 (file)
--- a/modules/unictype/property-other-lowercase-tests
+++ b/modules/unictype/property-other-lowercase-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_other_lowercase.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-other-math-tests b/modules/unictype/property-other-math-tests
index c9d415b..1cbcc5a 100644 (file)
--- a/modules/unictype/property-other-math-tests
+++ b/modules/unictype/property-other-math-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_other_math.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-other-uppercase-tests b/modules/unictype/property-other-uppercase-tests
index de9e32e..d8c6031 100644 (file)
--- a/modules/unictype/property-other-uppercase-tests
+++ b/modules/unictype/property-other-uppercase-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_other_uppercase.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-paired-punctuation-tests b/modules/unictype/property-paired-punctuation-tests
index 6c4ac4f..941190d 100644 (file)
--- a/modules/unictype/property-paired-punctuation-tests
+++ b/modules/unictype/property-paired-punctuation-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_paired_punctuation.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-paragraph-separator-tests b/modules/unictype/property-paragraph-separator-tests
index ca2e578..8146851 100644 (file)
--- a/modules/unictype/property-paragraph-separator-tests
+++ b/modules/unictype/property-paragraph-separator-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_paragraph_separator.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-pattern-syntax-tests b/modules/unictype/property-pattern-syntax-tests
index df25dd2..43fb342 100644 (file)
--- a/modules/unictype/property-pattern-syntax-tests
+++ b/modules/unictype/property-pattern-syntax-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_pattern_syntax.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-pattern-white-space-tests b/modules/unictype/property-pattern-white-space-tests
index 8f20032..6edae42 100644 (file)
--- a/modules/unictype/property-pattern-white-space-tests
+++ b/modules/unictype/property-pattern-white-space-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-private-use-tests b/modules/unictype/property-private-use-tests
index 1d6e0a7..f9b4d24 100644 (file)
--- a/modules/unictype/property-private-use-tests
+++ b/modules/unictype/property-private-use-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_private_use.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-punctuation-tests b/modules/unictype/property-punctuation-tests
index a988dad..afee325 100644 (file)
--- a/modules/unictype/property-punctuation-tests
+++ b/modules/unictype/property-punctuation-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_punctuation.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-quotation-mark-tests b/modules/unictype/property-quotation-mark-tests
index 5de6749..21862e9 100644 (file)
--- a/modules/unictype/property-quotation-mark-tests
+++ b/modules/unictype/property-quotation-mark-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_quotation_mark.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-radical-tests b/modules/unictype/property-radical-tests
index 38bf095..ffa8d61 100644 (file)
--- a/modules/unictype/property-radical-tests
+++ b/modules/unictype/property-radical-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_radical.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-sentence-terminal-tests b/modules/unictype/property-sentence-terminal-tests
index 5536f35..6ae3e90 100644 (file)
--- a/modules/unictype/property-sentence-terminal-tests
+++ b/modules/unictype/property-sentence-terminal-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_sentence_terminal.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-soft-dotted-tests b/modules/unictype/property-soft-dotted-tests
index e5e04d7..6b9c6e5 100644 (file)
--- a/modules/unictype/property-soft-dotted-tests
+++ b/modules/unictype/property-soft-dotted-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_soft_dotted.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-space-tests b/modules/unictype/property-space-tests
index c39c834..9ad1edd 100644 (file)
--- a/modules/unictype/property-space-tests
+++ b/modules/unictype/property-space-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_space.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-terminal-punctuation-tests b/modules/unictype/property-terminal-punctuation-tests
index 56e96b5..4c36edd 100644 (file)
--- a/modules/unictype/property-terminal-punctuation-tests
+++ b/modules/unictype/property-terminal-punctuation-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_terminal_punctuation.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-test-tests b/modules/unictype/property-test-tests
index d2dfb0e..34597a8 100644 (file)
--- a/modules/unictype/property-test-tests
+++ b/modules/unictype/property-test-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-pr_test.c
+tests/macros.h
 
 Depends-on:
 unictype/property-composite

diff --git a/modules/unictype/property-titlecase-tests b/modules/unictype/property-titlecase-tests
index c4249fe..16cbecf 100644 (file)
--- a/modules/unictype/property-titlecase-tests
+++ b/modules/unictype/property-titlecase-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_titlecase.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-unassigned-code-value-tests b/modules/unictype/property-unassigned-code-value-tests
index 42554f7..1d92aee 100644 (file)
--- a/modules/unictype/property-unassigned-code-value-tests
+++ b/modules/unictype/property-unassigned-code-value-tests
@@ -2,6 +2,7 @@ Files:
 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:
 

diff --git a/modules/unictype/property-unified-ideograph-tests b/modules/unictype/property-unified-ideograph-tests
index 221dff8..b6ef034 100644 (file)
--- a/modules/unictype/property-unified-ideograph-tests
+++ b/modules/unictype/property-unified-ideograph-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_unified_ideograph.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-uppercase-tests b/modules/unictype/property-uppercase-tests
index 755da86..e0e8a44 100644 (file)
--- a/modules/unictype/property-uppercase-tests
+++ b/modules/unictype/property-uppercase-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_uppercase.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-variation-selector-tests b/modules/unictype/property-variation-selector-tests
index 65fb917..8150e17 100644 (file)
--- a/modules/unictype/property-variation-selector-tests
+++ b/modules/unictype/property-variation-selector-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_variation_selector.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-white-space-tests b/modules/unictype/property-white-space-tests
index 24fc272..64cf093 100644 (file)
--- a/modules/unictype/property-white-space-tests
+++ b/modules/unictype/property-white-space-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_white_space.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-xid-continue-tests b/modules/unictype/property-xid-continue-tests
index be749e7..ee71a02 100644 (file)
--- a/modules/unictype/property-xid-continue-tests
+++ b/modules/unictype/property-xid-continue-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_xid_continue.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-xid-start-tests b/modules/unictype/property-xid-start-tests
index ce09a17..a1a2a09 100644 (file)
--- a/modules/unictype/property-xid-start-tests
+++ b/modules/unictype/property-xid-start-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_xid_start.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/property-zero-width-tests b/modules/unictype/property-zero-width-tests
index f5b72d1..20163dd 100644 (file)
--- a/modules/unictype/property-zero-width-tests
+++ b/modules/unictype/property-zero-width-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-pr_zero_width.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/scripts-tests b/modules/unictype/scripts-tests
index 54a6e1a..cd6a6eb 100644 (file)
--- a/modules/unictype/scripts-tests
+++ b/modules/unictype/scripts-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-scripts.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/syntax-c-ident-tests b/modules/unictype/syntax-c-ident-tests
index 6e0b700..5bd69aa 100644 (file)
--- a/modules/unictype/syntax-c-ident-tests
+++ b/modules/unictype/syntax-c-ident-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-sy_c_ident.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/syntax-c-whitespace-tests b/modules/unictype/syntax-c-whitespace-tests
index d1770b7..b19dd64 100644 (file)
--- a/modules/unictype/syntax-c-whitespace-tests
+++ b/modules/unictype/syntax-c-whitespace-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-sy_c_whitespace.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/syntax-java-ident-tests b/modules/unictype/syntax-java-ident-tests
index 2c6dc12..2753d63 100644 (file)
--- a/modules/unictype/syntax-java-ident-tests
+++ b/modules/unictype/syntax-java-ident-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unictype/test-sy_java_ident.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unictype/syntax-java-whitespace-tests b/modules/unictype/syntax-java-whitespace-tests
index bb9f57c..6fcd4a1 100644 (file)
--- a/modules/unictype/syntax-java-whitespace-tests
+++ b/modules/unictype/syntax-java-whitespace-tests
@@ -2,6 +2,7 @@ Files:
 tests/unictype/test-sy_java_whitespace.c
 tests/unictype/test-predicate-part1.h
 tests/unictype/test-predicate-part2.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unilbrk/u16-possible-linebreaks-tests b/modules/unilbrk/u16-possible-linebreaks-tests
index 8dc7348..0ccca8c 100644 (file)
--- a/modules/unilbrk/u16-possible-linebreaks-tests
+++ b/modules/unilbrk/u16-possible-linebreaks-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unilbrk/test-u16-possible-linebreaks.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unilbrk/u16-width-linebreaks-tests b/modules/unilbrk/u16-width-linebreaks-tests
index cdc2fbe..1f2eb54 100644 (file)
--- a/modules/unilbrk/u16-width-linebreaks-tests
+++ b/modules/unilbrk/u16-width-linebreaks-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unilbrk/test-u16-width-linebreaks.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unilbrk/u32-possible-linebreaks-tests b/modules/unilbrk/u32-possible-linebreaks-tests
index 487a9a2..12ff96e 100644 (file)
--- a/modules/unilbrk/u32-possible-linebreaks-tests
+++ b/modules/unilbrk/u32-possible-linebreaks-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unilbrk/test-u32-possible-linebreaks.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unilbrk/u32-width-linebreaks-tests b/modules/unilbrk/u32-width-linebreaks-tests
index 27644fd..e6daa5a 100644 (file)
--- a/modules/unilbrk/u32-width-linebreaks-tests
+++ b/modules/unilbrk/u32-width-linebreaks-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unilbrk/test-u32-width-linebreaks.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unilbrk/u8-possible-linebreaks-tests b/modules/unilbrk/u8-possible-linebreaks-tests
index 9b9dcd3..3b1ac38 100644 (file)
--- a/modules/unilbrk/u8-possible-linebreaks-tests
+++ b/modules/unilbrk/u8-possible-linebreaks-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unilbrk/test-u8-possible-linebreaks.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unilbrk/u8-width-linebreaks-tests b/modules/unilbrk/u8-width-linebreaks-tests
index 8608f1e..00fe85f 100644 (file)
--- a/modules/unilbrk/u8-width-linebreaks-tests
+++ b/modules/unilbrk/u8-width-linebreaks-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unilbrk/test-u8-width-linebreaks.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unilbrk/ulc-possible-linebreaks-tests b/modules/unilbrk/ulc-possible-linebreaks-tests
index f631d15..33c1e04 100644 (file)
--- a/modules/unilbrk/ulc-possible-linebreaks-tests
+++ b/modules/unilbrk/ulc-possible-linebreaks-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unilbrk/test-ulc-possible-linebreaks.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unilbrk/ulc-width-linebreaks-tests b/modules/unilbrk/ulc-width-linebreaks-tests
index c068eb5..7c05b5a 100644 (file)
--- a/modules/unilbrk/ulc-width-linebreaks-tests
+++ b/modules/unilbrk/ulc-width-linebreaks-tests
@@ -1,5 +1,6 @@
 Files:
 tests/unilbrk/test-ulc-width-linebreaks.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/uninorm/canonical-decomposition-tests b/modules/uninorm/canonical-decomposition-tests
index 5ec587e..189a46d 100644 (file)
--- a/modules/uninorm/canonical-decomposition-tests
+++ b/modules/uninorm/canonical-decomposition-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uninorm/test-canonical-decomposition.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/uninorm/compat-decomposition-tests b/modules/uninorm/compat-decomposition-tests
index a13beba..75cff7f 100644 (file)
--- a/modules/uninorm/compat-decomposition-tests
+++ b/modules/uninorm/compat-decomposition-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uninorm/test-compat-decomposition.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/uninorm/composition-tests b/modules/uninorm/composition-tests
index 1493498..d8d87df 100644 (file)
--- a/modules/uninorm/composition-tests
+++ b/modules/uninorm/composition-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uninorm/test-composition.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/uninorm/decomposing-form-tests b/modules/uninorm/decomposing-form-tests
index 5c8536d..f3113cb 100644 (file)
--- a/modules/uninorm/decomposing-form-tests
+++ b/modules/uninorm/decomposing-form-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uninorm/test-decomposing-form.c
+tests/macros.h
 
 Depends-on:
 uninorm/nfc

diff --git a/modules/uninorm/decomposition-tests b/modules/uninorm/decomposition-tests
index 69103db..ce70d17 100644 (file)
--- a/modules/uninorm/decomposition-tests
+++ b/modules/uninorm/decomposition-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uninorm/test-decomposition.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/uninorm/filter-tests b/modules/uninorm/filter-tests
index a857015..ae95a72 100644 (file)
--- a/modules/uninorm/filter-tests
+++ b/modules/uninorm/filter-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uninorm/test-uninorm-filter-nfc.c
+tests/macros.h
 
 Depends-on:
 unistr/u32-cmp

diff --git a/modules/uninorm/nfc-tests b/modules/uninorm/nfc-tests
index 4eec831..0c6b187 100644 (file)
--- a/modules/uninorm/nfc-tests
+++ b/modules/uninorm/nfc-tests
@@ -8,6 +8,7 @@ tests/uninorm/test-u32-nfc-big.c
 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

diff --git a/modules/uninorm/nfd-tests b/modules/uninorm/nfd-tests
index a30c61a..0ec2405 100644 (file)
--- a/modules/uninorm/nfd-tests
+++ b/modules/uninorm/nfd-tests
@@ -8,6 +8,7 @@ tests/uninorm/test-u32-nfd-big.c
 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

diff --git a/modules/uninorm/nfkc-tests b/modules/uninorm/nfkc-tests
index a7e4bde..12f3a43 100644 (file)
--- a/modules/uninorm/nfkc-tests
+++ b/modules/uninorm/nfkc-tests
@@ -8,6 +8,7 @@ tests/uninorm/test-u32-nfkc-big.c
 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

diff --git a/modules/uninorm/nfkd-tests b/modules/uninorm/nfkd-tests
index 7e3173d..9b5ec6e 100644 (file)
--- a/modules/uninorm/nfkd-tests
+++ b/modules/uninorm/nfkd-tests
@@ -8,6 +8,7 @@ tests/uninorm/test-u32-nfkd-big.c
 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

diff --git a/modules/uninorm/u16-normcmp-tests b/modules/uninorm/u16-normcmp-tests
index 6d95ed7..217e6f0 100644 (file)
--- a/modules/uninorm/u16-normcmp-tests
+++ b/modules/uninorm/u16-normcmp-tests
@@ -1,6 +1,7 @@
 Files:
 tests/uninorm/test-u16-normcmp.c
 tests/uninorm/test-u16-normcmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfd

diff --git a/modules/uninorm/u16-normcoll-tests b/modules/uninorm/u16-normcoll-tests
index 43f8ad9..bb29553 100644 (file)
--- a/modules/uninorm/u16-normcoll-tests
+++ b/modules/uninorm/u16-normcoll-tests
@@ -1,6 +1,7 @@
 Files:
 tests/uninorm/test-u16-normcoll.c
 tests/uninorm/test-u16-normcmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfc

diff --git a/modules/uninorm/u32-normcmp-tests b/modules/uninorm/u32-normcmp-tests
index 1f7c824..887ccb2 100644 (file)
--- a/modules/uninorm/u32-normcmp-tests
+++ b/modules/uninorm/u32-normcmp-tests
@@ -1,6 +1,7 @@
 Files:
 tests/uninorm/test-u32-normcmp.c
 tests/uninorm/test-u32-normcmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfd

diff --git a/modules/uninorm/u32-normcoll-tests b/modules/uninorm/u32-normcoll-tests
index 029fe87..41ce656 100644 (file)
--- a/modules/uninorm/u32-normcoll-tests
+++ b/modules/uninorm/u32-normcoll-tests
@@ -1,6 +1,7 @@
 Files:
 tests/uninorm/test-u32-normcoll.c
 tests/uninorm/test-u32-normcmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfc

diff --git a/modules/uninorm/u8-normcmp-tests b/modules/uninorm/u8-normcmp-tests
index eb83bcb..b1abc02 100644 (file)
--- a/modules/uninorm/u8-normcmp-tests
+++ b/modules/uninorm/u8-normcmp-tests
@@ -1,6 +1,7 @@
 Files:
 tests/uninorm/test-u8-normcmp.c
 tests/uninorm/test-u8-normcmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfd

diff --git a/modules/uninorm/u8-normcoll-tests b/modules/uninorm/u8-normcoll-tests
index 31e33a4..54995f0 100644 (file)
--- a/modules/uninorm/u8-normcoll-tests
+++ b/modules/uninorm/u8-normcoll-tests
@@ -1,6 +1,7 @@
 Files:
 tests/uninorm/test-u8-normcoll.c
 tests/uninorm/test-u8-normcmp.h
+tests/macros.h
 
 Depends-on:
 uninorm/nfc

diff --git a/modules/unistdio/u16-asnprintf-tests b/modules/unistdio/u16-asnprintf-tests
index e0d0ae4..9023b33 100644 (file)
--- a/modules/unistdio/u16-asnprintf-tests
+++ b/modules/unistdio/u16-asnprintf-tests
@@ -2,6 +2,7 @@ Files:
 tests/unistdio/test-u16-asnprintf1.c
 tests/unistdio/test-u16-asnprintf1.h
 tests/unistdio/test-u16-printf1.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unistdio/u16-vasnprintf-tests b/modules/unistdio/u16-vasnprintf-tests
index 82f14ba..81a563b 100644 (file)
--- a/modules/unistdio/u16-vasnprintf-tests
+++ b/modules/unistdio/u16-vasnprintf-tests
@@ -6,6 +6,7 @@ tests/unistdio/test-u16-vasnprintf2.sh
 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
 

diff --git a/modules/unistdio/u16-vasprintf-tests b/modules/unistdio/u16-vasprintf-tests
index f50bb4f..b4163a4 100644 (file)
--- a/modules/unistdio/u16-vasprintf-tests
+++ b/modules/unistdio/u16-vasprintf-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u16-vasprintf1.c
 tests/unistdio/test-u16-printf1.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unistdio/u16-vsnprintf-tests b/modules/unistdio/u16-vsnprintf-tests
index 815c852..0a4c70a 100644 (file)
--- a/modules/unistdio/u16-vsnprintf-tests
+++ b/modules/unistdio/u16-vsnprintf-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u16-vsnprintf1.c
 tests/unistdio/test-u16-printf1.h
+tests/macros.h
 
 Depends-on:
 xalloc

diff --git a/modules/unistdio/u16-vsprintf-tests b/modules/unistdio/u16-vsprintf-tests
index 2a0f98a..715249d 100644 (file)
--- a/modules/unistdio/u16-vsprintf-tests
+++ b/modules/unistdio/u16-vsprintf-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u16-vsprintf1.c
 tests/unistdio/test-u16-printf1.h
+tests/macros.h
 
 Depends-on:
 xalloc

diff --git a/modules/unistdio/u32-asnprintf-tests b/modules/unistdio/u32-asnprintf-tests
index f827976..8a285f3 100644 (file)
--- a/modules/unistdio/u32-asnprintf-tests
+++ b/modules/unistdio/u32-asnprintf-tests
@@ -2,6 +2,7 @@ Files:
 tests/unistdio/test-u32-asnprintf1.c
 tests/unistdio/test-u32-asnprintf1.h
 tests/unistdio/test-u32-printf1.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unistdio/u32-vasnprintf-tests b/modules/unistdio/u32-vasnprintf-tests
index 29a8893..ae0bf1a 100644 (file)
--- a/modules/unistdio/u32-vasnprintf-tests
+++ b/modules/unistdio/u32-vasnprintf-tests
@@ -6,6 +6,7 @@ tests/unistdio/test-u32-vasnprintf2.sh
 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
 

diff --git a/modules/unistdio/u32-vasprintf-tests b/modules/unistdio/u32-vasprintf-tests
index 6d85b0f..e7b4c02 100644 (file)
--- a/modules/unistdio/u32-vasprintf-tests
+++ b/modules/unistdio/u32-vasprintf-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u32-vasprintf1.c
 tests/unistdio/test-u32-printf1.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unistdio/u32-vsnprintf-tests b/modules/unistdio/u32-vsnprintf-tests
index 0692e96..65fd947 100644 (file)
--- a/modules/unistdio/u32-vsnprintf-tests
+++ b/modules/unistdio/u32-vsnprintf-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u32-vsnprintf1.c
 tests/unistdio/test-u32-printf1.h
+tests/macros.h
 
 Depends-on:
 xalloc

diff --git a/modules/unistdio/u32-vsprintf-tests b/modules/unistdio/u32-vsprintf-tests
index b7dd115..04c515c 100644 (file)
--- a/modules/unistdio/u32-vsprintf-tests
+++ b/modules/unistdio/u32-vsprintf-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u32-vsprintf1.c
 tests/unistdio/test-u32-printf1.h
+tests/macros.h
 
 Depends-on:
 xalloc

diff --git a/modules/unistdio/u8-asnprintf-tests b/modules/unistdio/u8-asnprintf-tests
index 10afe9d..2e6ed15 100644 (file)
--- a/modules/unistdio/u8-asnprintf-tests
+++ b/modules/unistdio/u8-asnprintf-tests
@@ -2,6 +2,7 @@ Files:
 tests/unistdio/test-u8-asnprintf1.c
 tests/unistdio/test-u8-asnprintf1.h
 tests/unistdio/test-u8-printf1.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unistdio/u8-vasnprintf-tests b/modules/unistdio/u8-vasnprintf-tests
index 15251f7..221b942 100644 (file)
--- a/modules/unistdio/u8-vasnprintf-tests
+++ b/modules/unistdio/u8-vasnprintf-tests
@@ -6,6 +6,7 @@ tests/unistdio/test-u8-vasnprintf2.sh
 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
 

diff --git a/modules/unistdio/u8-vasprintf-tests b/modules/unistdio/u8-vasprintf-tests
index a9490b4..ec85b60 100644 (file)
--- a/modules/unistdio/u8-vasprintf-tests
+++ b/modules/unistdio/u8-vasprintf-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u8-vasprintf1.c
 tests/unistdio/test-u8-printf1.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unistdio/u8-vsnprintf-tests b/modules/unistdio/u8-vsnprintf-tests
index 55f61fc..7f12e45 100644 (file)
--- a/modules/unistdio/u8-vsnprintf-tests
+++ b/modules/unistdio/u8-vsnprintf-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u8-vsnprintf1.c
 tests/unistdio/test-u8-printf1.h
+tests/macros.h
 
 Depends-on:
 xalloc

diff --git a/modules/unistdio/u8-vsprintf-tests b/modules/unistdio/u8-vsprintf-tests
index 4b262ce..b20e704 100644 (file)
--- a/modules/unistdio/u8-vsprintf-tests
+++ b/modules/unistdio/u8-vsprintf-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-u8-vsprintf1.c
 tests/unistdio/test-u8-printf1.h
+tests/macros.h
 
 Depends-on:
 xalloc

diff --git a/modules/unistdio/ulc-asnprintf-tests b/modules/unistdio/ulc-asnprintf-tests
index 2588a7f..2eaddaf 100644 (file)
--- a/modules/unistdio/ulc-asnprintf-tests
+++ b/modules/unistdio/ulc-asnprintf-tests
@@ -2,6 +2,7 @@ Files:
 tests/unistdio/test-ulc-asnprintf1.c
 tests/unistdio/test-ulc-asnprintf1.h
 tests/unistdio/test-ulc-printf1.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unistdio/ulc-vasnprintf-tests b/modules/unistdio/ulc-vasnprintf-tests
index 6afb238..8ee2268 100644 (file)
--- a/modules/unistdio/ulc-vasnprintf-tests
+++ b/modules/unistdio/ulc-vasnprintf-tests
@@ -6,6 +6,7 @@ tests/unistdio/test-ulc-vasnprintf2.sh
 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
 

diff --git a/modules/unistdio/ulc-vasprintf-tests b/modules/unistdio/ulc-vasprintf-tests
index d006624..1acae46 100644 (file)
--- a/modules/unistdio/ulc-vasprintf-tests
+++ b/modules/unistdio/ulc-vasprintf-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-ulc-vasprintf1.c
 tests/unistdio/test-ulc-printf1.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unistdio/ulc-vsnprintf-tests b/modules/unistdio/ulc-vsnprintf-tests
index 5f397f5..fb7eb6c 100644 (file)
--- a/modules/unistdio/ulc-vsnprintf-tests
+++ b/modules/unistdio/ulc-vsnprintf-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-ulc-vsnprintf1.c
 tests/unistdio/test-ulc-printf1.h
+tests/macros.h
 
 Depends-on:
 xalloc

diff --git a/modules/unistdio/ulc-vsprintf-tests b/modules/unistdio/ulc-vsprintf-tests
index a588379..7660984 100644 (file)
--- a/modules/unistdio/ulc-vsprintf-tests
+++ b/modules/unistdio/ulc-vsprintf-tests
@@ -1,6 +1,7 @@
 Files:
 tests/unistdio/test-ulc-vsprintf1.c
 tests/unistdio/test-ulc-printf1.h
+tests/macros.h
 
 Depends-on:
 xalloc

diff --git a/modules/uniwbrk/u16-wordbreaks-tests b/modules/uniwbrk/u16-wordbreaks-tests
index ae77ff9..8a923f3 100644 (file)
--- a/modules/uniwbrk/u16-wordbreaks-tests
+++ b/modules/uniwbrk/u16-wordbreaks-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniwbrk/test-u16-wordbreaks.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/uniwbrk/u32-wordbreaks-tests b/modules/uniwbrk/u32-wordbreaks-tests
index d57c04a..33145c0 100644 (file)
--- a/modules/uniwbrk/u32-wordbreaks-tests
+++ b/modules/uniwbrk/u32-wordbreaks-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniwbrk/test-u32-wordbreaks.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/uniwbrk/u8-wordbreaks-tests b/modules/uniwbrk/u8-wordbreaks-tests
index 8d14157..8248f2f 100644 (file)
--- a/modules/uniwbrk/u8-wordbreaks-tests
+++ b/modules/uniwbrk/u8-wordbreaks-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniwbrk/test-u8-wordbreaks.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/uniwbrk/ulc-wordbreaks-tests b/modules/uniwbrk/ulc-wordbreaks-tests
index afdd4f5..ad612ff 100644 (file)
--- a/modules/uniwbrk/ulc-wordbreaks-tests
+++ b/modules/uniwbrk/ulc-wordbreaks-tests
@@ -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
 

diff --git a/modules/uniwidth/u16-strwidth-tests b/modules/uniwidth/u16-strwidth-tests
index 0405a9f..84d0c7e 100644 (file)
--- a/modules/uniwidth/u16-strwidth-tests
+++ b/modules/uniwidth/u16-strwidth-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniwidth/test-u16-strwidth.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/uniwidth/u16-width-tests b/modules/uniwidth/u16-width-tests
index 8b24bf0..3a87203 100644 (file)
--- a/modules/uniwidth/u16-width-tests
+++ b/modules/uniwidth/u16-width-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniwidth/test-u16-width.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/uniwidth/u32-strwidth-tests b/modules/uniwidth/u32-strwidth-tests
index 20e16d0..a8e34da 100644 (file)
--- a/modules/uniwidth/u32-strwidth-tests
+++ b/modules/uniwidth/u32-strwidth-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniwidth/test-u32-strwidth.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/uniwidth/u32-width-tests b/modules/uniwidth/u32-width-tests
index b8bf995..934402f 100644 (file)
--- a/modules/uniwidth/u32-width-tests
+++ b/modules/uniwidth/u32-width-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniwidth/test-u32-width.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/uniwidth/u8-strwidth-tests b/modules/uniwidth/u8-strwidth-tests
index 6e18d05..1898c90 100644 (file)
--- a/modules/uniwidth/u8-strwidth-tests
+++ b/modules/uniwidth/u8-strwidth-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniwidth/test-u8-strwidth.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/uniwidth/u8-width-tests b/modules/uniwidth/u8-width-tests
index f66aa52..a0112a7 100644 (file)
--- a/modules/uniwidth/u8-width-tests
+++ b/modules/uniwidth/u8-width-tests
@@ -1,5 +1,6 @@
 Files:
 tests/uniwidth/test-u8-width.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/uniwidth/width-tests b/modules/uniwidth/width-tests
index 05753a1..523d0ba 100644 (file)
--- a/modules/uniwidth/width-tests
+++ b/modules/uniwidth/width-tests
@@ -2,6 +2,7 @@ Files:
 tests/uniwidth/test-uc_width.c
 tests/uniwidth/test-uc_width2.c
 tests/uniwidth/test-uc_width2.sh
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/unlink-tests b/modules/unlink-tests
index d9c82eb..f49fe4d 100644 (file)
--- a/modules/unlink-tests
+++ b/modules/unlink-tests
@@ -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

diff --git a/modules/unsetenv-tests b/modules/unsetenv-tests
index fddee90..e3a62f4 100644 (file)
--- a/modules/unsetenv-tests
+++ b/modules/unsetenv-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-unsetenv.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 putenv

diff --git a/modules/usleep-tests b/modules/usleep-tests
index 59d9c17..43241f4 100644 (file)
--- a/modules/usleep-tests
+++ b/modules/usleep-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-usleep.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 time

diff --git a/modules/utimens-tests b/modules/utimens-tests
index 5bf14c2..a9ddd27 100644 (file)
--- a/modules/utimens-tests
+++ b/modules/utimens-tests
@@ -5,6 +5,7 @@ tests/test-lutimens.h
 tests/test-utimens.h
 tests/test-utimens-common.h
 tests/test-utimens.c
+tests/macros.h
 
 Depends-on:
 symlink

diff --git a/modules/utimensat-tests b/modules/utimensat-tests
index 46ae133..75516d8 100644 (file)
--- a/modules/utimensat-tests
+++ b/modules/utimensat-tests
@@ -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

diff --git a/modules/vasnprintf-posix-tests b/modules/vasnprintf-posix-tests
index 26c437c..d3dc168 100644 (file)
--- a/modules/vasnprintf-posix-tests
+++ b/modules/vasnprintf-posix-tests
@@ -3,6 +3,7 @@ tests/test-vasnprintf-posix.c
 tests/test-vasnprintf-posix2.sh
 tests/test-vasnprintf-posix2.c
 tests/nan.h
+tests/macros.h
 m4/locale-fr.m4
 m4/codeset.m4
 

diff --git a/modules/vasnprintf-tests b/modules/vasnprintf-tests
index 12ac4a6..7ae88c6 100644 (file)
--- a/modules/vasnprintf-tests
+++ b/modules/vasnprintf-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-vasnprintf.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/vasprintf-posix-tests b/modules/vasprintf-posix-tests
index bf4bd34..4be9c2b 100644 (file)
--- a/modules/vasprintf-posix-tests
+++ b/modules/vasprintf-posix-tests
@@ -1,6 +1,7 @@
 Files:
 tests/test-vasprintf-posix.c
 tests/nan.h
+tests/macros.h
 
 Depends-on:
 stdint

diff --git a/modules/vasprintf-tests b/modules/vasprintf-tests
index 0fd058a..f6a7d80 100644 (file)
--- a/modules/vasprintf-tests
+++ b/modules/vasprintf-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-vasprintf.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/vdprintf-posix-tests b/modules/vdprintf-posix-tests
index aa1c015..ffa2917 100644 (file)
--- a/modules/vdprintf-posix-tests
+++ b/modules/vdprintf-posix-tests
@@ -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

diff --git a/modules/vfprintf-posix-tests b/modules/vfprintf-posix-tests
index 5423720..8062cd2 100644 (file)
--- a/modules/vfprintf-posix-tests
+++ b/modules/vfprintf-posix-tests
@@ -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

diff --git a/modules/vprintf-posix-tests b/modules/vprintf-posix-tests
index 408948f..66c01bd 100644 (file)
--- a/modules/vprintf-posix-tests
+++ b/modules/vprintf-posix-tests
@@ -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

diff --git a/modules/vsnprintf-posix-tests b/modules/vsnprintf-posix-tests
index 816b2a9..530e57c 100644 (file)
--- a/modules/vsnprintf-posix-tests
+++ b/modules/vsnprintf-posix-tests
@@ -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

diff --git a/modules/vsnprintf-tests b/modules/vsnprintf-tests
index 4322d7b..9c520ce 100644 (file)
--- a/modules/vsnprintf-tests
+++ b/modules/vsnprintf-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-vsnprintf.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/vsprintf-posix-tests b/modules/vsprintf-posix-tests
index 54a6cd5..7b5412f 100644 (file)
--- a/modules/vsprintf-posix-tests
+++ b/modules/vsprintf-posix-tests
@@ -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

diff --git a/modules/wcrtomb-tests b/modules/wcrtomb-tests
index 885c6c1..47ba677 100644 (file)
--- a/modules/wcrtomb-tests
+++ b/modules/wcrtomb-tests
@@ -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

diff --git a/modules/wcsnrtombs-tests b/modules/wcsnrtombs-tests
index f18bda9..dc362b9 100644 (file)
--- a/modules/wcsnrtombs-tests
+++ b/modules/wcsnrtombs-tests
@@ -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

diff --git a/modules/wcsrtombs-tests b/modules/wcsrtombs-tests
index 68ab421..757ce42 100644 (file)
--- a/modules/wcsrtombs-tests
+++ b/modules/wcsrtombs-tests
@@ -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

diff --git a/modules/wctype-tests b/modules/wctype-tests
index bd478d9..e7c7b2b 100644 (file)
--- a/modules/wctype-tests
+++ b/modules/wctype-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-wctype.c
+tests/macros.h
 
 Depends-on:
 

diff --git a/modules/wcwidth-tests b/modules/wcwidth-tests
index f12cc6e..0938a88 100644 (file)
--- a/modules/wcwidth-tests
+++ b/modules/wcwidth-tests
@@ -1,6 +1,7 @@
 Files:
-tests/signature.h
 tests/test-wcwidth.c
+tests/signature.h
+tests/macros.h
 
 Depends-on:
 localcharset

diff --git a/modules/xmemdup0-tests b/modules/xmemdup0-tests
index bcbc7ab..13311f0 100644 (file)
--- a/modules/xmemdup0-tests
+++ b/modules/xmemdup0-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-xmemdup0.c
+tests/macros.h
 
 Depends-on:
 progname

diff --git a/modules/xprintf-posix-tests b/modules/xprintf-posix-tests
index 92397b2..22e01ca 100644 (file)
--- a/modules/xprintf-posix-tests
+++ b/modules/xprintf-posix-tests
@@ -5,6 +5,7 @@ tests/test-xprintf-posix.c
 tests/test-fprintf-posix.h
 tests/test-printf-posix.h
 tests/test-printf-posix.output
+tests/macros.h
 
 Depends-on:
 stdint

diff --git a/modules/xvasprintf-tests b/modules/xvasprintf-tests
index a920e6c..77d536e 100644 (file)
--- a/modules/xvasprintf-tests
+++ b/modules/xvasprintf-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-xvasprintf.c
+tests/macros.h
 
 Depends-on:
 progname

diff --git a/tests/macros.h b/tests/macros.h
new file mode 100644 (file)
index 0000000..dc55fbe
--- /dev/null
+++ b/tests/macros.h
@@ -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]))

diff --git a/tests/test-areadlink-with-size.c b/tests/test-areadlink-with-size.c
index ff50f89..8b7ff63 100644 (file)
--- a/tests/test-areadlink-with-size.c
+++ b/tests/test-areadlink-with-size.c
@@ -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"
 

diff --git a/tests/test-areadlink.c b/tests/test-areadlink.c
index 9a36927..2e8aaa5 100644 (file)
--- a/tests/test-areadlink.c
+++ b/tests/test-areadlink.c
@@ -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"
 

diff --git a/tests/test-areadlinkat-with-size.c b/tests/test-areadlinkat-with-size.c
index 55ab78e..67252a7 100644 (file)
--- a/tests/test-areadlinkat-with-size.c
+++ b/tests/test-areadlinkat-with-size.c
@@ -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"
 

diff --git a/tests/test-areadlinkat.c b/tests/test-areadlinkat.c
index f5deb70..54e0745 100644 (file)
--- a/tests/test-areadlinkat.c
+++ b/tests/test-areadlinkat.c
@@ -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"
 

diff --git a/tests/test-argmatch.c b/tests/test-argmatch.c
index c7f157f..5851842 100644 (file)
--- a/tests/test-argmatch.c
+++ b/tests/test-argmatch.c
@@ -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.  */

diff --git a/tests/test-argv-iter.c b/tests/test-argv-iter.c
index fffa425..10159ac 100644 (file)
--- a/tests/test-argv-iter.c
+++ b/tests/test-argv-iter.c
@@ -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)

diff --git a/tests/test-array-mergesort.c b/tests/test-array-mergesort.c
index 684231d..fccd8f1 100644 (file)
--- a/tests/test-array-mergesort.c
+++ b/tests/test-array-mergesort.c
@@ -24,20 +24,9 @@ struct foo { double x; double index; };
 #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] =

diff --git a/tests/test-array_list.c b/tests/test-array_list.c
index 2f33d4c..3a8fad0 100644 (file)
--- a/tests/test-array_list.c
+++ b/tests/test-array_list.c
@@ -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))]
 

diff --git a/tests/test-array_oset.c b/tests/test-array_oset.c
index f79d162..15cec41 100644 (file)
--- a/tests/test-array_oset.c
+++ b/tests/test-array_oset.c
@@ -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 @@ static const char *objects[30] =
     "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))]
 

diff --git a/tests/test-avltree_list.c b/tests/test-avltree_list.c
index 4047ff6..6cd78f1 100644 (file)
--- a/tests/test-avltree_list.c
+++ b/tests/test-avltree_list.c
@@ -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 @@ 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))]
 

diff --git a/tests/test-avltree_oset.c b/tests/test-avltree_oset.c
index c07281a..a37b332 100644 (file)
--- a/tests/test-avltree_oset.c
+++ b/tests/test-avltree_oset.c
@@ -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 @@ static const char *objects[30] =
     "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))]
 

diff --git a/tests/test-avltreehash_list.c b/tests/test-avltreehash_list.c
index 12a716a..4306040 100644 (file)
--- a/tests/test-avltreehash_list.c
+++ b/tests/test-avltreehash_list.c
@@ -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 @@ string_hash (const void *x)
   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))]
 

diff --git a/tests/test-base64.c b/tests/test-base64.c
index 2a2a4f5..251b042 100644 (file)
--- a/tests/test-base64.c
+++ b/tests/test-base64.c
@@ -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)

diff --git a/tests/test-binary-io.c b/tests/test-binary-io.c
index 335989f..5410b41 100644 (file)
--- a/tests/test-binary-io.c
+++ b/tests/test-binary-io.c
@@ -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 ()

diff --git a/tests/test-bitrotate.c b/tests/test-bitrotate.c
index db26ef8..0838a38 100644 (file)
--- a/tests/test-bitrotate.c
+++ b/tests/test-bitrotate.c
@@ -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)

diff --git a/tests/test-btowc.c b/tests/test-btowc.c
index 4a19553..eb959ae 100644 (file)
--- a/tests/test-btowc.c
+++ b/tests/test-btowc.c
@@ -25,19 +25,8 @@ SIGNATURE_CHECK (btowc, wint_t, (int));
 
 #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[])

diff --git a/tests/test-byteswap.c b/tests/test-byteswap.c
index 55de36b..6f93b6d 100644 (file)
--- a/tests/test-byteswap.c
+++ b/tests/test-byteswap.c
@@ -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 ()

diff --git a/tests/test-c-ctype.c b/tests/test-c-ctype.c
index e04de2e..9580966 100644 (file)
--- a/tests/test-c-ctype.c
+++ b/tests/test-c-ctype.c
@@ -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)

diff --git a/tests/test-c-stack.c b/tests/test-c-stack.c
index b5ff6be..56b2c16 100644 (file)
--- a/tests/test-c-stack.c
+++ b/tests/test-c-stack.c
@@ -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;
 

diff --git a/tests/test-c-strcasecmp.c b/tests/test-c-strcasecmp.c
index e0c2368..cfa5e12 100644 (file)
--- a/tests/test-c-strcasecmp.c
+++ b/tests/test-c-strcasecmp.c
@@ -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[])

diff --git a/tests/test-c-strcasestr.c b/tests/test-c-strcasestr.c
index 0c8a40d..905d546 100644 (file)
--- a/tests/test-c-strcasestr.c
+++ b/tests/test-c-strcasestr.c
@@ -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 ()

diff --git a/tests/test-c-strncasecmp.c b/tests/test-c-strncasecmp.c
index fb5f220..b993cf9 100644 (file)
--- a/tests/test-c-strncasecmp.c
+++ b/tests/test-c-strncasecmp.c
@@ -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[])

diff --git a/tests/test-c-strstr.c b/tests/test-c-strstr.c
index 2b2ebf9..b5dbb55 100644 (file)
--- a/tests/test-c-strstr.c
+++ b/tests/test-c-strstr.c
@@ -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 ()

diff --git a/tests/test-canonicalize-lgpl.c b/tests/test-canonicalize-lgpl.c
index 4f4fca1..e35d921 100644 (file)
--- a/tests/test-canonicalize-lgpl.c
+++ b/tests/test-canonicalize-lgpl.c
@@ -32,18 +32,7 @@ SIGNATURE_CHECK (canonicalize_file_name, char *, (const char *));
 #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"
 

diff --git a/tests/test-canonicalize.c b/tests/test-canonicalize.c
index 70b6341..5830267 100644 (file)
--- a/tests/test-canonicalize.c
+++ b/tests/test-canonicalize.c
@@ -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"
 

diff --git a/tests/test-carray_list.c b/tests/test-carray_list.c
index def7c55..e75bc18 100644 (file)
--- a/tests/test-carray_list.c
+++ b/tests/test-carray_list.c
@@ -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))]
 

diff --git a/tests/test-ceilf1.c b/tests/test-ceilf1.c
index e180e95..e37c14e 100644 (file)
--- a/tests/test-ceilf1.c
+++ b/tests/test-ceilf1.c
@@ -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.  */

diff --git a/tests/test-ceilf2.c b/tests/test-ceilf2.c
index ec0f608..a7c4b5e 100644 (file)
--- a/tests/test-ceilf2.c
+++ b/tests/test-ceilf2.c
@@ -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.  */

diff --git a/tests/test-ceill.c b/tests/test-ceill.c
index 2ed0053..a7dfe20 100644 (file)
--- a/tests/test-ceill.c
+++ b/tests/test-ceill.c
@@ -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.

diff --git a/tests/test-chown.c b/tests/test-chown.c
index e766070..3974903 100644 (file)
--- a/tests/test-chown.c
+++ b/tests/test-chown.c
@@ -32,18 +32,7 @@ SIGNATURE_CHECK (chown, int, (char const *, uid_t, gid_t));
 
 #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"
 

diff --git a/tests/test-cloexec.c b/tests/test-cloexec.c
index 1f43014..56e26d1 100644 (file)
--- a/tests/test-cloexec.c
+++ b/tests/test-cloexec.c
@@ -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

diff --git a/tests/test-copy-acl.c b/tests/test-copy-acl.c
index 198d59d..5da63bc 100644 (file)
--- a/tests/test-copy-acl.c
+++ b/tests/test-copy-acl.c
@@ -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[])

diff --git a/tests/test-copy-file.c b/tests/test-copy-file.c
index a2bb421..e845e11 100644 (file)
--- a/tests/test-copy-file.c
+++ b/tests/test-copy-file.c
@@ -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[])

diff --git a/tests/test-count-one-bits.c b/tests/test-count-one-bits.c
index 5757bbd..aec49e1 100644 (file)
--- a/tests/test-count-one-bits.c
+++ b/tests/test-count-one-bits.c
@@ -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)

diff --git a/tests/test-dprintf-posix.c b/tests/test-dprintf-posix.c
index 9cedc1c..341ece2 100644 (file)
--- a/tests/test-dprintf-posix.c
+++ b/tests/test-dprintf-posix.c
@@ -25,20 +25,9 @@ SIGNATURE_CHECK (dprintf, int, (int, const char *, ...));
 
 #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 *, ...))

diff --git a/tests/test-dup2.c b/tests/test-dup2.c
index a4aca82..d3751f5 100644 (file)
--- a/tests/test-dup2.c
+++ b/tests/test-dup2.c
@@ -25,8 +25,6 @@ SIGNATURE_CHECK (dup2, int, (int, int));
 
 #include <errno.h>
 #include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "binary-io.h"
 #include "cloexec.h"
@@ -37,17 +35,7 @@ SIGNATURE_CHECK (dup2, int, (int, int));
 # 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

diff --git a/tests/test-dup3.c b/tests/test-dup3.c
index 9133b7b..184d780 100644 (file)
--- a/tests/test-dup3.c
+++ b/tests/test-dup3.c
@@ -27,8 +27,6 @@ SIGNATURE_CHECK (dup3, int, (int, int, int));
 #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 @@ SIGNATURE_CHECK (dup3, int, (int, int, int));
 #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

diff --git a/tests/test-duplocale.c b/tests/test-duplocale.c
index a368c07..e0930d6 100644 (file)
--- a/tests/test-duplocale.c
+++ b/tests/test-duplocale.c
@@ -28,20 +28,9 @@ SIGNATURE_CHECK (duplocale, locale_t, (locale_t));
 #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
 {

diff --git a/tests/test-fbufmode.c b/tests/test-fbufmode.c
index 3f83864..5675e44 100644 (file)
--- a/tests/test-fbufmode.c
+++ b/tests/test-fbufmode.c
@@ -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"
 

diff --git a/tests/test-fchdir.c b/tests/test-fchdir.c
index 7ec675e..f5cce49 100644 (file)
--- a/tests/test-fchdir.c
+++ b/tests/test-fchdir.c
@@ -25,23 +25,11 @@ SIGNATURE_CHECK (fchdir, int, (int));
 
 #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)

diff --git a/tests/test-fchownat.c b/tests/test-fchownat.c
index c084ddf..a6d177d 100644 (file)
--- a/tests/test-fchownat.c
+++ b/tests/test-fchownat.c
@@ -33,18 +33,7 @@ SIGNATURE_CHECK (fchownat, int, (int, char const *, uid_t, gid_t, int));
 #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"
 

diff --git a/tests/test-fcntl-safer.c b/tests/test-fcntl-safer.c
index 15f6e2c..c3e77fa 100644 (file)
--- a/tests/test-fcntl-safer.c
+++ b/tests/test-fcntl-safer.c
@@ -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"
 

diff --git a/tests/test-fcntl.c b/tests/test-fcntl.c
index 77ac870..b14e00a 100644 (file)
--- a/tests/test-fcntl.c
+++ b/tests/test-fcntl.c
@@ -28,8 +28,6 @@ SIGNATURE_CHECK (fcntl, int, (int, int, ...));
 #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 @@ SIGNATURE_CHECK (fcntl, int, (int, int, ...));
 #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 @@ SIGNATURE_CHECK (fcntl, int, (int, int, ...));
 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)

diff --git a/tests/test-fdopendir.c b/tests/test-fdopendir.c
index f6006d0..943b8d1 100644 (file)
--- a/tests/test-fdopendir.c
+++ b/tests/test-fdopendir.c
@@ -25,21 +25,9 @@ SIGNATURE_CHECK (fdopendir, DIR *, (int));
 
 #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)

diff --git a/tests/test-fdutimensat.c b/tests/test-fdutimensat.c
index 00729d8..ad0eca9 100644 (file)
--- a/tests/test-fdutimensat.c
+++ b/tests/test-fdutimensat.c
@@ -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"
 

diff --git a/tests/test-fflush2.c b/tests/test-fflush2.c
index da0a760..e2e82b0 100644 (file)
--- a/tests/test-fflush2.c
+++ b/tests/test-fflush2.c
@@ -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)

diff --git a/tests/test-file-has-acl.c b/tests/test-file-has-acl.c
index 3e069ee..4727ed1 100644 (file)
--- a/tests/test-file-has-acl.c
+++ b/tests/test-file-has-acl.c
@@ -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[])

diff --git a/tests/test-filevercmp.c b/tests/test-filevercmp.c
index 4c29d0c..624794b 100644 (file)
--- a/tests/test-filevercmp.c
+++ b/tests/test-filevercmp.c
@@ -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[] =

diff --git a/tests/test-flock.c b/tests/test-flock.c
index a8a615e..beae8c8 100644 (file)
--- a/tests/test-flock.c
+++ b/tests/test-flock.c
@@ -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)

diff --git a/tests/test-floorf1.c b/tests/test-floorf1.c
index e156732..025ea9b 100644 (file)
--- a/tests/test-floorf1.c
+++ b/tests/test-floorf1.c
@@ -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.  */

diff --git a/tests/test-floorf2.c b/tests/test-floorf2.c
index d668487..d6a22ee 100644 (file)
--- a/tests/test-floorf2.c
+++ b/tests/test-floorf2.c
@@ -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.  */

diff --git a/tests/test-floorl.c b/tests/test-floorl.c
index a8080e5..cbef77a 100644 (file)
--- a/tests/test-floorl.c
+++ b/tests/test-floorl.c
@@ -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.

diff --git a/tests/test-fnmatch.c b/tests/test-fnmatch.c
index f9485af..6cd2d8a 100644 (file)
--- a/tests/test-fnmatch.c
+++ b/tests/test-fnmatch.c
@@ -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 ()

diff --git a/tests/test-fopen.h b/tests/test-fopen.h
index 6ba923b..106f491 100644 (file)
--- a/tests/test-fopen.h
+++ b/tests/test-fopen.h
@@ -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.  */
 

diff --git a/tests/test-fpending.c b/tests/test-fpending.c
index 44b6f66..09b7bfa 100644 (file)
--- a/tests/test-fpending.c
+++ b/tests/test-fpending.c
@@ -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)

diff --git a/tests/test-fprintf-posix.c b/tests/test-fprintf-posix.c
index 21c626e..46e5fd6 100644 (file)
--- a/tests/test-fprintf-posix.c
+++ b/tests/test-fprintf-posix.c
@@ -26,20 +26,9 @@ SIGNATURE_CHECK (fprintf, int, (FILE *, char const *, ...));
 #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"
 

diff --git a/tests/test-fpurge.c b/tests/test-fpurge.c
index 9bf2378..ad77fa9 100644 (file)
--- a/tests/test-fpurge.c
+++ b/tests/test-fpurge.c
@@ -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

diff --git a/tests/test-freadable.c b/tests/test-freadable.c
index becad34..0582ffd 100644 (file)
--- a/tests/test-freadable.c
+++ b/tests/test-freadable.c
@@ -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

diff --git a/tests/test-freadahead.c b/tests/test-freadahead.c
index c216231..bea6eed 100644 (file)
--- a/tests/test-freadahead.c
+++ b/tests/test-freadahead.c
@@ -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)

diff --git a/tests/test-freading.c b/tests/test-freading.c
index eb5699d..1f9af7f 100644 (file)
--- a/tests/test-freading.c
+++ b/tests/test-freading.c
@@ -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

diff --git a/tests/test-freadptr.c b/tests/test-freadptr.c
index 65334b8..df1259c 100644 (file)
--- a/tests/test-freadptr.c
+++ b/tests/test-freadptr.c
@@ -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)

diff --git a/tests/test-freadptr2.c b/tests/test-freadptr2.c
index e6f5348..0a570ec 100644 (file)
--- a/tests/test-freadptr2.c
+++ b/tests/test-freadptr2.c
@@ -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)

diff --git a/tests/test-freadseek.c b/tests/test-freadseek.c
index 2bd9ab6..ca7aaa4 100644 (file)
--- a/tests/test-freadseek.c
+++ b/tests/test-freadseek.c
@@ -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)

diff --git a/tests/test-freopen.c b/tests/test-freopen.c
index bdb5de0..4848708 100644 (file)
--- a/tests/test-freopen.c
+++ b/tests/test-freopen.c
@@ -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 ()

diff --git a/tests/test-frexp.c b/tests/test-frexp.c
index 6b285c9..9b6f464 100644 (file)
--- a/tests/test-frexp.c
+++ b/tests/test-frexp.c
@@ -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;

diff --git a/tests/test-frexpl.c b/tests/test-frexpl.c
index 7b7ec53..f673194 100644 (file)
--- a/tests/test-frexpl.c
+++ b/tests/test-frexpl.c
@@ -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'

diff --git a/tests/test-fseek.c b/tests/test-fseek.c
index 4447a9b..00ded3e 100644 (file)
--- a/tests/test-fseek.c
+++ b/tests/test-fseek.c
@@ -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

diff --git a/tests/test-fseeko.c b/tests/test-fseeko.c
index 0d2f321..6a8a1c0 100644 (file)
--- a/tests/test-fseeko.c
+++ b/tests/test-fseeko.c
@@ -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

diff --git a/tests/test-fstatat.c b/tests/test-fstatat.c
index 552bf45..e6abe38 100644 (file)
--- a/tests/test-fstatat.c
+++ b/tests/test-fstatat.c
@@ -33,18 +33,7 @@ SIGNATURE_CHECK (fstatat, int, (int, char const *, struct stat *, int));
 #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"
 

diff --git a/tests/test-fstrcmp.c b/tests/test-fstrcmp.c
index a2d2505..e72fef0 100644 (file)
--- a/tests/test-fstrcmp.c
+++ b/tests/test-fstrcmp.c
@@ -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)

diff --git a/tests/test-fsync.c b/tests/test-fsync.c
index bf789a2..12a56b2 100644 (file)
--- a/tests/test-fsync.c
+++ b/tests/test-fsync.c
@@ -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)

diff --git a/tests/test-ftell.c b/tests/test-ftell.c
index d9723f5..0f35da4 100644 (file)
--- a/tests/test-ftell.c
+++ b/tests/test-ftell.c
@@ -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 @@ SIGNATURE_CHECK (ftell, long, (FILE *));
 # 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

diff --git a/tests/test-ftello.c b/tests/test-ftello.c
index 2af43f2..bde4e06 100644 (file)
--- a/tests/test-ftello.c
+++ b/tests/test-ftello.c
@@ -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 @@ SIGNATURE_CHECK (ftello, off_t, (FILE *));
 # 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

diff --git a/tests/test-func.c b/tests/test-func.c
index 7679ef0..88d5f2c 100644 (file)
--- a/tests/test-func.c
+++ b/tests/test-func.c
@@ -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 ()

diff --git a/tests/test-futimens.c b/tests/test-futimens.c
index 5753c6b..0ee1fe0 100644 (file)
--- a/tests/test-futimens.c
+++ b/tests/test-futimens.c
@@ -34,18 +34,7 @@ SIGNATURE_CHECK (futimens, int, (int, struct timespec const[2]));
 #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"
 

diff --git a/tests/test-fwritable.c b/tests/test-fwritable.c
index 34f2427..f4c4082 100644 (file)
--- a/tests/test-fwritable.c
+++ b/tests/test-fwritable.c
@@ -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

diff --git a/tests/test-fwriting.c b/tests/test-fwriting.c
index ee23eec..61c4f80 100644 (file)
--- a/tests/test-fwriting.c
+++ b/tests/test-fwriting.c
@@ -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

diff --git a/tests/test-getcwd.c b/tests/test-getcwd.c
index 7570180..1f6306d 100644 (file)
--- a/tests/test-getcwd.c
+++ b/tests/test-getcwd.c
@@ -25,17 +25,7 @@ SIGNATURE_CHECK (getcwd, char *, (char *, size_t));
 #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)

diff --git a/tests/test-getdate.c b/tests/test-getdate.c
index b30ef82..09b1b54 100644 (file)
--- a/tests/test-getdate.c
+++ b/tests/test-getdate.c
@@ -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)                                              \

diff --git a/tests/test-getdelim.c b/tests/test-getdelim.c
index dc40bdd..dbb44a6 100644 (file)
--- a/tests/test-getdelim.c
+++ b/tests/test-getdelim.c
@@ -27,17 +27,7 @@ SIGNATURE_CHECK (getdelim, ssize_t, (char **, size_t *, int, FILE *));
 #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)

diff --git a/tests/test-getdtablesize.c b/tests/test-getdtablesize.c
index e587aa1..a86ba4b 100644 (file)
--- a/tests/test-getdtablesize.c
+++ b/tests/test-getdtablesize.c
@@ -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[])

diff --git a/tests/test-getgroups.c b/tests/test-getgroups.c
index 1d3ca98..14f49f7 100644 (file)
--- a/tests/test-getgroups.c
+++ b/tests/test-getgroups.c
@@ -28,17 +28,7 @@ SIGNATURE_CHECK (getgroups, int, (int, gid_t[]));
 #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)

diff --git a/tests/test-getline.c b/tests/test-getline.c
index 7564ece..bab99b3 100644 (file)
--- a/tests/test-getline.c
+++ b/tests/test-getline.c
@@ -27,17 +27,7 @@ SIGNATURE_CHECK (getline, ssize_t, (char **, size_t *, FILE *));
 #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)

diff --git a/tests/test-getndelim2.c b/tests/test-getndelim2.c
index ff641bd..e276adb 100644 (file)
--- a/tests/test-getndelim2.c
+++ b/tests/test-getndelim2.c
@@ -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)

diff --git a/tests/test-glob.c b/tests/test-glob.c
index d7a17dc..f8d132e 100644 (file)
--- a/tests/test-glob.c
+++ b/tests/test-glob.c
@@ -25,22 +25,9 @@ SIGNATURE_CHECK (glob, int, (char const *, int, int (*) (char const *, int),
                              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"
 

diff --git a/tests/test-hash.c b/tests/test-hash.c
index 2e7c550..0ee24ec 100644 (file)
--- a/tests/test-hash.c
+++ b/tests/test-hash.c
@@ -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)
 {

diff --git a/tests/test-i-ring.c b/tests/test-i-ring.c
index d53123e..56c480c 100644 (file)
--- a/tests/test-i-ring.c
+++ b/tests/test-i-ring.c
@@ -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)

diff --git a/tests/test-iconv-utf.c b/tests/test-iconv-utf.c
index 1164774..7f57d91 100644 (file)
--- a/tests/test-iconv-utf.c
+++ b/tests/test-iconv-utf.c
@@ -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 ()

diff --git a/tests/test-iconv.c b/tests/test-iconv.c
index 566ddee..66db918 100644 (file)
--- a/tests/test-iconv.c
+++ b/tests/test-iconv.c
@@ -34,21 +34,9 @@ SIGNATURE_CHECK (iconv_open, iconv_t, (char const *, char const *));
 #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 ()

diff --git a/tests/test-idpriv-drop.c b/tests/test-idpriv-drop.c
index 5dbc8e2..7157ef3 100644 (file)
--- a/tests/test-idpriv-drop.c
+++ b/tests/test-idpriv-drop.c
@@ -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 ()

diff --git a/tests/test-idpriv-droptemp.c b/tests/test-idpriv-droptemp.c
index 3dc36c9..53c9ac0 100644 (file)
--- a/tests/test-idpriv-droptemp.c
+++ b/tests/test-idpriv-droptemp.c
@@ -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 ()

diff --git a/tests/test-inet_ntop.c b/tests/test-inet_ntop.c
index 8495620..d424b72 100644 (file)
--- a/tests/test-inet_ntop.c
+++ b/tests/test-inet_ntop.c
@@ -26,21 +26,9 @@ SIGNATURE_CHECK (inet_ntop, char const *, (int, void const *, char *,
 
 #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)

diff --git a/tests/test-inet_pton.c b/tests/test-inet_pton.c
index b1dbb05..deaf30a 100644 (file)
--- a/tests/test-inet_pton.c
+++ b/tests/test-inet_pton.c
@@ -25,20 +25,8 @@ SIGNATURE_CHECK (inet_pton, int, (int, const char *, void *));
 
 #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)

diff --git a/tests/test-isblank.c b/tests/test-isblank.c
index d29fc63..be370cb 100644 (file)
--- a/tests/test-isblank.c
+++ b/tests/test-isblank.c
@@ -25,19 +25,8 @@ SIGNATURE_CHECK (isblank, int, (int));
 
 #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[])

diff --git a/tests/test-isfinite.c b/tests/test-isfinite.c
index fc2f23c..de08e30 100644 (file)
--- a/tests/test-isfinite.c
+++ b/tests/test-isfinite.c
@@ -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;

diff --git a/tests/test-isinf.c b/tests/test-isinf.c
index d81ee7a..678b0fe 100644 (file)
--- a/tests/test-isinf.c
+++ b/tests/test-isinf.c
@@ -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;

diff --git a/tests/test-isnan.c b/tests/test-isnan.c
index 74bb9d9..a5787c2 100644 (file)
--- a/tests/test-isnan.c
+++ b/tests/test-isnan.c
@@ -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.  */

diff --git a/tests/test-isnand.h b/tests/test-isnand.h
index 215e18a..c5dc549 100644 (file)
--- a/tests/test-isnand.h
+++ b/tests/test-isnand.h
@@ -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.  */

diff --git a/tests/test-isnanf.h b/tests/test-isnanf.h
index 2444c6d..b0d99fd 100644 (file)
--- a/tests/test-isnanf.h
+++ b/tests/test-isnanf.h
@@ -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.  */

diff --git a/tests/test-isnanl.h b/tests/test-isnanl.h
index 8638f06..13a92ef 100644 (file)
--- a/tests/test-isnanl.h
+++ b/tests/test-isnanl.h
@@ -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.

diff --git a/tests/test-lchown.c b/tests/test-lchown.c
index b909102..24b7ece 100644 (file)
--- a/tests/test-lchown.c
+++ b/tests/test-lchown.c
@@ -32,18 +32,7 @@ SIGNATURE_CHECK (lchown, int, (char const *, uid_t, gid_t));
 
 #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"
 

diff --git a/tests/test-ldexpl.c b/tests/test-ldexpl.c
index 0fe4f86..510841c 100644 (file)
--- a/tests/test-ldexpl.c
+++ b/tests/test-ldexpl.c
@@ -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.

diff --git a/tests/test-link.c b/tests/test-link.c
index d2ff679..817c464 100644 (file)
--- a/tests/test-link.c
+++ b/tests/test-link.c
@@ -30,17 +30,7 @@ SIGNATURE_CHECK (link, int, (char const *, char const *));
 #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"
 

diff --git a/tests/test-linkat.c b/tests/test-linkat.c
index c827a27..98165c0 100644 (file)
--- a/tests/test-linkat.c
+++ b/tests/test-linkat.c
@@ -34,18 +34,7 @@ SIGNATURE_CHECK (linkat, int, (int, char const *, int, char const *, int));
 #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"
 

diff --git a/tests/test-linked_list.c b/tests/test-linked_list.c
index 5511c89..45b3ae8 100644 (file)
--- a/tests/test-linked_list.c
+++ b/tests/test-linked_list.c
@@ -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))]
 

diff --git a/tests/test-linkedhash_list.c b/tests/test-linkedhash_list.c
index 98913c5..1abd65b 100644 (file)
--- a/tests/test-linkedhash_list.c
+++ b/tests/test-linkedhash_list.c
@@ -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 @@ string_hash (const void *x)
   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))]
 

diff --git a/tests/test-localename.c b/tests/test-localename.c
index c7e0673..553cafc 100644 (file)
--- a/tests/test-localename.c
+++ b/tests/test-localename.c
@@ -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[] =
   {

diff --git a/tests/test-lseek.c b/tests/test-lseek.c
index a57443d..fa0505d 100644 (file)
--- a/tests/test-lseek.c
+++ b/tests/test-lseek.c
@@ -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

diff --git a/tests/test-lstat.c b/tests/test-lstat.c
index 74a4fd2..1940a21 100644 (file)
--- a/tests/test-lstat.c
+++ b/tests/test-lstat.c
@@ -35,18 +35,7 @@ SIGNATURE_CHECK (lstat, int, (char const *, struct stat *));
 #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"
 

diff --git a/tests/test-mbmemcasecmp.c b/tests/test-mbmemcasecmp.c
index 3fb7e0a..0adf80c 100644 (file)
--- a/tests/test-mbmemcasecmp.c
+++ b/tests/test-mbmemcasecmp.c
@@ -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"
 

diff --git a/tests/test-mbmemcasecoll.c b/tests/test-mbmemcasecoll.c
index b127296..fd30df7 100644 (file)
--- a/tests/test-mbmemcasecoll.c
+++ b/tests/test-mbmemcasecoll.c
@@ -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"
 

diff --git a/tests/test-mbrtowc.c b/tests/test-mbrtowc.c
index 9164273..d84bafe 100644 (file)
--- a/tests/test-mbrtowc.c
+++ b/tests/test-mbrtowc.c
@@ -26,20 +26,9 @@ SIGNATURE_CHECK (mbrtowc, size_t, (wchar_t *, char const *, size_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[])

diff --git a/tests/test-mbscasecmp.c b/tests/test-mbscasecmp.c
index 6e4757c..17b278e 100644 (file)
--- a/tests/test-mbscasecmp.c
+++ b/tests/test-mbscasecmp.c
@@ -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 ()

diff --git a/tests/test-mbscasestr1.c b/tests/test-mbscasestr1.c
index b174f15..94b6ade 100644 (file)
--- a/tests/test-mbscasestr1.c
+++ b/tests/test-mbscasestr1.c
@@ -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 ()

diff --git a/tests/test-mbscasestr2.c b/tests/test-mbscasestr2.c
index c9b4f98..42f2bfc 100644 (file)
--- a/tests/test-mbscasestr2.c
+++ b/tests/test-mbscasestr2.c
@@ -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 ()

diff --git a/tests/test-mbscasestr3.c b/tests/test-mbscasestr3.c
index a636eba..a1b5d5b 100644 (file)
--- a/tests/test-mbscasestr3.c
+++ b/tests/test-mbscasestr3.c
@@ -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 ()

diff --git a/tests/test-mbscasestr4.c b/tests/test-mbscasestr4.c
index 9763f15..f633763 100644 (file)
--- a/tests/test-mbscasestr4.c
+++ b/tests/test-mbscasestr4.c
@@ -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 ()

diff --git a/tests/test-mbschr.c b/tests/test-mbschr.c
index 2028dec..f087150 100644 (file)
--- a/tests/test-mbschr.c
+++ b/tests/test-mbschr.c
@@ -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 ()

diff --git a/tests/test-mbscspn.c b/tests/test-mbscspn.c
index f2dae51..d65db4e 100644 (file)
--- a/tests/test-mbscspn.c
+++ b/tests/test-mbscspn.c
@@ -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 ()

diff --git a/tests/test-mbsinit.c b/tests/test-mbsinit.c
index 2732693..e72086d 100644 (file)
--- a/tests/test-mbsinit.c
+++ b/tests/test-mbsinit.c
@@ -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[])

diff --git a/tests/test-mbsncasecmp.c b/tests/test-mbsncasecmp.c
index 2db03ba..3f0d689 100644 (file)
--- a/tests/test-mbsncasecmp.c
+++ b/tests/test-mbsncasecmp.c
@@ -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 ()

diff --git a/tests/test-mbsnrtowcs.c b/tests/test-mbsnrtowcs.c
index 471c17b..315b3fa 100644 (file)
--- a/tests/test-mbsnrtowcs.c
+++ b/tests/test-mbsnrtowcs.c
@@ -26,20 +26,9 @@ SIGNATURE_CHECK (mbsnrtowcs, size_t, (wchar_t *, char const **, size_t, size_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[])

diff --git a/tests/test-mbspbrk.c b/tests/test-mbspbrk.c
index c5b386f..5214567 100644 (file)
--- a/tests/test-mbspbrk.c
+++ b/tests/test-mbspbrk.c
@@ -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 ()

diff --git a/tests/test-mbspcasecmp.c b/tests/test-mbspcasecmp.c
index 912eb85..c337c23 100644 (file)
--- a/tests/test-mbspcasecmp.c
+++ b/tests/test-mbspcasecmp.c
@@ -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 ()

diff --git a/tests/test-mbsrchr.c b/tests/test-mbsrchr.c
index 160148a..0c435ae 100644 (file)
--- a/tests/test-mbsrchr.c
+++ b/tests/test-mbsrchr.c
@@ -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 ()

diff --git a/tests/test-mbsrtowcs.c b/tests/test-mbsrtowcs.c
index 4a01d4a..4447f2c 100644 (file)
--- a/tests/test-mbsrtowcs.c
+++ b/tests/test-mbsrtowcs.c
@@ -26,20 +26,9 @@ SIGNATURE_CHECK (mbsrtowcs, size_t, (wchar_t *, char const **, size_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[])

diff --git a/tests/test-mbsspn.c b/tests/test-mbsspn.c
index f8798db..5e27dfc 100644 (file)
--- a/tests/test-mbsspn.c
+++ b/tests/test-mbsspn.c
@@ -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 ()

diff --git a/tests/test-mbsstr1.c b/tests/test-mbsstr1.c
index 23e1dbe..97ef60d 100644 (file)
--- a/tests/test-mbsstr1.c
+++ b/tests/test-mbsstr1.c
@@ -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 ()

diff --git a/tests/test-mbsstr2.c b/tests/test-mbsstr2.c
index 667390f..2e4c538 100644 (file)
--- a/tests/test-mbsstr2.c
+++ b/tests/test-mbsstr2.c
@@ -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 ()

diff --git a/tests/test-mbsstr3.c b/tests/test-mbsstr3.c
index a948a03..6d0b5d6 100644 (file)
--- a/tests/test-mbsstr3.c
+++ b/tests/test-mbsstr3.c
@@ -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 ()

diff --git a/tests/test-memchr.c b/tests/test-memchr.c
index 2ec37b6..5d31e76 100644 (file)
--- a/tests/test-memchr.c
+++ b/tests/test-memchr.c
@@ -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.  */

diff --git a/tests/test-memchr2.c b/tests/test-memchr2.c
index ef0a713..a992fb5 100644 (file)
--- a/tests/test-memchr2.c
+++ b/tests/test-memchr2.c
@@ -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.  */

diff --git a/tests/test-memcmp.c b/tests/test-memcmp.c
index 463ca0c..48cf40d 100644 (file)
--- a/tests/test-memcmp.c
+++ b/tests/test-memcmp.c
@@ -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)

diff --git a/tests/test-memmem.c b/tests/test-memmem.c
index 3c71a2e..babf681 100644 (file)
--- a/tests/test-memmem.c
+++ b/tests/test-memmem.c
@@ -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)

diff --git a/tests/test-memrchr.c b/tests/test-memrchr.c
index d9128e7..e768daf 100644 (file)
--- a/tests/test-memrchr.c
+++ b/tests/test-memrchr.c
@@ -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.  */

diff --git a/tests/test-mkdir.c b/tests/test-mkdir.c
index 1531e25..379e90c 100644 (file)
--- a/tests/test-mkdir.c
+++ b/tests/test-mkdir.c
@@ -30,17 +30,7 @@ SIGNATURE_CHECK (mkdir, int, (char const *, mode_t));
 #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"
 

diff --git a/tests/test-mkdirat.c b/tests/test-mkdirat.c
index c11b165..d3180e6 100644 (file)
--- a/tests/test-mkdirat.c
+++ b/tests/test-mkdirat.c
@@ -30,17 +30,7 @@ SIGNATURE_CHECK (mkdirat, int, (int, char const *, mode_t));
 #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"
 

diff --git a/tests/test-mkfifo.c b/tests/test-mkfifo.c
index df002ed..4b4c93b 100644 (file)
--- a/tests/test-mkfifo.c
+++ b/tests/test-mkfifo.c
@@ -30,17 +30,7 @@ SIGNATURE_CHECK (mkfifo, int, (char const *, mode_t));
 #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"
 

diff --git a/tests/test-mkfifoat.c b/tests/test-mkfifoat.c
index 1c6656e..ef3e817 100644 (file)
--- a/tests/test-mkfifoat.c
+++ b/tests/test-mkfifoat.c
@@ -32,17 +32,7 @@ SIGNATURE_CHECK (mknodat, int, (int, char const *, mode_t, dev_t));
 #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"
 

diff --git a/tests/test-mknod.c b/tests/test-mknod.c
index b00cd28..a62df6d 100644 (file)
--- a/tests/test-mknod.c
+++ b/tests/test-mknod.c
@@ -30,17 +30,7 @@ SIGNATURE_CHECK (mknod, int, (char const *, mode_t, dev_t));
 #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"
 

diff --git a/tests/test-nanosleep.c b/tests/test-nanosleep.c
index 797c8be..09aff7a 100644 (file)
--- a/tests/test-nanosleep.c
+++ b/tests/test-nanosleep.c
@@ -25,23 +25,10 @@ SIGNATURE_CHECK (nanosleep, int, (struct timespec const *, struct timespec *));
 
 #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

diff --git a/tests/test-nl_langinfo.c b/tests/test-nl_langinfo.c
index a2f5f68..4a79b50 100644 (file)
--- a/tests/test-nl_langinfo.c
+++ b/tests/test-nl_langinfo.c
@@ -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[])

diff --git a/tests/test-obstack-printf.c b/tests/test-obstack-printf.c
index ca07f47..fe2689c 100644 (file)
--- a/tests/test-obstack-printf.c
+++ b/tests/test-obstack-printf.c
@@ -33,18 +33,7 @@ SIGNATURE_CHECK (obstack_vprintf, int, (struct obstack *, char const *,
 #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

diff --git a/tests/test-open.c b/tests/test-open.c
index 4bdf314..a5fb461 100644 (file)
--- a/tests/test-open.c
+++ b/tests/test-open.c
@@ -26,20 +26,9 @@ SIGNATURE_CHECK (open, int, (char const *, int, ...));
 #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"
 

diff --git a/tests/test-openat.c b/tests/test-openat.c
index 5eb9deb..36bbdb5 100644 (file)
--- a/tests/test-openat.c
+++ b/tests/test-openat.c
@@ -27,20 +27,9 @@ SIGNATURE_CHECK (openat, int, (int, char const *, int, ...));
 #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"
 

diff --git a/tests/test-pipe-filter-gi1.c b/tests/test-pipe-filter-gi1.c
index 2284198..1d5aff0 100644 (file)
--- a/tests/test-pipe-filter-gi1.c
+++ b/tests/test-pipe-filter-gi1.c
@@ -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

diff --git a/tests/test-pipe-filter-gi2-main.c b/tests/test-pipe-filter-gi2-main.c
index 5cf8984..5732445 100644 (file)
--- a/tests/test-pipe-filter-gi2-main.c
+++ b/tests/test-pipe-filter-gi2-main.c
@@ -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

diff --git a/tests/test-pipe-filter-ii1.c b/tests/test-pipe-filter-ii1.c
index 310a7bb..eb19686 100644 (file)
--- a/tests/test-pipe-filter-ii1.c
+++ b/tests/test-pipe-filter-ii1.c
@@ -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

diff --git a/tests/test-pipe-filter-ii2-main.c b/tests/test-pipe-filter-ii2-main.c
index 909634f..96d70db 100644 (file)
--- a/tests/test-pipe-filter-ii2-main.c
+++ b/tests/test-pipe-filter-ii2-main.c
@@ -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
 {

diff --git a/tests/test-pipe2.c b/tests/test-pipe2.c
index 5eb5ec3..e1fbe29 100644 (file)
--- a/tests/test-pipe2.c
+++ b/tests/test-pipe2.c
@@ -32,18 +32,7 @@ SIGNATURE_CHECK (pipe2, int, (int[2], int));
 #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

diff --git a/tests/test-popen.h b/tests/test-popen.h
index b0d2e6f..d701182 100644 (file)
--- a/tests/test-popen.h
+++ b/tests/test-popen.h
@@ -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)

diff --git a/tests/test-posixtm.c b/tests/test-posixtm.c
index e1a87a0..9c94262 100644 (file)
--- a/tests/test-posixtm.c
+++ b/tests/test-posixtm.c
@@ -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
 {

diff --git a/tests/test-pread.c b/tests/test-pread.c
index d5a86ad..b8b133b 100644 (file)
--- a/tests/test-pread.c
+++ b/tests/test-pread.c
@@ -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)
 

diff --git a/tests/test-printf-frexp.c b/tests/test-printf-frexp.c
index a194132..38cfd2f 100644 (file)
--- a/tests/test-printf-frexp.c
+++ b/tests/test-printf-frexp.c
@@ -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)

diff --git a/tests/test-printf-frexpl.c b/tests/test-printf-frexpl.c
index 50f8aaf..7ec6909 100644 (file)
--- a/tests/test-printf-frexpl.c
+++ b/tests/test-printf-frexpl.c
@@ -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,

diff --git a/tests/test-printf-posix.c b/tests/test-printf-posix.c
index c09b188..cfa502f 100644 (file)
--- a/tests/test-printf-posix.c
+++ b/tests/test-printf-posix.c
@@ -25,20 +25,9 @@ SIGNATURE_CHECK (printf, int, (char const *, ...));
 
 #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"
 

diff --git a/tests/test-priv-set.c b/tests/test-priv-set.c
index 8b50a7e..9a650ad 100644 (file)
--- a/tests/test-priv-set.c
+++ b/tests/test-priv-set.c
@@ -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)

diff --git a/tests/test-quotearg.c b/tests/test-quotearg.c
index cb5a73b..1026993 100644 (file)
--- a/tests/test-quotearg.c
+++ b/tests/test-quotearg.c
@@ -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 "".  */

diff --git a/tests/test-random_r.c b/tests/test-random_r.c
index 391d98c..4c1e242 100644 (file)
--- a/tests/test-random_r.c
+++ b/tests/test-random_r.c
@@ -25,20 +25,9 @@ SIGNATURE_CHECK (initstate_r, int, (unsigned int, char *, size_t,
 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 ()

diff --git a/tests/test-rawmemchr.c b/tests/test-rawmemchr.c
index f1eef2c..180c2b0 100644 (file)
--- a/tests/test-rawmemchr.c
+++ b/tests/test-rawmemchr.c
@@ -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.  */

diff --git a/tests/test-rbtree_list.c b/tests/test-rbtree_list.c
index 1f91492..ecb647d 100644 (file)
--- a/tests/test-rbtree_list.c
+++ b/tests/test-rbtree_list.c
@@ -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 @@ 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))]
 

diff --git a/tests/test-rbtree_oset.c b/tests/test-rbtree_oset.c
index 79bcc89..72f3509 100644 (file)
--- a/tests/test-rbtree_oset.c
+++ b/tests/test-rbtree_oset.c
@@ -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 @@ static const char *objects[30] =
     "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))]
 

diff --git a/tests/test-rbtreehash_list.c b/tests/test-rbtreehash_list.c
index 7ec8f1e..ec67550 100644 (file)
--- a/tests/test-rbtreehash_list.c
+++ b/tests/test-rbtreehash_list.c
@@ -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 @@ string_hash (const void *x)
   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))]
 

diff --git a/tests/test-readlink.c b/tests/test-readlink.c
index 61f8f6b..4ec0fcd 100644 (file)
--- a/tests/test-readlink.c
+++ b/tests/test-readlink.c
@@ -31,17 +31,7 @@ SIGNATURE_CHECK (readlink, ssize_t, (char const *, char *, size_t));
 #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"
 

diff --git a/tests/test-remove.c b/tests/test-remove.c
index 1a92f6c..4bcc2ec 100644 (file)
--- a/tests/test-remove.c
+++ b/tests/test-remove.c
@@ -30,17 +30,7 @@ SIGNATURE_CHECK (remove, int, (char const *));
 #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"
 

diff --git a/tests/test-rename.c b/tests/test-rename.c
index 1cd2e8f..797cc94 100644 (file)
--- a/tests/test-rename.c
+++ b/tests/test-rename.c
@@ -29,17 +29,7 @@ SIGNATURE_CHECK (rename, int, (char const *, char const *));
 #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"
 

diff --git a/tests/test-renameat.c b/tests/test-renameat.c
index 3293d52..de84fa6 100644 (file)
--- a/tests/test-renameat.c
+++ b/tests/test-renameat.c
@@ -32,18 +32,7 @@ SIGNATURE_CHECK (renameat, int, (int, char const *, int, char const *));
 
 #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"
 

diff --git a/tests/test-rmdir.c b/tests/test-rmdir.c
index 44f5d72..9ca88e2 100644 (file)
--- a/tests/test-rmdir.c
+++ b/tests/test-rmdir.c
@@ -30,17 +30,7 @@ SIGNATURE_CHECK (rmdir, int, (char const *));
 #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"
 

diff --git a/tests/test-round1.c b/tests/test-round1.c
index 6f2795e..c20059b 100644 (file)
--- a/tests/test-round1.c
+++ b/tests/test-round1.c
@@ -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.  */

diff --git a/tests/test-roundf1.c b/tests/test-roundf1.c
index 98edc4a..ce603bb 100644 (file)
--- a/tests/test-roundf1.c
+++ b/tests/test-roundf1.c
@@ -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.  */

diff --git a/tests/test-roundl.c b/tests/test-roundl.c
index 048aa8b..7b3e200 100644 (file)
--- a/tests/test-roundl.c
+++ b/tests/test-roundl.c
@@ -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.

diff --git a/tests/test-safe-alloc.c b/tests/test-safe-alloc.c
index fc68ae7..96a1285 100644 (file)
--- a/tests/test-safe-alloc.c
+++ b/tests/test-safe-alloc.c
@@ -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 ()

diff --git a/tests/test-sameacls.c b/tests/test-sameacls.c
index 939b9c1..27df564 100644 (file)
--- a/tests/test-sameacls.c
+++ b/tests/test-sameacls.c
@@ -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[])

diff --git a/tests/test-set-mode-acl.c b/tests/test-set-mode-acl.c
index 1cc1503..78e837a 100644 (file)
--- a/tests/test-set-mode-acl.c
+++ b/tests/test-set-mode-acl.c
@@ -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[])

diff --git a/tests/test-setenv.c b/tests/test-setenv.c
index b23d296..e565851 100644 (file)
--- a/tests/test-setenv.c
+++ b/tests/test-setenv.c
@@ -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)

diff --git a/tests/test-sigaction.c b/tests/test-sigaction.c
index 63dfd7a..d219f02 100644 (file)
--- a/tests/test-sigaction.c
+++ b/tests/test-sigaction.c
@@ -24,21 +24,9 @@
 SIGNATURE_CHECK (sigaction, int, (int, struct sigaction const *,
                                   struct sigaction *));
 
-#include <stdio.h>
-#include <stdlib.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 <stddef.h>
+
+#include "macros.h"
 
 #ifndef SA_NOCLDSTOP
 # define SA_NOCLDSTOP 0

diff --git a/tests/test-signbit.c b/tests/test-signbit.c
index 4acb045..9add258 100644 (file)
--- a/tests/test-signbit.c
+++ b/tests/test-signbit.c
@@ -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;

diff --git a/tests/test-sleep.c b/tests/test-sleep.c
index 4abca33..3bb2de6 100644 (file)
--- a/tests/test-sleep.c
+++ b/tests/test-sleep.c
@@ -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

diff --git a/tests/test-snprintf-posix.c b/tests/test-snprintf-posix.c
index dbbef8c..01662a6 100644 (file)
--- a/tests/test-snprintf-posix.c
+++ b/tests/test-snprintf-posix.c
@@ -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"
 

diff --git a/tests/test-snprintf.c b/tests/test-snprintf.c
index 6f1e34c..3780786 100644 (file)
--- a/tests/test-snprintf.c
+++ b/tests/test-snprintf.c
@@ -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[])

diff --git a/tests/test-sprintf-posix.c b/tests/test-sprintf-posix.c
index 47bbaa0..854d154 100644 (file)
--- a/tests/test-sprintf-posix.c
+++ b/tests/test-sprintf-posix.c
@@ -29,18 +29,7 @@ SIGNATURE_CHECK (sprintf, int, (char *, char const *, ...));
 #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"
 

diff --git a/tests/test-stat-time.c b/tests/test-stat-time.c
index 85ada87..6e329c8 100644 (file)
--- a/tests/test-stat-time.c
+++ b/tests/test-stat-time.c
@@ -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 };
 

diff --git a/tests/test-stat.c b/tests/test-stat.c
index 9e52a4a..c9fd327 100644 (file)
--- a/tests/test-stat.c
+++ b/tests/test-stat.c
@@ -31,23 +31,11 @@ SIGNATURE_CHECK (stat, int, (char const *, struct stat *));
 #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"
 

diff --git a/tests/test-strcasestr.c b/tests/test-strcasestr.c
index 7c2832a..ac68507 100644 (file)
--- a/tests/test-strcasestr.c
+++ b/tests/test-strcasestr.c
@@ -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 ()

diff --git a/tests/test-strchrnul.c b/tests/test-strchrnul.c
index f2f341f..329394f 100644 (file)
--- a/tests/test-strchrnul.c
+++ b/tests/test-strchrnul.c
@@ -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)

diff --git a/tests/test-strerror.c b/tests/test-strerror.c
index 986f75a..99c3c5f 100644 (file)
--- a/tests/test-strerror.c
+++ b/tests/test-strerror.c
@@ -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)

diff --git a/tests/test-striconv.c b/tests/test-striconv.c
index 0dc0449..884737b 100644 (file)
--- a/tests/test-striconv.c
+++ b/tests/test-striconv.c
@@ -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 ()

diff --git a/tests/test-striconveh.c b/tests/test-striconveh.c
index bd2579e..6ab0218 100644 (file)
--- a/tests/test-striconveh.c
+++ b/tests/test-striconveh.c
@@ -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

diff --git a/tests/test-striconveha.c b/tests/test-striconveha.c
index 96660b2..b2fd823 100644 (file)
--- a/tests/test-striconveha.c
+++ b/tests/test-striconveha.c
@@ -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

diff --git a/tests/test-strsignal.c b/tests/test-strsignal.c
index bf97dc6..e3690d8 100644 (file)
--- a/tests/test-strsignal.c
+++ b/tests/test-strsignal.c
@@ -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)

diff --git a/tests/test-strstr.c b/tests/test-strstr.c
index 6bffc13..b20d644 100644 (file)
--- a/tests/test-strstr.c
+++ b/tests/test-strstr.c
@@ -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[])

diff --git a/tests/test-strtod.c b/tests/test-strtod.c
index affd52c..e0f2eeb 100644 (file)
--- a/tests/test-strtod.c
+++ b/tests/test-strtod.c
@@ -25,22 +25,10 @@ SIGNATURE_CHECK (strtod, double, (char const *, char **));
 #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))

diff --git a/tests/test-strverscmp.c b/tests/test-strverscmp.c
index 72b574d..8e9cc03 100644 (file)
--- a/tests/test-strverscmp.c
+++ b/tests/test-strverscmp.c
@@ -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)

diff --git a/tests/test-symlink.c b/tests/test-symlink.c
index c84e006..c84b2bc 100644 (file)
--- a/tests/test-symlink.c
+++ b/tests/test-symlink.c
@@ -30,17 +30,7 @@ SIGNATURE_CHECK (symlink, int, (char const *, char const *));
 #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"
 

diff --git a/tests/test-symlinkat.c b/tests/test-symlinkat.c
index 67f0adf..714dd98 100644 (file)
--- a/tests/test-symlinkat.c
+++ b/tests/test-symlinkat.c
@@ -32,22 +32,12 @@ SIGNATURE_CHECK (readlinkat, ssize_t, (int, char const *, char *, size_t));
 #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"

diff --git a/tests/test-trunc1.c b/tests/test-trunc1.c
index 0c92cc6..cd5a57e 100644 (file)
--- a/tests/test-trunc1.c
+++ b/tests/test-trunc1.c
@@ -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.  */

diff --git a/tests/test-trunc2.c b/tests/test-trunc2.c
index f704bcb..d0da551 100644 (file)
--- a/tests/test-trunc2.c
+++ b/tests/test-trunc2.c
@@ -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.  */

diff --git a/tests/test-truncf1.c b/tests/test-truncf1.c
index 44fd8c1..dc49645 100644 (file)
--- a/tests/test-truncf1.c
+++ b/tests/test-truncf1.c
@@ -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.  */

diff --git a/tests/test-truncf2.c b/tests/test-truncf2.c
index 91ebb74..8d02e21 100644 (file)
--- a/tests/test-truncf2.c
+++ b/tests/test-truncf2.c
@@ -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.  */

diff --git a/tests/test-truncl.c b/tests/test-truncl.c
index 3b36ea7..4b76cc8 100644 (file)
--- a/tests/test-truncl.c
+++ b/tests/test-truncl.c
@@ -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.

diff --git a/tests/test-uname.c b/tests/test-uname.c
index b37ae9b..2a4fe13 100644 (file)
--- a/tests/test-uname.c
+++ b/tests/test-uname.c
@@ -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

diff --git a/tests/test-unlink.c b/tests/test-unlink.c
index ffc360d..1525802 100644 (file)
--- a/tests/test-unlink.c
+++ b/tests/test-unlink.c
@@ -32,18 +32,7 @@ SIGNATURE_CHECK (unlink, int, (char const *));
 #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"
 

diff --git a/tests/test-unlinkat.c b/tests/test-unlinkat.c
index 313cf1e..3d7f118 100644 (file)
--- a/tests/test-unlinkat.c
+++ b/tests/test-unlinkat.c
@@ -31,18 +31,7 @@ SIGNATURE_CHECK (unlinkat, int, (int, char const *, int));
 #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"
 

diff --git a/tests/test-unsetenv.c b/tests/test-unsetenv.c
index 6f80751..a8346be 100644 (file)
--- a/tests/test-unsetenv.c
+++ b/tests/test-unsetenv.c
@@ -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)

diff --git a/tests/test-usleep.c b/tests/test-usleep.c
index a792188..c7b6f75 100644 (file)
--- a/tests/test-usleep.c
+++ b/tests/test-usleep.c
@@ -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)

diff --git a/tests/test-utimens.c b/tests/test-utimens.c
index a36f042..618d941 100644 (file)
--- a/tests/test-utimens.c
+++ b/tests/test-utimens.c
@@ -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"
 

diff --git a/tests/test-utimensat.c b/tests/test-utimensat.c
index b1dc940..ba4c22d 100644 (file)
--- a/tests/test-utimensat.c
+++ b/tests/test-utimensat.c
@@ -35,18 +35,7 @@ SIGNATURE_CHECK (utimensat, int, (int, char const *, struct timespec const[2],
 #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"
 

diff --git a/tests/test-vasnprintf-posix.c b/tests/test-vasnprintf-posix.c
index 0c20a60..df4f377 100644 (file)
--- a/tests/test-vasnprintf-posix.c
+++ b/tests/test-vasnprintf-posix.c
@@ -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 ()

diff --git a/tests/test-vasnprintf-posix2.c b/tests/test-vasnprintf-posix2.c
index c2b5f43..06c3569 100644 (file)
--- a/tests/test-vasnprintf-posix2.c
+++ b/tests/test-vasnprintf-posix2.c
@@ -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[])

diff --git a/tests/test-vasnprintf.c b/tests/test-vasnprintf.c
index 280e1f4..2f7f0db 100644 (file)
--- a/tests/test-vasnprintf.c
+++ b/tests/test-vasnprintf.c
@@ -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, ...)

diff --git a/tests/test-vasprintf-posix.c b/tests/test-vasprintf-posix.c
index 9f3c4b5..f834178 100644 (file)
--- a/tests/test-vasprintf-posix.c
+++ b/tests/test-vasprintf-posix.c
@@ -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 ()

diff --git a/tests/test-vasprintf.c b/tests/test-vasprintf.c
index 46483e4..654ddfb 100644 (file)
--- a/tests/test-vasprintf.c
+++ b/tests/test-vasprintf.c
@@ -28,17 +28,7 @@ SIGNATURE_CHECK (vasprintf, int, (char **, char const *, va_list));
 #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, ...)

diff --git a/tests/test-vdprintf-posix.c b/tests/test-vdprintf-posix.c
index 932d289..387a7f4 100644 (file)
--- a/tests/test-vdprintf-posix.c
+++ b/tests/test-vdprintf-posix.c
@@ -26,20 +26,9 @@ SIGNATURE_CHECK (vdprintf, int, (int, char const *, va_list));
 #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"
 

diff --git a/tests/test-vfprintf-posix.c b/tests/test-vfprintf-posix.c
index 94c8cea..bac6aad 100644 (file)
--- a/tests/test-vfprintf-posix.c
+++ b/tests/test-vfprintf-posix.c
@@ -26,20 +26,9 @@ SIGNATURE_CHECK (vfprintf, int, (FILE *, char const *, va_list));
 #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"
 

diff --git a/tests/test-vprintf-posix.c b/tests/test-vprintf-posix.c
index ec63684..d08a0e5 100644 (file)
--- a/tests/test-vprintf-posix.c
+++ b/tests/test-vprintf-posix.c
@@ -26,20 +26,9 @@ SIGNATURE_CHECK (vprintf, int, (char const *, va_list));
 #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"
 

diff --git a/tests/test-vsnprintf-posix.c b/tests/test-vsnprintf-posix.c
index 7e152c2..a409b12 100644 (file)
--- a/tests/test-vsnprintf-posix.c
+++ b/tests/test-vsnprintf-posix.c
@@ -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"
 

diff --git a/tests/test-vsnprintf.c b/tests/test-vsnprintf.c
index baaae6f..717c3e2 100644 (file)
--- a/tests/test-vsnprintf.c
+++ b/tests/test-vsnprintf.c
@@ -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, ...)

diff --git a/tests/test-vsprintf-posix.c b/tests/test-vsprintf-posix.c
index 49a1347..d716cb1 100644 (file)
--- a/tests/test-vsprintf-posix.c
+++ b/tests/test-vsprintf-posix.c
@@ -30,18 +30,7 @@ SIGNATURE_CHECK (vsprintf, int, (char *, char const *, va_list));
 #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"
 

diff --git a/tests/test-wcrtomb.c b/tests/test-wcrtomb.c
index 3ac33e0..198e09b 100644 (file)
--- a/tests/test-wcrtomb.c
+++ b/tests/test-wcrtomb.c
@@ -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

diff --git a/tests/test-wcsnrtombs.c b/tests/test-wcsnrtombs.c
index f16dafe..f108c12 100644 (file)
--- a/tests/test-wcsnrtombs.c
+++ b/tests/test-wcsnrtombs.c
@@ -25,21 +25,10 @@ SIGNATURE_CHECK (wcsnrtombs, size_t, (char *, wchar_t const **, size_t, size_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"
 
 int
 main (int argc, char *argv[])

diff --git a/tests/test-wcsrtombs.c b/tests/test-wcsrtombs.c
index 4fad01f..3139d63 100644 (file)
--- a/tests/test-wcsrtombs.c
+++ b/tests/test-wcsrtombs.c
@@ -25,21 +25,10 @@ SIGNATURE_CHECK (wcsrtombs, size_t, (char *, wchar_t const **, size_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"
 
 int
 main (int argc, char *argv[])

diff --git a/tests/test-wctype.c b/tests/test-wctype.c
index bc28b15..fd801d1 100644 (file)
--- a/tests/test-wctype.c
+++ b/tests/test-wctype.c
@@ -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';

diff --git a/tests/test-wcwidth.c b/tests/test-wcwidth.c
index f1a89d1..f95c2c7 100644 (file)
--- a/tests/test-wcwidth.c
+++ b/tests/test-wcwidth.c
@@ -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 ()

diff --git a/tests/test-xfprintf-posix.c b/tests/test-xfprintf-posix.c
index b7adf76..1db113c 100644 (file)
--- a/tests/test-xfprintf-posix.c
+++ b/tests/test-xfprintf-posix.c
@@ -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"
 

diff --git a/tests/test-xmemdup0.c b/tests/test-xmemdup0.c
index 2c2e9d2..f78203d 100644 (file)
--- a/tests/test-xmemdup0.c
+++ b/tests/test-xmemdup0.c
@@ -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)

diff --git a/tests/test-xprintf-posix.c b/tests/test-xprintf-posix.c
index 501f04a..c8ec895 100644 (file)
--- a/tests/test-xprintf-posix.c
+++ b/tests/test-xprintf-posix.c
@@ -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"
 

diff --git a/tests/test-xvasprintf.c b/tests/test-xvasprintf.c
index eb230db..9aff369 100644 (file)
--- a/tests/test-xvasprintf.c
+++ b/tests/test-xvasprintf.c
@@ -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, ...)

diff --git a/tests/unicase/test-locale-language.c b/tests/unicase/test-locale-language.c
index d6a820d..bf6b16d 100644 (file)
--- a/tests/unicase/test-locale-language.c
+++ b/tests/unicase/test-locale-language.c
@@ -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[])

diff --git a/tests/unicase/test-mapping-part1.h b/tests/unicase/test-mapping-part1.h
index ce546e0..eb5e1bc 100644 (file)
--- a/tests/unicase/test-mapping-part1.h
+++ b/tests/unicase/test-mapping-part1.h
@@ -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;

diff --git a/tests/unicase/test-predicate-part1.h b/tests/unicase/test-predicate-part1.h
index 1be7960..c47dea0 100644 (file)
--- a/tests/unicase/test-predicate-part1.h
+++ b/tests/unicase/test-predicate-part1.h
@@ -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;

diff --git a/tests/unicase/test-u16-casecmp.c b/tests/unicase/test-u16-casecmp.c
index e758b99..804b518 100644 (file)
--- a/tests/unicase/test-u16-casecmp.c
+++ b/tests/unicase/test-u16-casecmp.c
@@ -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"

diff --git a/tests/unicase/test-u16-casecoll.c b/tests/unicase/test-u16-casecoll.c
index d5691c6..4384c22 100644 (file)
--- a/tests/unicase/test-u16-casecoll.c
+++ b/tests/unicase/test-u16-casecoll.c
@@ -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"

diff --git a/tests/unicase/test-u16-casefold.c b/tests/unicase/test-u16-casefold.c
index d378b56..39a1c85 100644 (file)
--- a/tests/unicase/test-u16-casefold.c
+++ b/tests/unicase/test-u16-casefold.c
@@ -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,

diff --git a/tests/unicase/test-u16-is-cased.c b/tests/unicase/test-u16-is-cased.c
index 722765b..8c05033 100644 (file)
--- a/tests/unicase/test-u16-is-cased.c
+++ b/tests/unicase/test-u16-is-cased.c
@@ -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"

diff --git a/tests/unicase/test-u16-is-casefolded.c b/tests/unicase/test-u16-is-casefolded.c
index 77920e9..3380d1b 100644 (file)
--- a/tests/unicase/test-u16-is-casefolded.c
+++ b/tests/unicase/test-u16-is-casefolded.c
@@ -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"

diff --git a/tests/unicase/test-u16-is-lowercase.c b/tests/unicase/test-u16-is-lowercase.c
index 7d36094..9d7ba40 100644 (file)
--- a/tests/unicase/test-u16-is-lowercase.c
+++ b/tests/unicase/test-u16-is-lowercase.c
@@ -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"

diff --git a/tests/unicase/test-u16-is-titlecase.c b/tests/unicase/test-u16-is-titlecase.c
index 1612954..69732a8 100644 (file)
--- a/tests/unicase/test-u16-is-titlecase.c
+++ b/tests/unicase/test-u16-is-titlecase.c
@@ -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"

diff --git a/tests/unicase/test-u16-is-uppercase.c b/tests/unicase/test-u16-is-uppercase.c
index 76dcf6c..d0df074 100644 (file)
--- a/tests/unicase/test-u16-is-uppercase.c
+++ b/tests/unicase/test-u16-is-uppercase.c
@@ -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"

diff --git a/tests/unicase/test-u16-tolower.c b/tests/unicase/test-u16-tolower.c
index 97dba74..200cf72 100644 (file)
--- a/tests/unicase/test-u16-tolower.c
+++ b/tests/unicase/test-u16-tolower.c
@@ -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,

diff --git a/tests/unicase/test-u16-totitle.c b/tests/unicase/test-u16-totitle.c
index ae03d3b..628dcd4 100644 (file)
--- a/tests/unicase/test-u16-totitle.c
+++ b/tests/unicase/test-u16-totitle.c
@@ -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,

diff --git a/tests/unicase/test-u16-toupper.c b/tests/unicase/test-u16-toupper.c
index 0831365..a4dc1fa 100644 (file)
--- a/tests/unicase/test-u16-toupper.c
+++ b/tests/unicase/test-u16-toupper.c
@@ -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,

diff --git a/tests/unicase/test-u32-casecmp.c b/tests/unicase/test-u32-casecmp.c
index 4f7204b..941b7bd 100644 (file)
--- a/tests/unicase/test-u32-casecmp.c
+++ b/tests/unicase/test-u32-casecmp.c
@@ -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"

diff --git a/tests/unicase/test-u32-casecoll.c b/tests/unicase/test-u32-casecoll.c
index 97a4e05..23e4e2f 100644 (file)
--- a/tests/unicase/test-u32-casecoll.c
+++ b/tests/unicase/test-u32-casecoll.c
@@ -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"

diff --git a/tests/unicase/test-u32-casefold.c b/tests/unicase/test-u32-casefold.c
index a1ff4a2..4790579 100644 (file)
--- a/tests/unicase/test-u32-casefold.c
+++ b/tests/unicase/test-u32-casefold.c
@@ -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,

diff --git a/tests/unicase/test-u32-is-cased.c b/tests/unicase/test-u32-is-cased.c
index 020a7a2..0a55d61 100644 (file)
--- a/tests/unicase/test-u32-is-cased.c
+++ b/tests/unicase/test-u32-is-cased.c
@@ -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"

diff --git a/tests/unicase/test-u32-is-casefolded.c b/tests/unicase/test-u32-is-casefolded.c
index acfaf25..7544eed 100644 (file)
--- a/tests/unicase/test-u32-is-casefolded.c
+++ b/tests/unicase/test-u32-is-casefolded.c
@@ -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"

diff --git a/tests/unicase/test-u32-is-lowercase.c b/tests/unicase/test-u32-is-lowercase.c
index ee41ac0..71959ae 100644 (file)
--- a/tests/unicase/test-u32-is-lowercase.c
+++ b/tests/unicase/test-u32-is-lowercase.c
@@ -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"

diff --git a/tests/unicase/test-u32-is-titlecase.c b/tests/unicase/test-u32-is-titlecase.c
index b564182..3cae147 100644 (file)
--- a/tests/unicase/test-u32-is-titlecase.c
+++ b/tests/unicase/test-u32-is-titlecase.c
@@ -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"

diff --git a/tests/unicase/test-u32-is-uppercase.c b/tests/unicase/test-u32-is-uppercase.c
index b67703b..f7f9e54 100644 (file)
--- a/tests/unicase/test-u32-is-uppercase.c
+++ b/tests/unicase/test-u32-is-uppercase.c
@@ -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"

diff --git a/tests/unicase/test-u32-tolower.c b/tests/unicase/test-u32-tolower.c
index cbe1a2b..4db01bb 100644 (file)
--- a/tests/unicase/test-u32-tolower.c
+++ b/tests/unicase/test-u32-tolower.c
@@ -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,

diff --git a/tests/unicase/test-u32-totitle.c b/tests/unicase/test-u32-totitle.c
index ea7ab9a..6f9bf1b 100644 (file)
--- a/tests/unicase/test-u32-totitle.c
+++ b/tests/unicase/test-u32-totitle.c
@@ -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,

diff --git a/tests/unicase/test-u32-toupper.c b/tests/unicase/test-u32-toupper.c
index c431b3d..631d4db 100644 (file)
--- a/tests/unicase/test-u32-toupper.c
+++ b/tests/unicase/test-u32-toupper.c
@@ -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,

diff --git a/tests/unicase/test-u8-casecmp.c b/tests/unicase/test-u8-casecmp.c
index c1f3746..af15fdd 100644 (file)
--- a/tests/unicase/test-u8-casecmp.c
+++ b/tests/unicase/test-u8-casecmp.c
@@ -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"

diff --git a/tests/unicase/test-u8-casecoll.c b/tests/unicase/test-u8-casecoll.c
index 5e4d69e..9be6ee6 100644 (file)
--- a/tests/unicase/test-u8-casecoll.c
+++ b/tests/unicase/test-u8-casecoll.c
@@ -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"

diff --git a/tests/unicase/test-u8-casefold.c b/tests/unicase/test-u8-casefold.c
index 5bf87bc..2bffde4 100644 (file)
--- a/tests/unicase/test-u8-casefold.c
+++ b/tests/unicase/test-u8-casefold.c
@@ -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,

diff --git a/tests/unicase/test-u8-is-cased.c b/tests/unicase/test-u8-is-cased.c
index 202eeea..ae454fd 100644 (file)
--- a/tests/unicase/test-u8-is-cased.c
+++ b/tests/unicase/test-u8-is-cased.c
@@ -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"

diff --git a/tests/unicase/test-u8-is-casefolded.c b/tests/unicase/test-u8-is-casefolded.c
index a17626c..31006ae 100644 (file)
--- a/tests/unicase/test-u8-is-casefolded.c
+++ b/tests/unicase/test-u8-is-casefolded.c
@@ -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"

diff --git a/tests/unicase/test-u8-is-lowercase.c b/tests/unicase/test-u8-is-lowercase.c
index 7c3491d..b778d65 100644 (file)
--- a/tests/unicase/test-u8-is-lowercase.c
+++ b/tests/unicase/test-u8-is-lowercase.c
@@ -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"

diff --git a/tests/unicase/test-u8-is-titlecase.c b/tests/unicase/test-u8-is-titlecase.c
index 05bb644..47467a1 100644 (file)
--- a/tests/unicase/test-u8-is-titlecase.c
+++ b/tests/unicase/test-u8-is-titlecase.c
@@ -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"

diff --git a/tests/unicase/test-u8-is-uppercase.c b/tests/unicase/test-u8-is-uppercase.c
index 77d3703..094fce7 100644 (file)
--- a/tests/unicase/test-u8-is-uppercase.c
+++ b/tests/unicase/test-u8-is-uppercase.c
@@ -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"

diff --git a/tests/unicase/test-u8-tolower.c b/tests/unicase/test-u8-tolower.c
index bd07ace..21acdae 100644 (file)
--- a/tests/unicase/test-u8-tolower.c
+++ b/tests/unicase/test-u8-tolower.c
@@ -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,

diff --git a/tests/unicase/test-u8-totitle.c b/tests/unicase/test-u8-totitle.c
index ddf1bea..927897c 100644 (file)
--- a/tests/unicase/test-u8-totitle.c
+++ b/tests/unicase/test-u8-totitle.c
@@ -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,

diff --git a/tests/unicase/test-u8-toupper.c b/tests/unicase/test-u8-toupper.c
index 605fd73..edf863c 100644 (file)
--- a/tests/unicase/test-u8-toupper.c
+++ b/tests/unicase/test-u8-toupper.c
@@ -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,

diff --git a/tests/unicase/test-ulc-casecmp.c b/tests/unicase/test-ulc-casecmp.c
index f1400ef..89427d3 100644 (file)
--- a/tests/unicase/test-ulc-casecmp.c
+++ b/tests/unicase/test-ulc-casecmp.c
@@ -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"

diff --git a/tests/unicase/test-ulc-casecoll.c b/tests/unicase/test-ulc-casecoll.c
index d669fde..d247fef 100644 (file)
--- a/tests/unicase/test-ulc-casecoll.c
+++ b/tests/unicase/test-ulc-casecoll.c
@@ -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"

diff --git a/tests/uniconv/test-u16-conv-from-enc.c b/tests/uniconv/test-u16-conv-from-enc.c
index e4ec6a6..2791f1c 100644 (file)
--- a/tests/uniconv/test-u16-conv-from-enc.c
+++ b/tests/uniconv/test-u16-conv-from-enc.c
@@ -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

diff --git a/tests/uniconv/test-u16-conv-to-enc.c b/tests/uniconv/test-u16-conv-to-enc.c
index 2bdf1b1..03f40e6 100644 (file)
--- a/tests/uniconv/test-u16-conv-to-enc.c
+++ b/tests/uniconv/test-u16-conv-to-enc.c
@@ -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

diff --git a/tests/uniconv/test-u16-strconv-from-enc.c b/tests/uniconv/test-u16-strconv-from-enc.c
index da2bc87..323f633 100644 (file)
--- a/tests/uniconv/test-u16-strconv-from-enc.c
+++ b/tests/uniconv/test-u16-strconv-from-enc.c
@@ -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 ()

diff --git a/tests/uniconv/test-u16-strconv-to-enc.c b/tests/uniconv/test-u16-strconv-to-enc.c
index 512b16c..2bc35c0 100644 (file)
--- a/tests/uniconv/test-u16-strconv-to-enc.c
+++ b/tests/uniconv/test-u16-strconv-to-enc.c
@@ -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 ()

diff --git a/tests/uniconv/test-u32-conv-from-enc.c b/tests/uniconv/test-u32-conv-from-enc.c
index 1b62159..c88789b 100644 (file)
--- a/tests/uniconv/test-u32-conv-from-enc.c
+++ b/tests/uniconv/test-u32-conv-from-enc.c
@@ -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

diff --git a/tests/uniconv/test-u32-conv-to-enc.c b/tests/uniconv/test-u32-conv-to-enc.c
index 603d920..ec44225 100644 (file)
--- a/tests/uniconv/test-u32-conv-to-enc.c
+++ b/tests/uniconv/test-u32-conv-to-enc.c
@@ -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

diff --git a/tests/uniconv/test-u32-strconv-from-enc.c b/tests/uniconv/test-u32-strconv-from-enc.c
index 3203c4f..beb9f82 100644 (file)
--- a/tests/uniconv/test-u32-strconv-from-enc.c
+++ b/tests/uniconv/test-u32-strconv-from-enc.c
@@ -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 ()

diff --git a/tests/uniconv/test-u32-strconv-to-enc.c b/tests/uniconv/test-u32-strconv-to-enc.c
index ce4537a..a92679e 100644 (file)
--- a/tests/uniconv/test-u32-strconv-to-enc.c
+++ b/tests/uniconv/test-u32-strconv-to-enc.c
@@ -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 ()

diff --git a/tests/uniconv/test-u8-conv-from-enc.c b/tests/uniconv/test-u8-conv-from-enc.c
index 29722a1..73ac275 100644 (file)
--- a/tests/uniconv/test-u8-conv-from-enc.c
+++ b/tests/uniconv/test-u8-conv-from-enc.c
@@ -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

diff --git a/tests/uniconv/test-u8-conv-to-enc.c b/tests/uniconv/test-u8-conv-to-enc.c
index 080896f..3fee61b 100644 (file)
--- a/tests/uniconv/test-u8-conv-to-enc.c
+++ b/tests/uniconv/test-u8-conv-to-enc.c
@@ -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

diff --git a/tests/uniconv/test-u8-strconv-from-enc.c b/tests/uniconv/test-u8-strconv-from-enc.c
index 89c48d3..e733f73 100644 (file)
--- a/tests/uniconv/test-u8-strconv-from-enc.c
+++ b/tests/uniconv/test-u8-strconv-from-enc.c
@@ -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 ()

diff --git a/tests/uniconv/test-u8-strconv-to-enc.c b/tests/uniconv/test-u8-strconv-to-enc.c
index f19aa4f..0ee4ff2 100644 (file)
--- a/tests/uniconv/test-u8-strconv-to-enc.c
+++ b/tests/uniconv/test-u8-strconv-to-enc.c
@@ -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 ()

diff --git a/tests/unictype/test-bidi_byname.c b/tests/unictype/test-bidi_byname.c
index c3a72d6..9032794 100644 (file)
--- a/tests/unictype/test-bidi_byname.c
+++ b/tests/unictype/test-bidi_byname.c
@@ -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 ()

diff --git a/tests/unictype/test-bidi_name.c b/tests/unictype/test-bidi_name.c
index 300e984..1a4ef0b 100644 (file)
--- a/tests/unictype/test-bidi_name.c
+++ b/tests/unictype/test-bidi_name.c
@@ -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 ()

diff --git a/tests/unictype/test-bidi_of.c b/tests/unictype/test-bidi_of.c
index e06af19..91fda15 100644 (file)
--- a/tests/unictype/test-bidi_of.c
+++ b/tests/unictype/test-bidi_of.c
@@ -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 ()

diff --git a/tests/unictype/test-bidi_test.c b/tests/unictype/test-bidi_test.c
index 468a402..c9e7b39 100644 (file)
--- a/tests/unictype/test-bidi_test.c
+++ b/tests/unictype/test-bidi_test.c
@@ -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 ()

diff --git a/tests/unictype/test-block_list.c b/tests/unictype/test-block_list.c
index 3b37ae6..d475546 100644 (file)
--- a/tests/unictype/test-block_list.c
+++ b/tests/unictype/test-block_list.c
@@ -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 ()

diff --git a/tests/unictype/test-block_of.c b/tests/unictype/test-block_of.c
index 93206bd..230fa87 100644 (file)
--- a/tests/unictype/test-block_of.c
+++ b/tests/unictype/test-block_of.c
@@ -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 ()

diff --git a/tests/unictype/test-block_test.c b/tests/unictype/test-block_test.c
index d901ef1..8971a39 100644 (file)
--- a/tests/unictype/test-block_test.c
+++ b/tests/unictype/test-block_test.c
@@ -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 ()

diff --git a/tests/unictype/test-categ_and.c b/tests/unictype/test-categ_and.c
index 301daaf..70d28cc 100644 (file)
--- a/tests/unictype/test-categ_and.c
+++ b/tests/unictype/test-categ_and.c
@@ -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 ()

diff --git a/tests/unictype/test-categ_and_not.c b/tests/unictype/test-categ_and_not.c
index 4c4990f..72afe83 100644 (file)
--- a/tests/unictype/test-categ_and_not.c
+++ b/tests/unictype/test-categ_and_not.c
@@ -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 ()

diff --git a/tests/unictype/test-categ_byname.c b/tests/unictype/test-categ_byname.c
index 9eceeea..a639f6e 100644 (file)
--- a/tests/unictype/test-categ_byname.c
+++ b/tests/unictype/test-categ_byname.c
@@ -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 ()

diff --git a/tests/unictype/test-categ_name.c b/tests/unictype/test-categ_name.c
index df088c4..bef6600 100644 (file)
--- a/tests/unictype/test-categ_name.c
+++ b/tests/unictype/test-categ_name.c
@@ -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 ()

diff --git a/tests/unictype/test-categ_none.c b/tests/unictype/test-categ_none.c
index 606b10e..bc0a9a7 100644 (file)
--- a/tests/unictype/test-categ_none.c
+++ b/tests/unictype/test-categ_none.c
@@ -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 ()

diff --git a/tests/unictype/test-categ_of.c b/tests/unictype/test-categ_of.c
index dc17c52..26d0463 100644 (file)
--- a/tests/unictype/test-categ_of.c
+++ b/tests/unictype/test-categ_of.c
@@ -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 ()

diff --git a/tests/unictype/test-categ_or.c b/tests/unictype/test-categ_or.c
index 5865eb0..7973eb0 100644 (file)
--- a/tests/unictype/test-categ_or.c
+++ b/tests/unictype/test-categ_or.c
@@ -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 ()

diff --git a/tests/unictype/test-categ_test_withtable.c b/tests/unictype/test-categ_test_withtable.c
index a1ee7d5..8e52a37 100644 (file)
--- a/tests/unictype/test-categ_test_withtable.c
+++ b/tests/unictype/test-categ_test_withtable.c
@@ -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 ()

diff --git a/tests/unictype/test-combining.c b/tests/unictype/test-combining.c
index fec2a13..d890f1d 100644 (file)
--- a/tests/unictype/test-combining.c
+++ b/tests/unictype/test-combining.c
@@ -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 ()

diff --git a/tests/unictype/test-decdigit.c b/tests/unictype/test-decdigit.c
index 04064ef..f94605e 100644 (file)
--- a/tests/unictype/test-decdigit.c
+++ b/tests/unictype/test-decdigit.c
@@ -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[] =
   {

diff --git a/tests/unictype/test-digit.c b/tests/unictype/test-digit.c
index fbcf502..e87f3f7 100644 (file)
--- a/tests/unictype/test-digit.c
+++ b/tests/unictype/test-digit.c
@@ -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[] =
   {

diff --git a/tests/unictype/test-mirror.c b/tests/unictype/test-mirror.c
index 443ee3e..457c502 100644 (file)
--- a/tests/unictype/test-mirror.c
+++ b/tests/unictype/test-mirror.c
@@ -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 ()

diff --git a/tests/unictype/test-numeric.c b/tests/unictype/test-numeric.c
index dfd90be..d602383 100644 (file)
--- a/tests/unictype/test-numeric.c
+++ b/tests/unictype/test-numeric.c
@@ -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[] =

diff --git a/tests/unictype/test-pr_byname.c b/tests/unictype/test-pr_byname.c
index 056f3e8..aa2676f 100644 (file)
--- a/tests/unictype/test-pr_byname.c
+++ b/tests/unictype/test-pr_byname.c
@@ -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 ()

diff --git a/tests/unictype/test-pr_test.c b/tests/unictype/test-pr_test.c
index 424dc1c..6bacc07 100644 (file)
--- a/tests/unictype/test-pr_test.c
+++ b/tests/unictype/test-pr_test.c
@@ -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 ()

diff --git a/tests/unictype/test-predicate-part1.h b/tests/unictype/test-predicate-part1.h
index 6278d50..1031856 100644 (file)
--- a/tests/unictype/test-predicate-part1.h
+++ b/tests/unictype/test-predicate-part1.h
@@ -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;

diff --git a/tests/unictype/test-scripts.c b/tests/unictype/test-scripts.c
index 5c16cc5..610b473 100644 (file)
--- a/tests/unictype/test-scripts.c
+++ b/tests/unictype/test-scripts.c
@@ -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 ()

diff --git a/tests/unictype/test-sy_c_ident.c b/tests/unictype/test-sy_c_ident.c
index 2182b26..026db18 100644 (file)
--- a/tests/unictype/test-sy_c_ident.c
+++ b/tests/unictype/test-sy_c_ident.c
@@ -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 ()

diff --git a/tests/unictype/test-sy_java_ident.c b/tests/unictype/test-sy_java_ident.c
index 214e312..ed9ddeb 100644 (file)
--- a/tests/unictype/test-sy_java_ident.c
+++ b/tests/unictype/test-sy_java_ident.c
@@ -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 ()

diff --git a/tests/unilbrk/test-u16-possible-linebreaks.c b/tests/unilbrk/test-u16-possible-linebreaks.c
index a374d55..5cdee3f 100644 (file)
--- a/tests/unilbrk/test-u16-possible-linebreaks.c
+++ b/tests/unilbrk/test-u16-possible-linebreaks.c
@@ -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 ()

diff --git a/tests/unilbrk/test-u16-width-linebreaks.c b/tests/unilbrk/test-u16-width-linebreaks.c
index e55c46a..6deab70 100644 (file)
--- a/tests/unilbrk/test-u16-width-linebreaks.c
+++ b/tests/unilbrk/test-u16-width-linebreaks.c
@@ -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 ()

diff --git a/tests/unilbrk/test-u32-possible-linebreaks.c b/tests/unilbrk/test-u32-possible-linebreaks.c
index b9696bb..fb27f08 100644 (file)
--- a/tests/unilbrk/test-u32-possible-linebreaks.c
+++ b/tests/unilbrk/test-u32-possible-linebreaks.c
@@ -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 ()

diff --git a/tests/unilbrk/test-u32-width-linebreaks.c b/tests/unilbrk/test-u32-width-linebreaks.c
index 5a103cc..57c9696 100644 (file)
--- a/tests/unilbrk/test-u32-width-linebreaks.c
+++ b/tests/unilbrk/test-u32-width-linebreaks.c
@@ -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 ()

diff --git a/tests/unilbrk/test-u8-possible-linebreaks.c b/tests/unilbrk/test-u8-possible-linebreaks.c
index c8450f7..7e9daa6 100644 (file)
--- a/tests/unilbrk/test-u8-possible-linebreaks.c
+++ b/tests/unilbrk/test-u8-possible-linebreaks.c
@@ -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 ()

diff --git a/tests/unilbrk/test-u8-width-linebreaks.c b/tests/unilbrk/test-u8-width-linebreaks.c
index 3502d8c..5ba5eff 100644 (file)
--- a/tests/unilbrk/test-u8-width-linebreaks.c
+++ b/tests/unilbrk/test-u8-width-linebreaks.c
@@ -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 ()

diff --git a/tests/unilbrk/test-ulc-possible-linebreaks.c b/tests/unilbrk/test-ulc-possible-linebreaks.c
index 2179a34..52e8da6 100644 (file)
--- a/tests/unilbrk/test-ulc-possible-linebreaks.c
+++ b/tests/unilbrk/test-ulc-possible-linebreaks.c
@@ -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 ()

diff --git a/tests/unilbrk/test-ulc-width-linebreaks.c b/tests/unilbrk/test-ulc-width-linebreaks.c
index 4661978..9ff7147 100644 (file)
--- a/tests/unilbrk/test-ulc-width-linebreaks.c
+++ b/tests/unilbrk/test-ulc-width-linebreaks.c
@@ -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 ()

diff --git a/tests/uninorm/test-canonical-decomposition.c b/tests/uninorm/test-canonical-decomposition.c
index 5d3db60..af01740 100644 (file)
--- a/tests/uninorm/test-canonical-decomposition.c
+++ b/tests/uninorm/test-canonical-decomposition.c
@@ -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 ()

diff --git a/tests/uninorm/test-compat-decomposition.c b/tests/uninorm/test-compat-decomposition.c
index 766cd40..21bbb68 100644 (file)
--- a/tests/uninorm/test-compat-decomposition.c
+++ b/tests/uninorm/test-compat-decomposition.c
@@ -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 ()

diff --git a/tests/uninorm/test-composition.c b/tests/uninorm/test-composition.c
index 5519050..c499f65 100644 (file)
--- a/tests/uninorm/test-composition.c
+++ b/tests/uninorm/test-composition.c
@@ -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 ()

diff --git a/tests/uninorm/test-decomposing-form.c b/tests/uninorm/test-decomposing-form.c
index c9444b7..707462c 100644 (file)
--- a/tests/uninorm/test-decomposing-form.c
+++ b/tests/uninorm/test-decomposing-form.c
@@ -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 ()

diff --git a/tests/uninorm/test-decomposition.c b/tests/uninorm/test-decomposition.c
index c7fa6c2..1afc852 100644 (file)
--- a/tests/uninorm/test-decomposition.c
+++ b/tests/uninorm/test-decomposition.c
@@ -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 ()

diff --git a/tests/uninorm/test-u16-nfc.c b/tests/uninorm/test-u16-nfc.c
index 73523e0..b2a6e77 100644 (file)
--- a/tests/uninorm/test-u16-nfc.c
+++ b/tests/uninorm/test-u16-nfc.c
@@ -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,

diff --git a/tests/uninorm/test-u16-nfd.c b/tests/uninorm/test-u16-nfd.c
index 8d35bac..cfb0dac 100644 (file)
--- a/tests/uninorm/test-u16-nfd.c
+++ b/tests/uninorm/test-u16-nfd.c
@@ -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,

diff --git a/tests/uninorm/test-u16-nfkc.c b/tests/uninorm/test-u16-nfkc.c
index 362bc5b..37a7cd7 100644 (file)
--- a/tests/uninorm/test-u16-nfkc.c
+++ b/tests/uninorm/test-u16-nfkc.c
@@ -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,

diff --git a/tests/uninorm/test-u16-nfkd.c b/tests/uninorm/test-u16-nfkd.c
index 8e38f08..1373e2b 100644 (file)
--- a/tests/uninorm/test-u16-nfkd.c
+++ b/tests/uninorm/test-u16-nfkd.c
@@ -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,

diff --git a/tests/uninorm/test-u16-normcmp.c b/tests/uninorm/test-u16-normcmp.c
index 6fa42c3..42a040d 100644 (file)
--- a/tests/uninorm/test-u16-normcmp.c
+++ b/tests/uninorm/test-u16-normcmp.c
@@ -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"
 

diff --git a/tests/uninorm/test-u16-normcoll.c b/tests/uninorm/test-u16-normcoll.c
index 550e31d..311a094 100644 (file)
--- a/tests/uninorm/test-u16-normcoll.c
+++ b/tests/uninorm/test-u16-normcoll.c
@@ -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

diff --git a/tests/uninorm/test-u32-nfc.c b/tests/uninorm/test-u32-nfc.c
index eda2202..19b86fd 100644 (file)
--- a/tests/uninorm/test-u32-nfc.c
+++ b/tests/uninorm/test-u32-nfc.c
@@ -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,

diff --git a/tests/uninorm/test-u32-nfd.c b/tests/uninorm/test-u32-nfd.c
index 21776ec..187eac1 100644 (file)
--- a/tests/uninorm/test-u32-nfd.c
+++ b/tests/uninorm/test-u32-nfd.c
@@ -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,

diff --git a/tests/uninorm/test-u32-nfkc.c b/tests/uninorm/test-u32-nfkc.c
index 6aa68fa..50c634c 100644 (file)
--- a/tests/uninorm/test-u32-nfkc.c
+++ b/tests/uninorm/test-u32-nfkc.c
@@ -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,

diff --git a/tests/uninorm/test-u32-nfkd.c b/tests/uninorm/test-u32-nfkd.c
index b932ae2..2150a4e 100644 (file)
--- a/tests/uninorm/test-u32-nfkd.c
+++ b/tests/uninorm/test-u32-nfkd.c
@@ -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,

diff --git a/tests/uninorm/test-u32-normalize-big.c b/tests/uninorm/test-u32-normalize-big.c
index 5cf60a6..831066b 100644 (file)
--- a/tests/uninorm/test-u32-normalize-big.c
+++ b/tests/uninorm/test-u32-normalize-big.c
@@ -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                                                                         \

diff --git a/tests/uninorm/test-u32-normcmp.c b/tests/uninorm/test-u32-normcmp.c
index 3edeffd..40253d8 100644 (file)
--- a/tests/uninorm/test-u32-normcmp.c
+++ b/tests/uninorm/test-u32-normcmp.c
@@ -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"
 

diff --git a/tests/uninorm/test-u32-normcoll.c b/tests/uninorm/test-u32-normcoll.c
index 0019770..2efee6c 100644 (file)
--- a/tests/uninorm/test-u32-normcoll.c
+++ b/tests/uninorm/test-u32-normcoll.c
@@ -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

diff --git a/tests/uninorm/test-u8-nfc.c b/tests/uninorm/test-u8-nfc.c
index 3eb71a4..675730f 100644 (file)
--- a/tests/uninorm/test-u8-nfc.c
+++ b/tests/uninorm/test-u8-nfc.c
@@ -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,

diff --git a/tests/uninorm/test-u8-nfd.c b/tests/uninorm/test-u8-nfd.c
index 93bf297..1ccd668 100644 (file)
--- a/tests/uninorm/test-u8-nfd.c
+++ b/tests/uninorm/test-u8-nfd.c
@@ -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,

diff --git a/tests/uninorm/test-u8-nfkc.c b/tests/uninorm/test-u8-nfkc.c
index fcc50a3..b93ba7a 100644 (file)
--- a/tests/uninorm/test-u8-nfkc.c
+++ b/tests/uninorm/test-u8-nfkc.c
@@ -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,

diff --git a/tests/uninorm/test-u8-nfkd.c b/tests/uninorm/test-u8-nfkd.c
index f1246d8..34c31ea 100644 (file)
--- a/tests/uninorm/test-u8-nfkd.c
+++ b/tests/uninorm/test-u8-nfkd.c
@@ -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,

diff --git a/tests/uninorm/test-u8-normcmp.c b/tests/uninorm/test-u8-normcmp.c
index 643dd3e..487442f 100644 (file)
--- a/tests/uninorm/test-u8-normcmp.c
+++ b/tests/uninorm/test-u8-normcmp.c
@@ -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"
 

diff --git a/tests/uninorm/test-u8-normcoll.c b/tests/uninorm/test-u8-normcoll.c
index 4f90730..c86458a 100644 (file)
--- a/tests/uninorm/test-u8-normcoll.c
+++ b/tests/uninorm/test-u8-normcoll.c
@@ -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

diff --git a/tests/uninorm/test-uninorm-filter-nfc.c b/tests/uninorm/test-uninorm-filter-nfc.c
index 1dd0403..7e68519 100644 (file)
--- a/tests/uninorm/test-uninorm-filter-nfc.c
+++ b/tests/uninorm/test-uninorm-filter-nfc.c
@@ -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.  */
 

diff --git a/tests/unistdio/test-u16-asnprintf1.c b/tests/unistdio/test-u16-asnprintf1.c
index f2d2f70..e4ead6e 100644 (file)
--- a/tests/unistdio/test-u16-asnprintf1.c
+++ b/tests/unistdio/test-u16-asnprintf1.c
@@ -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"
 

diff --git a/tests/unistdio/test-u16-vasnprintf1.c b/tests/unistdio/test-u16-vasnprintf1.c
index 7907168..7d729e8 100644 (file)
--- a/tests/unistdio/test-u16-vasnprintf1.c
+++ b/tests/unistdio/test-u16-vasnprintf1.c
@@ -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"

diff --git a/tests/unistdio/test-u16-vasnprintf2.c b/tests/unistdio/test-u16-vasnprintf2.c
index 8f1d48c..397adbe 100644 (file)
--- a/tests/unistdio/test-u16-vasnprintf2.c
+++ b/tests/unistdio/test-u16-vasnprintf2.c
@@ -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 *, ...))

diff --git a/tests/unistdio/test-u16-vasnprintf3.c b/tests/unistdio/test-u16-vasnprintf3.c
index b758f73..26f4250 100644 (file)
--- a/tests/unistdio/test-u16-vasnprintf3.c
+++ b/tests/unistdio/test-u16-vasnprintf3.c
@@ -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 *, ...))

diff --git a/tests/unistdio/test-u16-vasprintf1.c b/tests/unistdio/test-u16-vasprintf1.c
index b534dfe..69917ac 100644 (file)
--- a/tests/unistdio/test-u16-vasprintf1.c
+++ b/tests/unistdio/test-u16-vasprintf1.c
@@ -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"
 

diff --git a/tests/unistdio/test-u16-vsnprintf1.c b/tests/unistdio/test-u16-vsnprintf1.c
index 37420f7..cc0b7e1 100644 (file)
--- a/tests/unistdio/test-u16-vsnprintf1.c
+++ b/tests/unistdio/test-u16-vsnprintf1.c
@@ -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"
 

diff --git a/tests/unistdio/test-u16-vsprintf1.c b/tests/unistdio/test-u16-vsprintf1.c
index 179c4a3..fd9e088 100644 (file)
--- a/tests/unistdio/test-u16-vsprintf1.c
+++ b/tests/unistdio/test-u16-vsprintf1.c
@@ -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"
 

diff --git a/tests/unistdio/test-u32-asnprintf1.c b/tests/unistdio/test-u32-asnprintf1.c
index a470cbf..957ba19 100644 (file)
--- a/tests/unistdio/test-u32-asnprintf1.c
+++ b/tests/unistdio/test-u32-asnprintf1.c
@@ -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"
 

diff --git a/tests/unistdio/test-u32-vasnprintf1.c b/tests/unistdio/test-u32-vasnprintf1.c
index d068c27..2bca986 100644 (file)
--- a/tests/unistdio/test-u32-vasnprintf1.c
+++ b/tests/unistdio/test-u32-vasnprintf1.c
@@ -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"

diff --git a/tests/unistdio/test-u32-vasnprintf2.c b/tests/unistdio/test-u32-vasnprintf2.c
index ec5b46d..33535a6 100644 (file)
--- a/tests/unistdio/test-u32-vasnprintf2.c
+++ b/tests/unistdio/test-u32-vasnprintf2.c
@@ -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 *, ...))

diff --git a/tests/unistdio/test-u32-vasnprintf3.c b/tests/unistdio/test-u32-vasnprintf3.c
index 78608ff..dce3d6e 100644 (file)
--- a/tests/unistdio/test-u32-vasnprintf3.c
+++ b/tests/unistdio/test-u32-vasnprintf3.c
@@ -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 *, ...))

diff --git a/tests/unistdio/test-u32-vasprintf1.c b/tests/unistdio/test-u32-vasprintf1.c
index 901424c..a33617c 100644 (file)
--- a/tests/unistdio/test-u32-vasprintf1.c
+++ b/tests/unistdio/test-u32-vasprintf1.c
@@ -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"
 

diff --git a/tests/unistdio/test-u32-vsnprintf1.c b/tests/unistdio/test-u32-vsnprintf1.c
index af52a7b..8a25e0e 100644 (file)
--- a/tests/unistdio/test-u32-vsnprintf1.c
+++ b/tests/unistdio/test-u32-vsnprintf1.c
@@ -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"
 

diff --git a/tests/unistdio/test-u32-vsprintf1.c b/tests/unistdio/test-u32-vsprintf1.c
index 6f23d83..0e3188c 100644 (file)
--- a/tests/unistdio/test-u32-vsprintf1.c
+++ b/tests/unistdio/test-u32-vsprintf1.c
@@ -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"
 

diff --git a/tests/unistdio/test-u8-asnprintf1.c b/tests/unistdio/test-u8-asnprintf1.c
index 820e5e1..e85dd67 100644 (file)
--- a/tests/unistdio/test-u8-asnprintf1.c
+++ b/tests/unistdio/test-u8-asnprintf1.c
@@ -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"
 

diff --git a/tests/unistdio/test-u8-vasnprintf1.c b/tests/unistdio/test-u8-vasnprintf1.c
index 9e597b8..0a121c6 100644 (file)
--- a/tests/unistdio/test-u8-vasnprintf1.c
+++ b/tests/unistdio/test-u8-vasnprintf1.c
@@ -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"

diff --git a/tests/unistdio/test-u8-vasnprintf2.c b/tests/unistdio/test-u8-vasnprintf2.c
index df59f40..22ae15f 100644 (file)
--- a/tests/unistdio/test-u8-vasnprintf2.c
+++ b/tests/unistdio/test-u8-vasnprintf2.c
@@ -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 *, ...))

diff --git a/tests/unistdio/test-u8-vasnprintf3.c b/tests/unistdio/test-u8-vasnprintf3.c
index d35d647..8f5d943 100644 (file)
--- a/tests/unistdio/test-u8-vasnprintf3.c
+++ b/tests/unistdio/test-u8-vasnprintf3.c
@@ -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 *, ...))

diff --git a/tests/unistdio/test-u8-vasprintf1.c b/tests/unistdio/test-u8-vasprintf1.c
index dc9afb4..c8aa2f7 100644 (file)
--- a/tests/unistdio/test-u8-vasprintf1.c
+++ b/tests/unistdio/test-u8-vasprintf1.c
@@ -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"
 

diff --git a/tests/unistdio/test-u8-vsnprintf1.c b/tests/unistdio/test-u8-vsnprintf1.c
index c494c6d..1f4f196 100644 (file)
--- a/tests/unistdio/test-u8-vsnprintf1.c
+++ b/tests/unistdio/test-u8-vsnprintf1.c
@@ -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"
 

diff --git a/tests/unistdio/test-u8-vsprintf1.c b/tests/unistdio/test-u8-vsprintf1.c
index a607a7f..7f89366 100644 (file)
--- a/tests/unistdio/test-u8-vsprintf1.c
+++ b/tests/unistdio/test-u8-vsprintf1.c
@@ -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"
 

diff --git a/tests/unistdio/test-ulc-asnprintf1.c b/tests/unistdio/test-ulc-asnprintf1.c
index 8ad1906..d700641 100644 (file)
--- a/tests/unistdio/test-ulc-asnprintf1.c
+++ b/tests/unistdio/test-ulc-asnprintf1.c
@@ -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"
 

diff --git a/tests/unistdio/test-ulc-vasnprintf1.c b/tests/unistdio/test-ulc-vasnprintf1.c
index a9af563..a7f1454 100644 (file)
--- a/tests/unistdio/test-ulc-vasnprintf1.c
+++ b/tests/unistdio/test-ulc-vasnprintf1.c
@@ -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"

diff --git a/tests/unistdio/test-ulc-vasnprintf2.c b/tests/unistdio/test-ulc-vasnprintf2.c
index d1c035e..bc8ccad 100644 (file)
--- a/tests/unistdio/test-ulc-vasnprintf2.c
+++ b/tests/unistdio/test-ulc-vasnprintf2.c
@@ -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 *, ...))

diff --git a/tests/unistdio/test-ulc-vasnprintf3.c b/tests/unistdio/test-ulc-vasnprintf3.c
index b1268c9..a4c1843 100644 (file)
--- a/tests/unistdio/test-ulc-vasnprintf3.c
+++ b/tests/unistdio/test-ulc-vasnprintf3.c
@@ -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 *, ...))

diff --git a/tests/unistdio/test-ulc-vasprintf1.c b/tests/unistdio/test-ulc-vasprintf1.c
index cd18758..4e8d3d3 100644 (file)
--- a/tests/unistdio/test-ulc-vasprintf1.c
+++ b/tests/unistdio/test-ulc-vasprintf1.c
@@ -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"
 

diff --git a/tests/unistdio/test-ulc-vsnprintf1.c b/tests/unistdio/test-ulc-vsnprintf1.c
index 0a2b43f..f3d98be 100644 (file)
--- a/tests/unistdio/test-ulc-vsnprintf1.c
+++ b/tests/unistdio/test-ulc-vsnprintf1.c
@@ -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"
 

diff --git a/tests/unistdio/test-ulc-vsprintf1.c b/tests/unistdio/test-ulc-vsprintf1.c
index 2b1586b..662ca0f 100644 (file)
--- a/tests/unistdio/test-ulc-vsprintf1.c
+++ b/tests/unistdio/test-ulc-vsprintf1.c
@@ -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"
 

diff --git a/tests/uniwbrk/test-u16-wordbreaks.c b/tests/uniwbrk/test-u16-wordbreaks.c
index e3a66c7..d4a9066 100644 (file)
--- a/tests/uniwbrk/test-u16-wordbreaks.c
+++ b/tests/uniwbrk/test-u16-wordbreaks.c
@@ -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 ()

diff --git a/tests/uniwbrk/test-u32-wordbreaks.c b/tests/uniwbrk/test-u32-wordbreaks.c
index 1dbdea5..5f4ce9e 100644 (file)
--- a/tests/uniwbrk/test-u32-wordbreaks.c
+++ b/tests/uniwbrk/test-u32-wordbreaks.c
@@ -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 ()

diff --git a/tests/uniwbrk/test-u8-wordbreaks.c b/tests/uniwbrk/test-u8-wordbreaks.c
index e7d15d1..fd73981 100644 (file)
--- a/tests/uniwbrk/test-u8-wordbreaks.c
+++ b/tests/uniwbrk/test-u8-wordbreaks.c
@@ -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 ()

diff --git a/tests/uniwbrk/test-ulc-wordbreaks.c b/tests/uniwbrk/test-ulc-wordbreaks.c
index 1727432..0322b66 100644 (file)
--- a/tests/uniwbrk/test-ulc-wordbreaks.c
+++ b/tests/uniwbrk/test-ulc-wordbreaks.c
@@ -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 ()

diff --git a/tests/uniwidth/test-u16-strwidth.c b/tests/uniwidth/test-u16-strwidth.c
index 9794c3f..749ae0a 100644 (file)
--- a/tests/uniwidth/test-u16-strwidth.c
+++ b/tests/uniwidth/test-u16-strwidth.c
@@ -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 ()

diff --git a/tests/uniwidth/test-u16-width.c b/tests/uniwidth/test-u16-width.c
index 440a4fb..62e7bc2 100644 (file)
--- a/tests/uniwidth/test-u16-width.c
+++ b/tests/uniwidth/test-u16-width.c
@@ -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 ()

diff --git a/tests/uniwidth/test-u32-strwidth.c b/tests/uniwidth/test-u32-strwidth.c
index 77ca68e..2035f4c 100644 (file)
--- a/tests/uniwidth/test-u32-strwidth.c
+++ b/tests/uniwidth/test-u32-strwidth.c
@@ -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 ()

diff --git a/tests/uniwidth/test-u32-width.c b/tests/uniwidth/test-u32-width.c
index a55c6a8..7d0695b 100644 (file)
--- a/tests/uniwidth/test-u32-width.c
+++ b/tests/uniwidth/test-u32-width.c
@@ -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 ()

diff --git a/tests/uniwidth/test-u8-strwidth.c b/tests/uniwidth/test-u8-strwidth.c
index b625441..f4dccf9 100644 (file)
--- a/tests/uniwidth/test-u8-strwidth.c
+++ b/tests/uniwidth/test-u8-strwidth.c
@@ -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 ()

diff --git a/tests/uniwidth/test-u8-width.c b/tests/uniwidth/test-u8-width.c
index b421e45..0d971e8 100644 (file)
--- a/tests/uniwidth/test-u8-width.c
+++ b/tests/uniwidth/test-u8-width.c
@@ -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 ()

diff --git a/tests/uniwidth/test-uc_width.c b/tests/uniwidth/test-uc_width.c
index 8303c08..f823762 100644 (file)
--- a/tests/uniwidth/test-uc_width.c
+++ b/tests/uniwidth/test-uc_width.c
@@ -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 ()

diff --git a/tests/uniwidth/test-uc_width2.c b/tests/uniwidth/test-uc_width2.c
index 78f71e0..dc080f0 100644 (file)
--- a/tests/uniwidth/test-uc_width2.c
+++ b/tests/uniwidth/test-uc_width2.c
@@ -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;