Refactor common macros used in tests.

diff --git a/ChangeLog b/ChangeLog
index 16e5a999898638cad019e59c58a25cf6f537fd0b..98ea48cce9e85c58502ff0491aa3392886b6d1f6 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 b0a3b734852ba6a0c8f9d7eeb05b4ce026dc9e9a..c9c04cdf4ad8fea10a06e9b49b55bd15cd7283d2 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 0e7796e6cb6ff5432227988eaac879709f95cc60..37c26c2a20a3c5ca4f8528ff3da77025bcfefb2d 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 9752034b307e6463ab44d3dae79e607966f94cb4..1dddea8293cfcee1f27a9e1825f81310f5a07baf 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 ca0adc42ea7a8592727a4e86151ad3bc95c5f8e9..45a8d48cf9748a772ab7eb4602237822e13728ee 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 f3d3878f3f0dbfbf996755ac3b82d167000c2357..972bc3eeb1de8cc657e42901db69cd77abe7f96f 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 253d4d6b117d071ab97d09300fe257b6d00bd7f7..85ac3a2b561fed9437dda68c7ec9bfc0420f438f 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 af0405bfb4b140bcbb666a5c401ff15c76f2c707..92c5c82bc1e0f02d1c349a1e8d84a8b105995528 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 83dc54c43beace4d3e5cb4a363c69418fccf251b..1e9524d26490bca4f3791d5d6b540ff60a689bcf 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 ab1230822f31c6c016e4e86ec1894a8775af21b8..5bf9b67829a6fc4749536c98e2a09c69f0f722f0 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 89f071d4b700a525cfcd2bab20e6d0656b38fa9c..57913163123da3d3bd5eef2ae5d62a7c62756fff 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 c87eda30b617c6c2e39fe67d3a10e104324fd431..cbd47c7811fa4b429d254bdc76de9fed8c3adc7c 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 a33b6c674862abed3427a12636a9d40442d68597..a29ad587d407f52e144027199cf67177ea1db7d2 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 dd013d21214df06605f7bd7afdc46c6c8fc2ea41..eae613ec149dcfc3454ea857d1a1766c98d64145 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 6406768e3151ae455ecc202f438deea80c2d3a53..b8659a8b3a3578d231921fdc10e0728a599230ec 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 1cdc88a13b66961150d8e1f261a065397b865b0e..e59f056715b513fb3f7dee21232d2347c97727b2 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 405607a2bf8e0aae89be5b26aa15be9dfa871088..c6860197f8e3122e6131ae636325a7ed5c95a7a4 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 c5e73ce7ecdfb4a762be3231c8dbdd9de215cfe2..371bde95eabbf622c04dff68498fa10de7c376de 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 0ac626e1b1f5436bf8acdbe5d154553188e3a077..08ffc83d2e7fe7d3f6865c762231f4c9e6034068 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 35a47c167049c17d24249f3e19ed5d288cad1484..196f529998b5dacc96aacf7ff12870d888eacbd3 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 dfed076060da1a21466ac71230bd1e3976af99ec..808e59e5cdb1f21c846643d0e8521b20f4196091 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 f223ffd9d5c0c3057f108bd6c3833eb1b662823c..aec09db5bc6e2fd311a818443679e2c8a7a8f6dd 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 857a59205e911becbcbcf88ba5c2f25612eb0cca..f67108611b41f2ff1acc75993c752209f83068a7 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 381d7a3bd2f7b6a1a14dd7783426815c7190646f..78565b22d3be3801398c07928aa1efd5fd2d91dc 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 5ddb1998cdf67e0a2aa31a9c0c5f72d2de1ed2f3..bc07ea34c6bd4e12efd620daf39b27430b2bfbd3 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 b10b61d666ef3d483b1334c6bafccf70a5336d8d..fb18d66b25cce1fa0869c1fe74173b338523dc9f 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 82e7b7894ba057a6ce4a504f2da034f5098407f1..4f13705ae201b31489df2023ea3e712a5f76a3f7 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 2599ab11c32b0f8416ae10fcc66be383217615be..f58cbed0169e04c72fc731345743e49c639b99f2 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 0d5f0fd1fe5a0b8d38e285f35f82af3275c5a7eb..6ac9b5aee8882a7bf96e27514b106c99c203520b 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 a320328fa8d0d6d6ac8e7d4c170b7ef4bc95588b..68f74f0ae6d68094abddb6891aedb60a83cce169 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 22792dbacce351aa461e96e7f27936ff9b9706c6..3a76b9e9a3fc3257fe8f56a9784b8251c9fcf671 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 a683dee251f77c7a45b9d622b17799863e867fa4..c4fe4fd4675d01458e596b7728a71b8a4f9c8a0c 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 c8241b357687ef64fa48d5a82e1a87f4001a2902..bf0a543212c48126f8f787e803963224b8b987e2 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 5b865ce8bfdcd8313c6526412e0fa365104bfc8f..e4df83d60151e14e7ac649e0bad5a5b74f78f181 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 b24ef675f22ee8b5ae3a11eb55d764f48451eea7..679f4b15e918a61bff708e79d70b69ea7631d909 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 2886d60fae4a641bf0a0020b841057f11c60d3d3..26dd5d89aa63eb229584ba28b1a96f11eefe9226 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 f0e9064ce0b8ab60e30068248ad102ca6870b408..af9dc9889d7ff1b4903bf582372e5a4efdcd8d4e 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 8a9041f1ff239c0e23fc762e74bd84b4d2d9232f..fa36a61b62cd1969662e9c31116a632231fb62ea 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 2e202f369652aa59ad95cc62af8a61ea07fa219d..462e709211570b7308b5ca2e503bd885c3a2bb85 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 3e8a2f6ba4e3cc5e87f2d404ced6c7f01798da97..cb35aed252f31310c1d2266db5f19fb282aeb66c 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 e47f2d6399c9d3af2a4db9fc6d628f7801694fda..44b040c2514d9de78a16a42c352ce8707b8cd1d8 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 c0bafb6c130a2e42576a3e6fea733cd06c9ac468..bee2df7df5265682c93a916c31b1202b9cb33cb0 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 16cf82c4f33559c3d597615f9cf2d45b837b21b4..dc55c45b2db7e862f8b447b08c87dcfe97d888b5 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 db5a5c0167cfa6beb1bc934ca770dc934865429a..e439c2c78b018647d952949729b0fd48025625ff 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 165ecfe1bbfd0c2fa5ff5e4e168b113cfc9436ef..46cf401821e82c4763761210faf5bca351974933 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 441e23e66669012c0b5ecde48f10c7cacbbc1cba..ece4b482633b62ea3790cbb5ea210664f0657c44 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 d6a8185c8585e51a81c63ab0dc33eb0d86410780..988d8925cb25056b5305810510fe219009c82dff 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 10310923df0e15849fbb1446bb15ffc872188bfe..4cffee619c83a4c20d34bb0bcf42abf0c32d51b1 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 c83b905be7218fbefc76ed61bef0f1465b534bc6..cb16de436c51818440e5bf14a88fefb72702f1d1 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 21116e60ec94cd86e8204f3a458a81536ba664da..256c54ceff7dae83ec4ad002b30f94c319d6524b 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 208ec3b2e12f772e3e62ec2afbdcda3c67b4a9da..69ff6ac4cc44c8375140752f824f0c9e95978bd1 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 c6261a59a868cfc327378102087ccdbdfd705ff4..bc8394c19b62fa066084463b96b2e08c54cfb6d9 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 4ac9a12ca716ea01c7ab099b62ed4ee864ccc638..1473544742e7d6fbce4767f4082aaaa05da36ece 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 b5c99c9e92af85278ac633bdc58cf960b4d56a8f..74e898d1a6603488f47cf8a2518f61580390d268 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 bace5192d9cb1a1a71562e8c02e6c0c4bb23e726..9e6f4152ae270ecd627fb988e25551658b41e270 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 d8349633ec340b6a6744ad04bb83f58280332cfa..13e95cd99e786962cbbb55c2d7e306660ef8dcdd 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 78cb96a79ce3af8f2cf7d4de09a11eb824494ba6..10c2311713464dd190f8d8b133a67ebfa57b50c4 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 c9e3155e15c1586805d97402c0595629b37d4778..783aea70682bbcbefb1cace4a1c94512a7943150 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 6fb15489ea778b94e403e0cc39a5b351b1d38389..e89607abaf829e034e255dd61ddc86cf3660ab51 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 0f9ae2142d4f8cc2762f99e1822fe17461d34e7d..95b59152e55a2e2e6e1e742e667e480bbfa5c41e 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 acbfec7098c352a475ede2d0db0e4a0e1996e142..abde5758059ac914ab63fbcf7b54974c81b72937 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 e90189bbd1c3871459df571b6a00afb5d3202d8c..a5cfeaf14f04d1c0f0ba7d6a1883305d9a4cb110 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 85799561b8f4c46cbd9e635369843428acc8aa10..90b8ee49692dabbf6189df105f6d2b83ef27f1fa 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 5382cec73a0a56f4a6566738bae01cac4bf8b662..54fe2ae1923c4ddd3c866fad4a30bf7a25d2c1db 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 cd76a95dcd21ab370a5eedbc525c631cfcd2aedb..6de889b6854e1f1a510f92e4e6ac645ed3c2c5bf 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 e2fb27ed5e2bb28d5a75df14443a6299532140be..1359970ca5d59d0ca69a7ea55161985f363ca087 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 c7dcda5e215b758cf7c4a7f498e6ab0061987d8b..b82f414b00d599e437342125fb8da94e0f7377dd 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 a3db419190ad8b2237459c55c2d85d85eb98425c..e3df22dbb18b421ed5e76a58351cc9ee813c72bf 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 717b48edd58c3cb9a7765ca83a2696aa7cb8e5bc..c669a98f419897b57577e29cfe25e7b4793a53bf 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 c4937d07608ebf528cd98b7118f6e889e7fc3cf5..73f659e084b6ed0aa202c6efbe6927e70577db98 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 9be33248edcd971ee529a90370a47d356d6d8db3..cb53b6d5d998f4f40849beb997be0f99c1ce5685 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 702dbc26168ecf56ce6b9b938b60347891c9b025..330711dba9a256f126ff21dc8a5198d711aca2dd 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 7c7cedc55c51299ecda82f0c925145fe1beeaa9a..803a331e2d717398207f70a0a032ff73ac074759 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 5594223f0fad0a5cdbf692eed6ed3bd7dc3c22d0..2b74b64a5dabdc188aeaf783677df40f9c576c76 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 75897cbe19c4c6812b0820df21d96677f2bd7209..016961fc712c5948de0500a9014ef4f9edea2949 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 6b7c92ba498b8192e99871e4f9b629fc114dbd5c..ff2945db05754f4149ecdb6cc36388223bb78674 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 880c380acce4bd741427ccca8ba54e405bd6837e..a2f2aa0beee6afc4a86fa9ab39715b7f112713bf 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 8bf1a2cc2e791482e312728190aa3e2d70bd0815..5f78c5fc94dd869b707dfa32fa51a804bbb98da1 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 69e264742898714e029731300dc0a733e3df277d..3db9224de01bf6583f1d13604b1594c6b421908a 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 676a04f207ee0c3ebe15a8ef42b94053174c2446..33eb2b7b95dfaca5cb378dde83f92cd00e96ef7b 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 7081b3adbd7f70bc68121cb082598e2c21a5d115..d7e4dfc57fa8cc79c7cde3b6c445db9acfd24b33 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 bedaef014a4e75819530e058841b2b9568e3f7d7..3cf2c9010556896de0d87d2bad0f8f72628d49ce 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 f67a085124f7fb21dfaac06d0f0c8ef5d8275263..a77bfe7d68e546de5a9a3b548dc551a2483fb74e 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 3385ca585a5839773b3e34974b86bc0944043f58..96361c92b7d1451f801a228c901802b6dab02f95 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 46fcb1a128c3b9d3aa1bf40c87d09fed20d975c0..91e17f0c42fd243c1153bde28aad85d6efac29ae 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 d5eb6844e1e341efa4ae486d3afe017320a70c60..3e3c988397e559b86c2781d58a65608fe2b40f07 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 2a9c99900d99b85a02c324e6aeee805df2f3167a..5416463d9d773a82e57d21809923d29405509918 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 26b9136ffd1325147e5ad2c18446ede4d5838d16..d6c20973d049fb9b24833cf439a6347539eb9ce2 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 e8236d6e03e209cc38cb2a1568d6a02d9daf7180..cab3d51a634ff5dfb562b70b774660f00325eeb7 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 1404e31f29e88795543f549bb96e3a105b2e41a6..cc7408a6db72e26981fc0c4a12468ad2665cbeb9 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 cd140ee334fae26ab89d2c51202cfd8439c73877..43d29ade9df1185068a76ad6b2f9f04d285fc787 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 673aa1cdfc87238f736dd1b20117e0e1af3cf455..78971d98342cc50701dfa907638d66de72abd451 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 8e15f659e48316e8d14abc53c941ef0a87a107b0..e5b63877711fa4bec000002de2e19758edb97f16 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 d5aff2a91f79a2d57c6a866f55eaeab53c278d9c..a63b7cfd1575be24132b041f157d1e57c81ea6fc 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 63273349b4b53d2fb5cf0cb78d892e484735c936..2ce8b6c5a7fa75365bc920268736e2ef44694b85 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 8d406feb7f6057ca8e063361a9f5c3209f983fab..b9964ccae7f27eed2e00eeaee4ea2316b3bfb910 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 0e839302e210d448c516ecad0764b467f79d458b..6aab7e072735309e638ff11344d7d8d1447095ba 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 6bd5adc593ff7b9307acf26ddbe3cd8869e81821..2c09485f7f5ae3d2087e52588ed2cad096cac531 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 f9414e3cf10822022bed0be47f80e348da048329..6d2f08e43b374a2da3f65d4e88e57cf652cc1c10 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 518420faf1838a5aa5c8e12a274417762cec9ff8..5cff0dd732b895347278f9392e2701de67c94dea 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 4fc7eaf87c2ce2acd09e0a80abcca0357d3134df..f3935d6c75307be4d6247d4f56777c0dd39cdc13 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 7b76ff403cf59395bba32fc1da5a2437c70eb840..7148f264be60497249c37c1742a16476256e875e 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 2bdb3eefb4cbd09eeba98e261d9070d9fde7f067..b7fb2ffaa7f62a5ac9580311789466bf3c2bfe6d 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 72e8a51ff0329761a7745c226d3c399c03cfcb7b..602d18aa48d306d41adc90596a1113de132802ab 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 fca22a6a1b7053283a06d55ea2d8dd6e19a85cb7..d6fd5aa25290dfd56b2c0889c8539133efc5efae 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 4f13d9aa7adc06c7783054ae682ff580541fd310..510914934bb5fc4064790a905318e441df3a37f1 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 51972e7fce8e5d915eaeead88e7850e6c2ed8d30..3fbca140d3507983353c560ed950a381d67d2b06 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 6b05a92eb8372b6073b9d2b08c85513b90d6112c..fa9a1ab4e0075802d60d353796023991b907c493 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 43ebd9429ed31013702c4c66ee0572ded7bb6e4c..a0296a64003fb8cc5ca9ade593f0332a1ec82ec3 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 0560f2218e9937644a7f93e239973f109e9b13cf..e4db04d2967662828f30acca753e0dd6770f2cca 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 a5e34512245b33370a8ee1457b1105382ec5aef9..82f117fc5e6fb94fb88dd73eec61fb21adebe4b9 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 0237acaf7a7a23119d29a881703c950a2ca7de4c..e97ff2f39b350830747a18f5baa49d6156bd8042 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 19581b6ce0d44b510afacf87a2d3124b81b66520..572c83841d0f97264bf063149227bf590b773ac3 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 0c6e9ba607b4f255c088b3b11aa53b3f10fc40e8..4c6b47420db3cd4c11fda03d681eaf4b6dbfd531 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 4f8d8314ec46b7d8aaa23b840ff727f78c8cbee6..e08442353ba08b86790c3674531015e4969661fa 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 66fae89809b5d3e18333d5db5fe8d26a0bfbc3d6..bdb8e6a6704242f82de3190183e58b71f8354c1d 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 24777f965043c4a931a98e5532e1ef28ce956cd1..8ee370e9ae07985930f7b0d05a1377581c415fd3 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 570da7a66c30397639597344edc44b8bb9493145..cdfe3775181c7e0d218d95b75848049f6abffdda 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 ceb54796d0ead3b59f644037118bfea062d25481..378d2a2cf6a0d94255f0cb03225d4e268c571099 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 4c90352c2519fec48fa535305a8df15d655e48ff..5582121094bdfc5c01918a4df4f22938c8e4c2d9 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 d93a0844e82f63df909ce4e8481f3c696a4930cf..aab12cab12417a87c6d202c7c79f8baa8a57c3a2 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 11e8146e9001930266f21bbec56b932a8c9d15f2..64d360355ff8c36fa8ec20eacaf21700889d1e53 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 7b65531a06b231d07401596c004ea574adbc17c1..3d7ed880726ddd0eab7ecee12c7a9f686bcbaf14 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 d84e7c45cb9936b92057f42682554133635f9055..95da3f21ae344ac1bf43370812c5e6713bfb4e01 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 e75d4ab523d8d41d4dc2dbf59e14e6d6c54074b4..c36c02d49443a05e0e0a3ee0c386452a13dc1cbc 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 79d6f48b39238e3eaf98c49bfebbf8ece58a0657..4fafa8dcc600ccc21f920f53dc3fe18da0b6073a 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 99c02b1fccc603e9bef8c2e2a619bca7162f2afc..66901aef93e7f3078e00cdf038c65a529aeebac6 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 33d740d5c6a3c50869de8aeffdc5db325c772034..15f099c032b4f0f86e18347ee428d354b21be849 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 88301edd264229017bf8c6d1c1476a5dc30e0689..4738d5c8ddc7ba326ca9d2356c6c6df757829af0 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 d5bc773297c9c5233e1f9548d8a88a12aa30966b..e3af27778621412a98c2f9ce77bec8aeb2f0ef57 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 5f22b238f56296edd49ed82f1fe58a902ab3097f..5f455c71fa81179c34c76581e283f37e2237668e 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 d3d08873686423f9f5cac396c094b783a320b969..1f92a41b59dadb9453f8c530a2b49b372349feb0 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 ea8c4149b6925d92b705a61fec4e7bd8c8b82498..5e72b9460b7595477f12cc80ec7abb7635c5a639 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 3f4bbab9202168fb3704d7b00fa77f2e652cc301..c273f66d0b0a58238a942297154faf2a679b638b 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 ddc57c158a8d71badf31fd57f62fb1272846110e..c3b5f2f86648a278308ae80fe0772b615bc56475 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 7c9ce97532ba02146fbcfbd6864c9e90b4e96ed0..944b1d02e06b3ef2ff82a3ad3fd390601ad70055 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 8bff6bdcaba1a17deffdab225cee7451ff9c7faa..f1c99ca94a8a2c78f8ccdc528305eb44c2906aec 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 cb8affba4f0770809f2f74103c29b36633fb8d88..5bc4e0f88523209fc2a1ecd3de69a1fb26b9f2c0 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 a3a08ac96b8cbc085c48648d35f075454864ba5d..489601c978cc45caf7569b927f3811510a59bd9a 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 f0b2969f5a75f046e55483bcb90dbd36c4eef769..263c7668e50ca2b0546a97f560fdba11539ea442 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 725d7be5c0744b53d62d90fee288cb22a1f678af..abb5fefc22cb4037484ad877d52a2d1ea682fe54 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 7ed4c871429ccb6386fabb92efdbba1bb90cd96f..5d24bd747c6e82e05f3e09f79e8a701bae19a50c 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 0e1b93a314ed5b99790f7461b92c0bb16ea9e285..8b212aed22d99068288c7e2749840bfb058f94c1 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 c0d128cbd53e8adb79afcd8443053fbcdcf48a94..f3465b62a6339fb68227bc72cc13aa7e923ea156 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 de4d12c5bb784aaf8aa72338a26bb2a3b235d901..216d60246588ebcbbe59cbe04974988f6ff8a70d 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 415f9b9f7a58219ee3f97baaebb7000d72369ab4..8a10c1815bfde7aafe586de786b46b2e59b1d3da 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 adfadb3188837df1c829b9e0d6086a29d1ed652b..37a40d013a091dc548a58e04d98299b22dc402fd 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 7eb69835a691fee9cada03e9337bf8b63efd20a7..d70339ccf798975f599f1b340a10363b27131e1e 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 dfbb5e1603b64cad6cb94993576182ae2341142c..08c6834e82ea2edcacdb3674e12843cb6c28c5df 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 cf87bc607e955f942faecdb957e3b15b2d3552e5..af329dd93c3157435cbbddff6cf1d1b6c236ce10 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 8c8f008841dcfe08f208708088e2856f1643303f..5afb98671c112d2b9a8b83632af6b44a321a1eee 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 72f54c0c37099817dd070de2b4ddc2427a92ad5a..b9dd6bf96a95ea2e50e30899e7b97181418d769d 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 a638459949b02ca964ffd614f1d80b2e2dbf4678..bca145e1acdc92a8c7295c46b927cf070cb5fb25 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 2cd042e102fd3b116e359832d9d0ea58b770b5e9..c4262ab0cb9354f1ac79b91a067b55be2bd8eab8 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 0ac783d5830a6e0346aa8209176fe6cfebc6a465..db690783a8607f109fc52ca689ba06de3437e025 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 2d17f01f09c581466004b2ad745017fb23144bfa..446e44d1c8f673276f01c63f9307e0143ff00c7f 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 efadd0c1b2e44d3d60a3e85bf8c430f4d03d2778..1aeac9267627023faa64ebc9e1bbe1be1b2c79fe 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 ecdbcf30dfa7b3024364e8ff38a0a84da8486fdf..9e2e49c7528571fe83db30ba4034c92b431ef548 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 52b69e2d025632d52cd897c880de8ab89d1bba25..84c4a3fbc75665c735b12c4527953817c12a8866 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 982a8efe2266fd436792cc2fe5f3add7057749cc..53467dbdb0e4df93e2e71664e27dcd044227330b 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 59b1211b724ec34f794605b4ee13ffebdb6b1715..5619ad5110c3eb189b5abccd7cfd72af86479fcf 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 79fe048fd2f9f1a6ba566ffa7d5c5272ec44c88b..002fc8b22cb8ba69bc4b1c93e57539634c5e577f 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 56baa29e5d4a3a98a97059f0ae2c75e833ec2dc1..84d5723b3c30bdc25f7130ea1d794a4521e17ddf 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 0375176b1abb8b4f2a12df43349fd8a1208398d9..73dcd9c3d390d9607ecaad8b2998d5642eb45c71 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 dbd9c8ffdc64e359f75f98bf7ff4b1d4ab4d55b6..06f771c47ebb51a9e6c4e3c6960385d86ee16e31 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 09ebf6f3e40e4660170cad04736731a32e12a237..b7b8bad2e329168da6ef02e138af781d9068ec42 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 6589ef4d708236ec60ecadb0d7362ad6559007c9..e683614e6721b47243b138314ff65091af085376 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 25851c90de2612846039477cc131e2ccd5f2911e..10d7d7b51ef5435d686d32f8bd0b05105050b415 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 7e975b7c37dcb7c41ebc9222503906e4b647faf6..93a28f814d25e8aeeef9640b0880bc3ee02b106c 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 0658ea48b13f2f0aa100e6837c017bebc7e8bd15..4448cf521c1e5f27ceac04d4fd915cc59630d896 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 4db5f4ac84da668cca7e6d99a4de609df4eef160..df0a316225af4c9f8670c6c2bac6a7fb1fc34d11 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 354cf738f5f44a565d50e17c8eb38cb4420098b5..f6e4ce0f565c0d020f3478d790a2839cf7893899 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 489ff648238aeeabbde922809e45fe971761b1d1..74d558c8db25ad80ba095e7c7e73d3312e31a991 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 0c0b66a792a0eef4c62cb505ca20b37ecc2f458c..2e72444b29079199a780a5a21d1f9e3ecc7b87b6 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 292c40d812df35db89c8e2b093a23f51f519434e..78b64cd1462ae9962d2060b95926089be1682eb1 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 7ca1a58f243143a37d48ce1d552af6ffdcf624ae..e16518d66e251212fcb50de020b98b669e8f3cb5 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 0a6bc75cd9029a872ddc4571032f18642153af4b..14e969491d6d0925108bb8e87c1b6482d92b9c6c 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 5efc9e058cfe445bea17f4f84bd9b3af7b596032..d4482f8ea1ae529bbfae7d67af4d42f4ea2ef855 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 1569f2bdb772b24ac7f7a102669e83976249bc47..bfb68efd70c2d24859e45a41d924752253df7092 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 1effb575d9960edd9e1c5701ea76266a416f7fd4..46ad0cf82ab6790ea379c216591d1a7c7130db3e 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 330a8a951ef1414a7e213810d3cbb399a12050d9..e845ba5a8e4336c72e694bd37e464aada1c02e8a 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 231e0ebf33722e08d2530b6fbbfc39aed08e4a9e..4817177913379108d3761ce6da71db6777d9fbe9 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 ad5a560dbf5355f951c3a336bae49fbf732a8af6..8d5be7f7f7889045f17b38614212337e92610ffe 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 89b6795b97f06d686bf2db3019422ac8c662c6ad..b34b4b0585f890f6af67585af348bb9d28eaf09c 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 ef18d47fd61e0405eb732a8939d19458112d200a..3f94fd20bf0b56dcdddc8f33178ec132e17a3fa0 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 4368537699beea3991aea997d6f14ef4d42f8ba4..e3ee6c3d72744cd61cc3aaa947ca183583bc1889 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 c3d5243e59d081fddf0734e6a2a65dd80ca59f48..1f0f0de529e3344f42a469e7b5f3fb3545804008 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 70ecb1f620cb03592378bec771b41fc5a128dbcf..175ae88c223cf83d5f7aec62e75f3653311b899d 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 3d92508fa7515e91ed26476276a3f2eb9866d59c..82cfeb988fdc09824ba1911c24c6cc255a03ac40 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 89d256c3816faaa486db95970ee9cc5a3ec6a38a..daee49044072a5193c2dd7bcbca4a9b62870dbda 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 018a2254c5d372d924ba1426edb9ab7b59b14dfa..fb8c535e1c73a274782af515091a78849d5c8bf7 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 3c9135b415a6483dc503975bb05d3a79727d1c70..ca241aaf161db19ea9fd9ea77078d9e3abf12081 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 d4764e970f5605da0febc8d731baa587d9e48ba0..7ea8f0e39d07d6929722ad8008001167f636ab5f 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 254325ebd268430fef6d7b38b9f58202b39ea063..8dc87f8b57ba2c210288388e16e12776abcb2d10 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 40828098cc5583ab584621e60af598942394890f..f0856dde78360623e8f219e11dfe48cc99e10e77 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 93adf9a9885a5fd41986eae533804de58647a654..f0c2002807ea8790d64ed658982072fa07263d4a 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 07b2c0edb47cb379646f605be63ad86bb228610e..f0a98450707a76e7fd4d662a9a0e867940892226 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 b6f1c0c43674fdc10b7667fba7228bea0d00106e..9b643e6950e2e370760a44565241cebb66a39005 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 f6aa5e9f5079c41ef0946c35bb5e88002e09abc5..0c4d50c464ccf031893b9a90f85cc876c91e54fa 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 81f4a796ea9e5b145b11687f8254c7550cee0829..ebff592913fe472340dbb125dfb198d656c1029d 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 f9f7138f0aa86bf2e1553a6a2771a000052ffdf1..6f32c37083f0b0bd44de945dda8ab4fab100a927 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 94ef38af8886147b7824b1604d04e4d1467981d3..f5a0a796f06ba747e81c26191489ed5aa00f5125 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 ff7736e48ab84307f94eb821c91324a9479ace27..701098a0551cef9f03a3dcad6a89c3d8b1622f1f 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 b97b741baa23ea79fe9407b2d57d08e76fd491de..28d3d8440e7290572d864fadb6d8852f8a19aefa 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 1e5bf1915c651e272ea80c0bb8993654817f32a2..d4d48106c51e56c4f7822d87d7e4c09057ad71a5 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 a15faaf90d4ecae9a00ab4670b6069676fc3e50b..00889be61c7e0766086b7c265afc6a1d53177e72 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 a1194f5ccf2abf479e88665f148d07d5e5ce54a7..86958fe1f3c550256bec29d204149235ca2b1c82 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 289588ad228dbf094e32df89481892586980235e..a62a5d11a81ba34f93d73df87537f42d3a74053c 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 c059b05a01074351967a6a821f4653960a8110ae..1f96a0dcb244cb51ab749a2586d65b288b75b770 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 767044bbe40fa78187e4556b70ee9b4c95839f17..fb3f4e6e4a485038c5ac6a880ef5d79d1c0a93d2 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 e81d647c80ada28aeb495df02a45a6cf53f5fd72..48342c556586bc7455fa61d73f5b7562b863cb17 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 8e3434bd91402411f65b596b1b822fe0967ed4e9..78f274755de789bd627322a4b747946226c8932c 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 5e458d1e0bc971586a4b9f576e55c3958452afba..63765667a9dde88c42849cf34047deef713b74c7 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 1083ebd1d9f767aff533c1dd45f5a126c3ef210a..955542e3a4d60859adc24206ad2acbc1c66c7e21 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 47b8fef3b45f460fcea3c4efd36521a75fbe9b15..a0689bcb1df0ed53333a9dc6a96d00dd3520d546 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 2a286d2341d2aa7d5180a2c12e6670d8f4af61ea..b481a0975503421fcc6c12b15c3c91ccd40a6b46 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 1d1f089d8b1332635b3fe2f4b314b7de7336b89d..32202e2b4129ec3c10eea86283f77182680f2eb8 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 805018675a8a9d1c075eb50b429877c450ad6d90..177caed07d40eae2266000e5f9794a784d7146ba 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 8db4b279310d30bc1043d001e57dd2f1cc806e17..799a82ecb0c081ee96c4dcfde69dd471681ca18b 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 f87af8b4bf1236d67d58bb7c1f4948131ffffbaa..c58020a5ea32f3ebf28dd07930b9a3260514e905 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 8b7654412bba7c122b37474a129d792ddea3927a..db22f394e2d1749da0f19f2a3148a94012ae60cb 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 032c98afbbf41eeb313681a1ebe88fac9614c6f3..cfc65276e47d587141b051ebdc9843bfe3c71962 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 e7af3f37eb8f1d69cd8d1743e61af9c230d4fcdb..7a4b048254559248584a20ea087ab7a5119649b7 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 929e38800f17a4d1efaacfc30191c4d0f2201708..c1ef0b57a7426ad62bdb77707316fbee4f5dc9cd 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 dc2c5021eef98375a40e778acef558ffdb41f4d7..c35c2ac1467aa011b33e0f1bf8ce2ff58d2a87d4 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 9efc93dd197c72624a99a78a3e6dd1587df358d1..9bf0811ea052796b5d6cafa8f35a5fe4c164fa07 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 3133e13a5faf041a36758b8c13841ddaceb063c1..f07483d3de13821677e8a32b9348afab22fb4494 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 0df5825f349b122873da6510a09e1a4cbed2ae7d..bccf5a3fa785bb7c00b37e475599f18582a072e9 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 a6676c9a31b4d20699b490dffed5f39d41c47878..d6ffa178334afe40a5f37d7973bd914c82053950 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 c7816b41335e004004dfcb669e034e0155f8d44f..60dfe87af2f703ceaf188bd680bea99c2fc289f1 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 da66cd127b88ec2d9d02f757c4f173968da3ee54..879156d5cd5ef9a6ece2d85ec6acd191fc58b5f8 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 5539ccb25fe5a2ec6761d0d791ed274014311895..df46e178199f5fd4cb55009da12a55f7b9e17637 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 399537ac7d304684a02bf8e3bf95d27fb29e2620..cb0dd0137a9923ccbd3257669b171de3cf80030f 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 b9c162a925afa83325832fd09ac839618ff4d864..67f96def7a49c81596392945b1f2a64caf24b656 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 0548b0159eebfb1813300742207c0d45f3971049..c1865bf6b53076c45337980ceb3c9b21e032c275 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 e35a75a03b80e240498733b6dcbab25d93acaa3a..94a3b8c0e6eb14ffccbd91eef5778f3aa7b45379 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 a46e9b5c19cf45f55abc3549b8e43cae4f42937c..934d7e49840f7b0931b8ee49272e6d777b52c55b 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 2370b5801a405ec746d7373337d4d1eacada985b..a01fbf2e36713807a19bb7399197c1d6199c271d 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 19f5eca8f5ff7bef14f35a18af1b0996bcec2212..7188c32177f1f980d101ef55b3bc9e9337ba6e06 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 4dc02cb0bf1e6be8766c828ec58084a53a5d6fda..d11cd52def9bf20e9f0aeae969a1192a4101065b 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 00aa37f0ca4210f69e6c2bba15d3c29eae94cf47..9fe4134da906f203fc501a3cb3b77ce4c980ebe8 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 971786e1e49551f2f7d7a887a989a8be8236e820..90119d591dd8bef399237e6d67fc5b30830cbe5d 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 b5724430e25efed80875323464509e60dca28aa7..12409eda8991cc83be3b1106f7cfddaa614ac4d8 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 f516e71256cfc7a2b98f177b762d7a01f5029410..cfb67cd49b17d16d40eed8a16cfd641c457bd56c 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 f216c38a509dd4c041f5565bf80c78477ed391a4..a34a01615db376061fe15a8ef0cc01d91ebe6c93 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 b1a04bed6b9cf013d2ec170fc4d59abb57f74124..e58190342fa446a1e749db555693dba1c3c4b7b6 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 038621fa3c66fbc8bff4f484e017da9a8c7a3d8f..3410d6589b0b2ec15e65525e03407ca303e2062a 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 b75e7c799a6e4654e326af67d7a980795c988199..8f11c39db15d8180ecea16c6b84d53446a97a6dc 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 bbe2a681b479fc08804768e0855024ff0f3cb30c..4e71260fefc5bfe9cb87e7ecb140c1dda1da9fc3 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 2fb5fbe318c1e378bd995afd2df3abb3e335f8e3..33367f0a176b81c487b599a474330a20e5ec564d 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 69e5a373d7aa2c3749c2b4b76b80b6bf2d70f1f9..9b4a18e0c803f77bcc7ee4c42b4543f96fba349a 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 bc33c32fe3e3a0cdc086a7881f1cbe8a43654e0e..da8c0f8fb8c61856a26ea41587c4ccd3e8a327ab 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 aad039ac639a21ee323c46d7e4227c915569ac47..a1d8138250725b8c72bb3e571b9a213e6079ff15 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 df97a0c37eafc9127665c3ec2de5848aed36d163..ca0a82432b5f9e8e0a38950bdeda648a340474a5 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 19a905ee6704690316a33f74100aaf921b16c7f7..93ef8a39dadc875b6aa07fa4615f211fd1caefff 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 a74647291a820389e6b3951bbfbb69f3c60351d0..17c1c22b4e008b52e91cfe7bf97ef19dab6891c3 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 2b7e4c5515c2e7ee85e263c0c89017ed82855777..12725343a4fb50aee6230be046339d28be5656b0 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 7d23af1a1de293298d52ffc242f5b09321063db4..756d26caf5ba1e263115a8ebce54782f3b2d32d6 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 8d98e687bd9b2a353de90d4ed119877b7ab3fde5..362e88c988b14ac6fd35d5340e46921ea126a322 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 49e1678006838bfa33ff48c232ed07757b735ea9..12b76963a6bfa59dfb1e98241fdda1619b78933a 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 bb2ff63092dc9d62503da3fd21113b0237287a8b..c284256b28417fd389b328453f386ece759937bc 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 b9999360cfc2cc14caa5744f3807d1e0f7e605c0..a8e94a6aee27372f73344dd3379c95c04dd574cc 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 85a21de324d86bc907ab4f7631f85799ba84bbc0..c883a865d587e8be1d2dcffe6cc10cf483c2c16c 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 bc3aa9ef98f6f042cdc06408a03e398b21f51eac..dbbee20a627fd99063b38d6efeed468070baa518 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 1c31ec55c219cc6bbc54c4c5fa2cbc448283b64b..1025c7ef6fe86d30bdc7ef2775a2a976fd57b027 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 47168671e78ab09b88abd217ceb7ca7fa6eeb6b3..a201a8c4a7133ccdba59f211795a973863afe8ca 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 43fc849ce7b56f116c0e4f1cc89702d777014975..55500032c4f49ddc1099b228cc5f6a2cd7b16667 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 f32771c47137fae5c2263fd198bad826986faaeb..463ff8fa40b97d6a21f8258ca90455a7bd557d36 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 8c42f3b932dd465f85cd75e409c4ec1fcec26e4c..340aa24aa52d8fbeeb8c85463e0f89a6a6ffd772 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 004c3235712a5f43fcaa1a9a25ff6af18e19068e..0aa828acbd8a672c827084e9edc5f598196855b7 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 9eae4384c90b5aaf21cb04e657c3ada4e81fe6d9..57f591e9371fc6fb6aabe16b345be7880ddf5043 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 9a8376eabd9a684ce1cbbeb42c29226e84d30f17..c6e1e90937f337f08b5b376466fc5c39dd3c376d 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 2092061012e551e01ad85303404497607bccea6c..238ae1c1496137a097812a1128952935372ddd35 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 182d131c7c922a4f2d4a2339cb2997b3dc4109eb..f9c314580866398751abaed47514f3bdfa1ff2fe 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 466727929c82e8a22ce0dee0a96e1f567fb2fb55..2e1a035317556ed0d07ac0f170a25b71b627fe3b 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 272be1bf867e5d2189ef8b86318775b2b8ff5521..d210ad2966f6db8cfe80fff9385ec98bf222cae5 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 936afd4b302fe29a826cc4f47a327303df348f18..f652bd6ba1650ebd6acbb29f86f99fe3498a6fd9 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 85bfe9a775613a8ab0daa3969e507e00fef2f46c..ce9da4976f2aaaf8f8ff47b1f5e02544a2a8c822 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 e1a3f840a776c561591c4548bd63d6f0daee975a..4eb24e239868c847176f1f535a0b3524aa115131 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 792db1b7bc20918ce4c074d6f60ac63decbbf5e0..20fc989f55c21d3bfba87a30f7fddf78370c31aa 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 d1ee54667fa9ae7d6bd98f35eb53dd7ddd0687cb..ff30f24de13f294284f0df3bdfd5c5e569decc4a 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 db542867c8cc37b1b24d138d73c4151bd9272887..0d75ece1c00ae77e2c28d88b407f8b8a75d3906b 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 0492d97837001ea3b633ce7aeb8bd5ed12b49b09..a0c28a4dc3b51ab81140eb23abc1c9ffd263d44b 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 bf8405e440f5efdde188b11a7b06ccfb465c2a44..a85eed1b3a9270d231ec1ac29eb0140a9d435c15 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 8c46a5cdc1acabadecaee1c7bad51b5d2c3dea40..75be72a6b3db7b30d5cc1716d3067f9cf02abc70 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 472d34c2c5102bde83ff40dcbc7e34155154e982..8b5d3b9d56b4a99573feb1320fcde955df5eaed6 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 c9fe89f4124ff075d402b141d82eb734e1e21ee1..a72f5e6145047abd69629c86df9c76be75e3365b 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 41145a6eea9fa3c11d6558bd405cab6011e1273e..b2a988be50fa844ad357274d02d8906f92cb8ea3 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 2bcdf725e368f6658724bb42824e59a074d47b65..99de11ae2aaf2d132ee274a0d085a73924cf16c0 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 fdafaee5c3b3333e3acce755c51c1210531a53a3..3d477952a7baca82bad6e00e016862a56066196f 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 414797a17854c83230975d6bec4aedf374aa667b..bc0c82a397f0a0db7ca5faba94a6c0959d33d367 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 a8911575a82de205e5fd3782bee2820cc573add1..c78e41654681d683ffc0756534645916b28caaee 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 0a9a63d18f4f9c93a987a097649a11c539862835..fe1aa6b6ed08ff5c57824a040a10756d2b5882d4 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 b3a5f638cec68ee3418e8905cd09565e3ff06ca4..a6b740dd2657f7f4f5e20b1be788732f89aa7468 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 d5ff63fe2b4e6bc4e175e1724b1c51b0ec46450c..c74027e4fe2be1e0f201550c46f2263a82e4aba5 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 ea4706b46d849ebf6dadc4d863d780a5d44d4b55..eafbdd099126da56f213cb9147a8e52927328fc7 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 f90d7007128ab829b2398590b735c97f6f665a78..db33ed4a1c44ba4332185a20a5f15cc59ae1e4b1 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 2bd16dbf40d806c32808e650f5df8a771023102d..abdfc509ca9521e26577f60e6d2d701cfe7b9612 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 94a83318c0f43797313137970b6770572f4f16c4..d1daa91177d4a790f2f4babd1ac452232858dea2 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 d46076f954523c4f537f4b7f9a85d40cd53917aa..4c195c4ef907fa3f66ce6c4dafa623d10412003a 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 e3ec97f74f9250f58609d6d24341f97dda145655..2f7833e26936aaf3252f37e4473697191d7eb051 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 91bcc89a0ca65540064e72334000685d3afe2dba..646a00ba1f4e825e82de75dd0f0ea63b0bb57a10 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 310053c2cb4aff2cf9310d196d39b99baa893f68..707cec6295805db3d4280719f94adca5bc668e4e 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 eb10d66d0eb59f7ba3b370622767ad45a0853455..a590a4db8d6a21fe92b22463f33109e89e911a62 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 667a0b8e53559e4fcec99d207bb10e69adb77719..7f39283f039a63bcc461642b4ef5b4761366a955 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 b721648e07378dafc4d718ce9565e59dfc73a2ae..124b107e17fdbde683e6f2d9728fed09ec6ed721 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 180655c925f57fa183a5a7c379d4e458962a1752..b32e1b6faaf90a7ae07c82d154beaa83d3b5eb46 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 0ba075b6352f0ff7d89e38920b94f9b1e9fa2c14..4cc56788525fd14a9af1c5afe71ab196cd8134af 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 8fbbf0d32882bf3fe276640b868074fa535371eb..f0451d90a988f9548b2d08de4f29765455a4277e 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 9ee1f5195ee69cbdb476bdf57f4d537b290faefa..58b6c000afeb1b3e84fe65ee7da79cc43c2833ad 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 3766ace3d1c3db7cb634f8504119a9db325df511..dc2ad1eed38caedecc5e56a86f230d8a6f11ee4f 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 291f0ae0978bed3560e87f867a107c71871e8bbb..759ae2e9b4fff63a74be2fbae192339b04869dbe 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 f3e3a852317a064739c4bc961486be617a7f9ef7..a4a757dc0770f790f4e7bec77259eb322342fb1d 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 f679c68695f017eddc668831fd065c13373c9003..edf2cad1ef1b4aca5012595c0a9aa4126278cc98 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 2ad1d1cff8fc41f084f30fb08665c110d4abeafa..f6fa5ec57a8bfe2bce23f3ca8d6c6d9ad8e6eb8e 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 c27389ad02ab7d0d481693252c9cbb8c63e58790..2efe831984be49d80c63622c939f53528beaad04 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 220db90426e45e102cc697d4fb177139105d9faf..3377c1769dd9c04183e8da3d8f007a6cb9138a93 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 f9c5f18af051bcf77cf15a4a0bf85ef1620efc31..dedc4ab6873d493975d22d911a74e90106cf55ff 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 d11d8dd414f7108c7ed4c14fa0cfef06c6b4a1cd..6964ed6df4416f200f04450f859ca6f637f26c7c 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 5c6609fc40ec2255336f280cf26a8059f948c6a6..52a11020c4a12b7cf16dcf48070eb5f9b15183ce 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 eb59179d98e8890bc58601f325839d69e9ec8f25..c64e232fb269eeccb5a55d11147b2b8d59261760 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 9c3c76d0992e9e6088b6477e15e70168661e6f02..3442fcf8edbc42548660a79a10917d893e9e8416 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 7289a9855447f336cf3ac5a32d052fdc241c8abe..fda0c48bbb6d4e917162ac680ad50b12ae8e50a9 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 1461e02a89ddfa5e0f2c3187cdb7e9de75fdfa8a..c7196f9bf8e19383c6a1aa79a7e7d8eba1d2eefb 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 0498552ca1dd46ae44754e2edd6de1e7afa8ad11..3d3985a864b061d6742a9fbeb32e4c764e6b6648 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 fc32cd6e2a60a28e8f51c878b77e3f721225ce79..4097553f0d09792554e910cc9e53f388875fadc1 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 cf4bfa9385a014bdcbfcb8b1b272fb97c7ed2bb2..ce4ac00b61bbc72945627b8e89ffb02d21a5f62c 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 0d6b1d7709cbb01d1c2c9eb716dc4b5e28ef26e2..4a540804860a433b4b82d4718efc19ddcbefde72 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 df765eb66010fd0e0a3871640331f0e70c17ea21..9096a566baa35392e70e8958eee6ca47869fdd76 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 c21ef539f27645005d9e7ebb731bd74774926e6a..081050cb55e1c5c1287e126030ca9beb88c37f26 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 1077776bd04fdcefdeb4ec89d5e0ea0cdabd6dba..0bcde48a92b11ec2a56ae0ed2121cfaa7d9d2a9a 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 9678ff8e3c1482df6265dbb6ca2020dd038f8202..ff6a60d3ab8b2b4f6de0cb593420e4820c1705a4 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 e2f5930a5f2c2663e15b7866af626157a72960df..bafe54eab114a5bd8d13dbfaf436cfcbc1d3615c 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 b528ab1b9f6ebbe657158982813238955deaab39..2d5652faab9701c1af518b65a51aa84b9b0b1563 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 8d4e2341df1e05c27b6c17c7e6870d90be8d48d8..034db16f14b64df7a1ca6eebce4cc538ddb3d57a 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 06a403e1f07d808985153a03298d5b85be546d4f..9ca620f80b29e13701af4f7c28afb5814a103861 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 536e5474289570406c9f2498b72685253b7f1bc9..9dc5dabbf0c20542272522bff2219153a0da8a7a 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 881108d94dacca585f540c1e399211f630c0bb52..f8992b694758bc4086599c62ebc12fe2536f448f 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 891fe65a8ccdf67ad533fdd75e37f122b95cee4c..40fc7ed87692bd29199b62a3004b1a420d5f6e9a 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 63e65c03c3af3ef677431476dcd0dc15e254b9b2..f1e77ca6422e420bc9bd2f27afe07e5b09823960 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 2737dcdb5357cc55fdc207a227fe0a689e089858..9e1d6fac82300df0c9cd53ce3393f44d568da061 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 b1c55dfad4e1b3a88f0372f219471feb0a4200bc..bfda08e86489a406583a5a4b47114d295dda8ee1 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 5dca86e8c6bb125da13063786b26b2cf8f18cc17..b534c39371fe3299e88e7053d89ddfe8f43c89a7 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 a13e6cfb400e1194cdbe73bdf1501cc0110aa18b..b5bc724465564c2696d44077275792569efdb3de 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 5a65dc174d2c9b52eae5e1b798b927ff3bcadb0c..5168325ffe8bdc81ffc2347bb2f3467dd6562433 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 67d9f09fa7e4f94eb60c4baf3448eb0136cc9786..043b0cda9c947685a9aa40c98bdef2c494d7a89e 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 a3be868ad775e11ef7d6c97cad8724b679fd4010..b4a4e7e9e3dae866ab72f948e19142e288ea48f3 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 09f6593b72a494f80aecfbbf50b2608afa5248b7..33362eda1405a31f148afd043c7ec48b6bf0c1de 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 4ad9c537372878b5e12b684b208f99404dfebada..d0e82569e1a6228b12680308555beccc574e499b 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 691e5fdba25fd6a7cd77a379caccc6fa2e8128d3..1b6a725696da99cbfbe8d301bace0b973a38485c 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 00c4d1b9f9bf94da73dd197be2ead23682f935fc..195c854fbe59e839840c8b1d8b7142ab2706cce5 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 31fb90256f46c541aad0971d18ff282c172ea4da..e9e448ee228bb0400aa3053988f19d7b20050035 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 1dedc2966819c181c60c9dfc2c515046439f85d4..1e72a68ac27985cde8a4b635d67bbaaa083f10ba 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 57742da98ca05fc200bfac9041d054fbd225aa70..8923607c4eeee4955c186db0e8ffbd213bb9bb3b 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 eefebd1f14743bab03e32de46564dbba4888850e..17deabb74ee649acb22ea77ca03177cbff2a19af 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 764622f17cdd8cc2bc28aee7dea40aa3e6800fd1..ea9bd6e517a899afeafe4a1847433122b2c08833 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 31a25d9ce9c3187af04da9fb3849cec7b2f25aae..15a519de2531f9c6ba34f025869eac12023641f7 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 5935e83617c49be63d101ccfff14da3e1b5504e4..4441183293e8a2ee44773698b55066430ecec35f 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 8f3ec2ff7be25bb99aa64fd36550a80ad11f913b..302110a3335f95299e32ad76ebf06b9db4cdc52a 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 cb80e54d4a80475bc0e93ad1159432310193c431..04010a081db4f5aa2e5ae1520e2bae3ab06ae98c 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 61941fca1712b3db0297c80eebe5fe9cee50f63f..0ba6b8f74b44897a064763a8ed3eb1664c642ece 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 c46d00367d62da187bf1003e8bc5ac35816b5bd4..5c96ba5fc97337a6dd384d723bd49ed96cc5df8a 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 c07a0d7153358aba3387c0fcbbc4e584bee06fc4..ac4c4b88dc7cc3f23785cddef299365cacc3e045 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 107e0ac243405661ab28ac865f3098864c7a01eb..1c5a83c39adccbc79d5aac2acda5af936b47e9f7 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 55afbdf65ffe713b3092256d24538b45e3b66815..213aea77d21c98e37ea37cf53c93d420d909a14f 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 57dd4e05433a4ef641d3f322ba063ab6072551e4..7a5fce5d90df7ee13b20708109ff040d1e32092c 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 7ec421e1890efcb881dfefe2e15ee7ca0b5f1a3d..f40de9ee361c722c6dd06db380af1256dfc79505 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 4a121bd49edc3664b8b06b2d078723f935fe3306..cf1b2e4106a434af56e51549ec73b5c03e7f2771 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 01bcf11a18d8dd717b05c039a92fc9e1eee1b11e..ba13d39a274bd21b2fe8a41d1fc0249a14c00629 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 c9d415b2506d6abb0cb54ebd5bf7b8f1016d4963..1cbcc5a003957ac088dd6c5e057cf6ed1bee275f 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 de9e32e11645dc5fb315354a21ac996a36754f48..d8c60317b7cfb4a52a65aacb9b156f200b18c961 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 6c4ac4f777252919c60624921e3aee2ba7ada65e..941190da4662e9c695f29a574eee79001b73ec93 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 ca2e578bd057fcd6775aea2f9b0415e91972b80b..8146851307396f094ec28c2050fa6607a8b2a8d3 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 df25dd23391a8630a9c1ec4aff168f2d3a3a0900..43fb342b3bb587be49e19a1ac8a07e8fb45f707a 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 8f200320b6edaffce605791c29645f5b915d65df..6edae420ec46540575dd0c81bc4e1a218328fd7b 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 1d6e0a72e93158fe78d52fb94535e14f82439dc0..f9b4d24b481abcb38dfa032d43909fb473fc0898 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 a988dad9534f41a3f59a4e860852988a86bb1bd8..afee3258b7fe0937401eadc888eaff6bf063e6b1 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 5de67499a1ba8cf948f5533296240d60b6aa1e46..21862e9675db6bdb97fe63c49f555301fa374bbd 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 38bf0952cdca167120459ed3c554b3105f21b634..ffa8d615e379fa583c3cc17cef4bde7bea61661c 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 5536f3574dc506db70d60183e42a2c26fe5f3556..6ae3e90b66442cb6248d05e0c6717830444eb2e6 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 e5e04d74052e246389acef93756f6d56bb0c3f43..6b9c6e559322583b59b8350cce3c76ec3ac694ed 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 c39c8343b1421ee1712e10d8f775191eb95f81f8..9ad1edd7e9b758407fee7853e3e14f751c63dbf2 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 56e96b5d937fa8e08334730f76d1a29dac596732..4c36eddcbc2166556390c6462c918f6b830f1e1c 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 d2dfb0e2b0293db18d9af63860becf7ee3ede86a..34597a830f3e2600e1be1a4224b8618a653a838c 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 c4249fedfe6841dcc844a9810e376e3096613ef6..16cbecfb1295f78c84649efae9a8d754657da73f 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 42554f7b320cfd157845aacd07287109b6db221a..1d92aee75d92b541d0ca0c5a2086b3f98b7e3ce0 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 221dff811bd847c95a00c9841e7df71688024e55..b6ef03410cd209661ffba1df5e01d3c7afac7039 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 755da864dc99d4b2700d1387418c02baac8a70ee..e0e8a4479e4d2e57c30cb45836d5c7786750d1e2 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 65fb9173bc51a023112d49c281f0fcf50f7ade3b..8150e1797f325f421135e322a43720e879392a9d 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 24fc272ef307fa3bcc4749bd9a64bb79c69dadce..64cf0930360457259b0c77764b980c542a905905 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 be749e7e72dca8f850b9b7522647706ac75b27f8..ee71a023c55f8ed8ea2cdef8974a8a89ee836357 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 ce09a17f5b5953562924e75927e5ddc2fa61b941..a1a2a097818f8b2550d4279cee1968b6677b284e 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 f5b72d13b618bdcc6f65c9a541759f84a1432feb..20163ddf1bcc0bdb7271b8c4d70704644c8f024f 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 54a6e1a3c52056ea6d66fdbea57fd285f27b794b..cd6a6eb5645b567c9671d51cffa99a00c696b433 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 6e0b700ae7311e6adc9aa6c9ff17a76b337daa24..5bd69aa7c5f6e498d961d8d93d0400b03f73072b 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 d1770b790fd93e2ba4248e322cf2b8fd920a87b1..b19dd64bfc604b39497a9ea212ff40e7589288b1 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 2c6dc12ac8d11865f3bd9aeaf06559c980bf92ce..2753d637fca5cb792197a76a8666ce46477088d6 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 bb9f57c02cabe399f8a2ec9355992662b854539e..6fcd4a1580dc4d207877b64ccaad88b8355db160 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 8dc73481e1c22644a87788cdef68f4ba11c87a4d..0ccca8c01af0eb5c9a79502660720928a97ac512 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 cdc2fbe14d2757116a569401d1f9d37cdbf27f9e..1f2eb540ee0f03e62456d8ef5180d0a4ed993208 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 487a9a20dd01c08f0a4a247e025c6603abf4fc93..12ff96e9767ed9877d86caba734eac0d44275783 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 27644fdc6da4c1b3f01ad8f7d708a1ba57ca10d4..e6daa5a972ca94e813df88809d2d35db24e1964f 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 9b9dcd3e0b256fa7a3a37cd5b1e6216d01e5a73e..3b1ac382c0c573c58e82c3135a6c3afe2de63eb8 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 8608f1e7e936b0c5870f72c5e1eb44e111beea4c..00fe85fef686e2ba5b3c618512dd06665946a55b 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 f631d15f484bb560b32aabed99168242b0af29ae..33c1e0414466bdc33372591f4102c87ea7ba708b 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 c068eb5f5b4016e5f9029d099d35ff9ff6ad0094..7c05b5ab5cc03a77253ce5c6fc3b76d1a9200cc1 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 5ec587e21c54b7292d989e8fe0b163c21ca49e17..189a46d4a13c17ce41d130d095f81ebc2d0346e4 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 a13beba80b654976da5568c53185f1332ed0e0a0..75cff7feb374d4eca358578cd6bbd96cbddd8a2e 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 1493498cb1cf0c55fa0e7c3c4a131e3e1acfb8cc..d8d87dfef5dc3387d0155f5111d6f3f9856042fc 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 5c8536d5fdb2643d095c786104d1550eb8636493..f3113cb463acae6fade9216cdf8c79e9c14da6f0 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 69103dbcca5641db43c01866496aa39a2f22cbd7..ce70d17533c5dc14e444f894a6d05e0ff4483fa4 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 a857015352c4d6af81bca0391f4e9918b2641ae8..ae95a72f50197adc2bbea3ec5cd21d62f47f1db5 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 4eec831f29d0e780ab562305f099cb283509f9bc..0c6b187afa16f8a4a9b25e43891e0d9c7ca5d999 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 a30c61a70f0f2fe6ad7c8498e0a1fd0a83df2b80..0ec240560b7bdf842ca23ae835feaec65f85a87d 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 a7e4bde75ba09a5f4bef0e17649ed666701e787f..12f3a43dad41341517bfd9276dde8c11a7a41673 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 7e3173dad752ed72ff20e381b780a8f1d4012659..9b5ec6e35410b8d83aa672a39bd68f80165bc555 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 6d95ed75e535a1c2e70b63000a1b3d421a1c84ef..217e6f08f514f617b03c5a39812fc4bd6c4182bd 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 43f8ad997c1c809277ab46b792a3f0ed87308ce6..bb29553446bd496be9dd8689b3dd94643fe40030 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 1f7c8244b48b822b5d5949b08130054783ce84e6..887ccb2e7040a6b569e1ad95fba469b60641138f 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 029fe873a688ebbebb5148df68fe38a53afba93d..41ce656db52818311c699ab0582aa02b60e39760 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 eb83bcb2f23e40975458b36ec6ac2e7c85e8799b..b1abc02baf510ebd3144b78a8d012394de6cc8db 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 31e33a42d2b17e77287b0a6aca186ed133389c89..54995f0e6d6b326cee92344b4aeeb1c23696d610 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 e0d0ae47f40f12857867cfef3bbc28faeb4665c7..9023b33c7147cd44f9de930c28566444d0b8a227 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 82f14ba16729175374331bb94f76610ca4671c94..81a563b3f0eda2131eab34edbc551b59eceb34a1 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 f50bb4f199cd9bd072cebc5398e0f5055de2b42a..b4163a4d481ae773fb1fd7aa648b04df20869099 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 815c852533dc0f3ba10c59d432e050dc73f3906c..0a4c70a931aa18c66c923ef70684002c86c227b7 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 2a0f98a8fb849c5a18510797e58877fd1cd76cfe..715249dbae36b9ed17152f1a18f840bfa1dde807 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 f82797684804bbb9b262bf086e5c79af6d6d5afc..8a285f3065a5c88f08b45ff375ac35b190a8286f 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 29a8893484aa01e3cfcbbc27af9881e174a29b16..ae0bf1a0db88f7de1139d4a46dcd4a6fed27b8b4 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 6d85b0f1ff24a77a5437ab60bdecabfda99a375b..e7b4c02f3934bae2d4c6b7815dae10600442e7da 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 0692e9685f876b264689bb5a14995fe27dd34b73..65fd9477568f76df51b0aa3a0f1c6791a9a92759 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 b7dd115ced2bcba4e4205005f42e1c72710b10dd..04c515cb7008026a8b6d190c00f214c4faa06275 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 10afe9dde2e9e454ef8db9d2b5031a7190b282d8..2e6ed15084e83648d52512d5cbbfd8d3b2472452 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 15251f7f28ce4258e521a26dc2f6cba68c960b2d..221b942ccd2bca09f45a4dea7a00d782526c9b67 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 a9490b4a41a88cfd4a122234c27f6793580faaca..ec85b60e0daf5cd57b1594c1ed094f79ad6421a9 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 55f61fce92c9c6743a0fe5a97324b1eee8be276c..7f12e45b0ab20a8d67f81bed853c5660fb317e1d 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 4b262cef49f997d25e756dc2545650522da46e0b..b20e7040a849a84ccda9cb1b26379fa5fb7cc51f 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 2588a7ffc50b86a0787c9797f49c7049d0761f91..2eaddaf4e61e8e4cc26dc9ae7d9c8402538c791d 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 6afb238a8b526a80d51f5cdf6bf8143d8ef265c3..8ee22687bc978424c8d8b58c14239652f636cdbc 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 d006624de9157c79d86cb4d40b5632d53d492de7..1acae46efcd9a269e74cbe0bcb506837a0e674ad 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 5f397f57831f508d189fb3b38cf398952fe1f3d8..fb7eb6cd9bc4805220e89927452e9b52fec8a338 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 a588379f59df69f484ed3a1142f8eeb876ef0858..7660984ef084af0bedd3643f4c2191e48c9f1752 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 ae77ff98e211cbbd90a70baca66ad4a3104ee998..8a923f3a76f8067ecd5d8579f1fa7eb48166b10a 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 d57c04a6328c6b3cba0360e7dbe483ef0bd0b97c..33145c07bdbef7a7b4e3365c1b4f9135bd83d638 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 8d14157b75ad739c1f07a82a3a421825dbae77ff..8248f2f9a82e308244c371996b8945dea7cb788a 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 afdd4f55ad60ac200ebe6ab65884f494519a129d..ad612ffd1756ed3a95a244e647c37692e6ce6c0b 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 0405a9f51be0be5750ba22461d47ca97fe5f0cd2..84d0c7e7985ff2b3ab20e6b0e317e70c223a63d0 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 8b24bf009c8444084cb7a234837b28922f9cf979..3a872035ad9587a80fb5a244e49cf093b400c154 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 20e16d05759f327f353741737b660d64a7283ec1..a8e34da4b7b81f2f4674c4dfa95756c46145923b 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 b8bf99508d3cf4b79a9bffe40ae625771a6e1fb9..934402fd95dd01194453b840422943c6797779aa 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 6e18d05a5add87bbfc078323d0d95b47267e5c86..1898c9064bb2bbe941daf64eddce01a3e240ebea 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 f66aa52bfc9c00a3139767645890bad6bd36ef4e..a0112a76c29570db1e37bd95474ccab1b6298f4f 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 05753a15b0df90e93c491b79200d971ced6048ba..523d0ba6e089e2f7f49028b9dbf51d950e959791 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 d9c82ebc979775810fb3518447eabf25e1d70e41..f49fe4de6642c3f7148296744532f6115c5190d3 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 fddee906ac5bd28ebbed6ba97e13eccc1be89f8f..e3a62f4133f18932e11bd094794e195f209e2362 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 59d9c17cb50461fe4d6bffd973fd7502c789489c..43241f4b8648faebb71bf3946aa1e3bcd9ffdc7a 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 5bf14c22a5fe6eb870916781e95898acd28efee8..a9ddd27b090527359a227091f9e22ac1d599a434 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 46ae1335542afe9284e6037dfa0e38e264f2d6a1..75516d85db8ace1d35f7bd727f158a9ab2ed9f8d 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 26c437c73ca91aef0f71089dad7d3dd264c285a3..d3dc16889c96f38bfda7c6fbe04ba99dbf750263 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 12ac4a6fc6a96c2b253c8ab518bed19363f3a2bd..7ae88c6b4cd12a00d01ef4fb986be15237fa722c 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 bf4bd342a5dede0b495b96716f61a76fbdf3ddf4..4be9c2b3ad2454dacee10af63ee63ee61289c283 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 0fd058a1b9567ca0efe8cc4a3090d93e5febb565..f6a7d8064780d61ab87b890e05e6a7924636e809 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 aa1c015ead3e4697113186284082a2851ea25be0..ffa29176b84d93d1e561d615f99bc4fbb752b200 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 5423720106f5fd3878a01e4c0bc4cc9b99427140..8062cd2e8b2d549e4510e0793a748961e873ea76 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 408948fc4350726e4c3e6610b0893de6fd7385db..66c01bdb6f22bca375425882b346c11357917f54 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 816b2a984a5a78db91400a5d9222cf49358ee42b..530e57ca661e48fd913e6ba88bfdf75297cbbb40 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 4322d7b359174c0ff03d99334254c5ed992da2c8..9c520cefd86a96883bef9e7d4b6bb990fed1205d 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 54a6cd5be8f568700d077dd19b93e40c43db1475..7b5412ff85b4a22447c565cbf36592009851e20f 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 885c6c1912e0b2ce73d173a91a4c8077e6fb7bcc..47ba6774ca1552ea3c42a81004867f5286abd1fd 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 f18bda91877e3147c9256027efa9af5f3c23e713..dc362b952495730d77364f5e5bb3da3aaa4ff134 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 68ab421e042491b0f3425dcb3acd39feb9aba311..757ce42f71879f1b6567ffb79b80f904ec7e1a2d 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 bd478d93d9e0e6878ded671eade1cd0b1016179f..e7c7b2b0deaf962ddc8ea9394353695d847455eb 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 f12cc6ecdfe8089b4b79f33623ca2c7d10d31165..0938a8846b801689109f00dabebcee5877a3662a 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 bcbc7ab8b8f1a4fd653d92b9036bab4e5abb3834..13311f0fd5e34b241d6588e7061d7af942e12102 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 92397b23b1dff8d37d84a35c8d04d0c8177e1d9d..22e01ca88e0a261d13373d05e198aa4c1a8fef97 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 a920e6cb10bf1c3fae464aecc42cb620f9899ee8..77d536ebda9f8beab4f3a32dce89d6447d258626 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 ff50f89d686d104c8dea69addc12b948d0b790ad..8b7ff63ec558f0f2c71056b3310119be7d341479 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 9a3692714acec34d9cb822367db709318251a0cc..2e8aaa5fb746902d1c9c31fdf979c44319bb76b8 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 55ab78e6e90f26ee82711a176626e9118cf511eb..67252a7fc01c735e4f792eb93117e0731a425939 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 f5deb7073dbf99bd94f679882a8a1481433e38bd..54e0745c785bf439b9e5cef3b30b565497d0005e 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 c7f157fdb429abf4273ee0e1f49e2217897cf62f..5851842a5af5b41ace54fcf6c15a4ad74059ffd6 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 fffa425c7f63790bb855c3a9317473ff393849f8..10159ac6b41be69e78648d52f240ca229da3b7f5 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 684231d2388a0ad524d17eb3b33897355f6158be..fccd8f1c666d559a8bed028de69cedf97d1f2d93 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 2f33d4c573f66b1f51f935c944bccb9faa163b21..3a8fad0d1438bd64a7074d50d6c6742449896b0c 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 f79d1620bb1fc46857f83837c07bc3091cbfa4d5..15cec4182ebfa564627eb0bee67d313119fd5b2a 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 4047ff64ac77620589a55596b7dedb5747c0ed2f..6cd78f147cb8ad22401eb280b727003712bcdd1a 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 c07281ae4a2607d64bbe3f5f446c4cb56a97dbbb..a37b3329e759f86e8a1cc4e8f72e5f1e4931aeea 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 12a716ade648e0e01d1d3f270f2c4b2122859de0..4306040a265732e57a87eab85cdfd5b673a13d06 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 2a2a4f522f1efa507104515056f1abd28b9ca873..251b042de0f23b7d22f8f1f07c9fcd49440a922d 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 335989fc03648bce373d048328f94d9f0eb6cda6..5410b41f7f972c15e6b544c0796bac9372c3d110 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 db26ef827c784f6be305db5c23317f8722d8504d..0838a38436519d279ff9c5a82db3ceeaec2748fb 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 4a19553310cff8b01d701a4ed7e3bf8a33ce97a2..eb959ae46ba3e2f914280c562720cb2df3847af9 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 55de36bf0d951123be6d9819d216e2cb9b749a60..6f93b6d7d738e72044c1ec3ea0db5cb9bd3455d6 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 e04de2ef9c1b5acd4f638aeda20441574f19294b..95809661928f1110b802452fd482756d7ae7ef69 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 b5ff6be65032d007311afee7713dd181b9910aa1..56b2c16c18a2712dcf55bb3a9ef6578b793b477b 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 e0c23685d4c491cb1781e35eb02ba018f0f8bbee..cfa5e127bd9ba4e12710cdc229c26e567c6e6fe5 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 0c8a40db5ebf292dcd647bffb398fdc83e509e16..905d546e95d72e0d2511fcaa72ef6530efbe99ff 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 fb5f2200351e3c9c693147b6c36ce112628d63cc..b993cf9831ad7ee4464a5bdfb284d1bdef18e083 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 2b2ebf91cc0a7bba77800e7722ea3a8f6800e88d..b5dbb55a26026f0ebdc1ee809ea70834ac9be6c2 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 4f4fca18b4460ff51c9b4d0db9c79635155d8eaa..e35d921bbdf43fd461d67ecf701fc6122b040709 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 70b6341de9ad7a6ec0693245a393554b0cea3066..583026744f5dca248a19d1b64cdd8f9fc8617cd7 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 def7c5539db37b14819aa1a87fa64a8a32f9b67a..e75bc1801bd6fd163f1a055ef59df87721cd27ae 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 e180e95f8ad46e6050b23b6cf4983b8a7a52872f..e37c14e618506f84b4065aa38f0ef32417b5a06e 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 ec0f6084934e3250d1749ce7467053b78a2b19b5..a7c4b5e3189fae707f6f9186c1502f1b25af27b7 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 2ed0053311f4ec8c554b569a5c8321d5370e1217..a7dfe20c6e39da6ae4a3fc65fd15d0f24f792df6 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 e7660707ea0e6c4815828c06c6079155634c5258..39749039ed84f0626b35a4e82cc1365b3ad55907 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 1f43014972763d4c23a2bfad13d137eff15d776a..56e26d1860ae204688621e026c8464f23f719ed9 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 198d59d80828947a595cde2a70421b4a99313c41..5da63bc0658a2ff7079f0869b6adf6ba1696507b 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 a2bb421f1bc8efa9bd8e7bd1f8f8e25893ca0f94..e845e11d99b701ab49a7b3b8ad63f7246adaacef 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 5757bbd22e456b16960bf38a046e27a987d71242..aec49e15862dd45c0577effb4d0ad6140d2a894a 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 9cedc1c62a1c5ef301451f593e94ab1e5b03f12f..341ece2f589f006feec5ea02c49631d69eec6b68 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 a4aca82dfb2dd07ebde4aeef0e4e746696af8064..d3751f5c4460fd58631e3e5d4db284cf8c84ee32 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 9133b7bf4b330c8a2eb5fc16f18c1cf6febb66bf..184d780922a07fd138a7f7b1c792a85e0b491918 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 a368c074281702465accd51e47ff494259307d02..e0930d61dbb501b9bd0c205afc8373c293f7492e 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 3f83864a1b8a647e61c607926f327bda723b531d..5675e44fe099887eae96efec7ab902a715d800f1 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 7ec675e7da75945fbf01cbfeb0a9f2918fa1d962..f5cce49d6cd3ae3ff342a0e3c15373485f11a89d 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 c084ddf83cd26716bc0bc06d75659d34f93f2d44..a6d177d36a3fbd0c7f556288f8b84e6713b73ae9 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 15f6e2ca6c547417765edf5ce8432bc08310870f..c3e77fa82569c32c05741661a2d9ed6c25d757c4 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 77ac87006efababa4641d678ef8ef32e9badd7c5..b14e00a03251623f1c62a38ca777a59bd324c496 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 f6006d0b8ed870ce951ad61e8eb8d60e5b8c22d1..943b8d1206a3bffcacdd20f59a741cba841d4c25 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 00729d8e68dad4a1c6732ad450309542a61b5e14..ad0eca94b8c9cb2af3676ecf205f8973cbd52ff2 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 da0a760c22d565bff63cbcd62e8aa32ef9331f27..e2e82b0594f51e54887b83ece90da547c7685258 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 3e069ee41147a662a672f188e6f2c8903555d0a7..4727ed174b0593372cad6c76d08a87929acfe176 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 4c29d0c8d9dc6e5efeb3f43053936795f67d5a5e..624794b5a8233697fdd8b2f6800bc9b35ac8044d 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 a8a615e9a6e4e7354652cb63054222b14898b519..beae8c8175829e309591e11692cbd2b5cfbaf421 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 e156732392eb386cd5599169c347525418cfe0c2..025ea9bd4e874e5508ce4ba23b3ed1a5496b3a06 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 d668487e52f0d98286f9a154903ae271ec400608..d6a22ee25a40c521354b069b5eebf1ed8c36b543 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 a8080e58b0b0620beb1c00f4f2e02b143201e074..cbef77a00b560f2d729202ca94ad0276be70692f 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 f9485afcf16504d428b070a3059932b6659173ec..6cd2d8a57724b352a244bcf35dc5ab324af21388 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 6ba923b3ba151b689cff08792552db9836cf9e74..106f4910d19f2fd3c0fc07be87f44e7871c6c93a 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 44b6f66dd072741ab0c11a853d71746b89481061..09b7bfab9ee4c88c73ae2211e9b251f7250d5b0d 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 21c626ee09f578184784bba006897baf3f1957ad..46e5fd61a9a433a43fdb5d7f9fa47c33aa04783f 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 9bf23788681559badecd526f2dba049dd0aa1d8c..ad77fa9cb586cea6ca47e28dff10f58701244644 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 becad342ca29d7c672dfd029b6658cae7249c901..0582ffd245a8e50521791c46ce8f6b741a8e2626 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 c216231aa42fe9933df5ecd642eccf9c517065f0..bea6eeda2255ce919325240db8fe406b1e459a08 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 eb5699d35c1335e520bb682a9a1d9d87ef761d7a..1f9af7fbdf84692061ffd7b2f666870e090ca8c4 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 65334b8bc56beaf25c7f43ab53c675c760a74190..df1259cf1b8213a82cf3b766fd6449b44b3d3ade 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 e6f534834e729be12f35cc804e45cb2aaeaaff4d..0a570ec6170085e25a7aa9c8a5dc879bf410774f 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 2bd9ab6ffd93e58ce00a0855b3e1aa4ba3d57b1f..ca7aaa460e2fd6a950b0722466fb0fbbea3b13c3 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 bdb5de0fe9927ca4d2cfc50b4d7dc0ec4de7a63a..48487088a52ebe6aaf49542019c6e06148960955 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 6b285c9a948349072dbce954752d0757837dcdae..9b6f464921845a7316b7c537eb0e6960cf3bdd34 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 7b7ec53941ecc11ee0c93940550ac8f27e4b77be..f67319426c25faec96aff42dd7c728704bc5d234 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 4447a9b6f7352d5da685020163f232df9ce79c54..00ded3e12e18345bfd5029cbe7ee37452745d21e 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 0d2f32199f61d8ee98999b24c5b60b83279d317e..6a8a1c0a080d967662abf0e327581ea6cc0e9acd 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 552bf45f3169b977dd743b0ab2d4f553a3df6c98..e6abe38e26dd35834f1580af7e1836bef0b446e8 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 a2d250527c5602def705671893dbcaee10f3ea66..e72fef052ec8b0666a5f38b911ec4131ed4d4b2a 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 bf789a2aa63556647f79ec94ed7ac8ea093934cb..12a56b2ce9120bb7585974ae97e14da8305ef9ba 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 d9723f593b5e8011ae7c37d41ae44dd5df6cac65..0f35da44fc6035d95c196a6d01d2b3bdc3a9bb05 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 2af43f2bc91b52227ab9b73999a1f2b5a6244157..bde4e067e28ba57ea1a69e84fc2a48679dc443ce 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 7679ef047487910b796f3c1249d2d78fc6c689f0..88d5f2c9ace0f57ff3dae22e82762ae64cde4467 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 5753c6b2099686ddbae1a80bb092e014350b19e3..0ee1fe05edeba4649d9ef5185a602e3c9ce2365c 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 34f24270899987906821c0907f05a283333b2bfd..f4c40824b3b2fc5fd63978ea72c60fca460d24fb 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 ee23eecf88ca3401acbca7931421b1975880c057..61c4f80bec3a849fcc1abb5ebf5aec7a703f9394 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 75701808596f917a78edfa1ee4c82be6acfb2d99..1f6306d0a20a5665816ba69e2d200f670727e1dd 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 b30ef82c48429bd660d94d22e4430b35f3d53dda..09b1b54abb95f5d5de3c4f18952252f71d50248b 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 dc40bddebd211ce2cf01f5f7c4222b1632d0875b..dbb44a6b6c45e66fceee93e828200b20cd577ddb 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 e587aa13decc1fcc3cf0cc93b5d4872a8cd0679d..a86ba4ba0be986fc76e7aa377777b1a4f141f614 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 1d3ca98e3af0349626d0d9f3219ed4b434c6e852..14f49f7ee75c844aa6e0fede9b780986ec60a6cb 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 7564ece159f5676e043b9cc6efa05106694c0aca..bab99b370c61f8bae1b2f2fe5c2b7816d1ee582f 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 ff641bd518a82e8b50f1d4b6b7bfc04183d6400c..e276adb02e0e7ec6b55aa40f1b31ca09cf9598cb 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 d7a17dc03523a0d9824d5ea656b44503f5816e5c..f8d132e728c028b3bca6291e9aa0f297e0b4fd2a 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 2e7c550af16c64ffc3af120839a0cd5e60998c50..0ee24ec8b13a4abbe04fab1f44fc3e3fd15c94b7 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 d53123efd0a71c1ad5d7095bd9bb7cd7c54e4116..56c480ce54f8074c8827015580d33b30e60bcfec 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 116477435a394b81a019e44a4e62779a58a427dc..7f57d91dd320a6c054359956f28cc176ab5fb730 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 566ddee62fa93e490d70bda342c3f5ecc657fe89..66db9182c59781eceb5f8b62cad7a1789feb9d4e 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 5dbc8e2888ed49f04fcb549fe429eeed6448ef3b..7157ef3c1f08bbd3663beee94685881bab68fd7a 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 3dc36c9a655bd575da9e4d1f0a78c0abd5203d77..53c9ac003dd861ffc5ea15b464e5da984b978040 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 8495620344bd7f25809c51d83e365d920e9f91a5..d424b72bd188fe699ad24ca613b18fe1b2d5aba1 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 b1dbb052bb5a3c87638297e08edf034834189ce8..deaf30a183e303562a3cc17810ccd3349cea2780 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 d29fc6333895c8bf79d71b778774da0dd85904ea..be370cb12d684cec6095afc114ff1f1b967157c4 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 fc2f23c0d9dd16462ed1a89c42624e2b0aa1854f..de08e30e88cd2840c062e0904d2bb248b48ca745 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 d81ee7afc679982b4ca0d235d58ff595694d03ba..678b0fe3528546cd27b969612c2da00d6211ce8b 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 74bb9d981f669ab453da7f6df9e884565f178f5b..a5787c2664ac8242620f429004f8c748d4de87f2 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 215e18a6d2be2d70f70cd1c3515bf2d7e0ff1be2..c5dc549afea0f937027df5c5d29cd0ed6933d959 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 2444c6d233b33b581bb1a1312ccdeb94a3eab74d..b0d99fdd1ae4dd993eb10092f508f5018656212e 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 8638f064b67ee670000f002779f4883a5dca0134..13a92efb7ed82278d8d659a16357699dc3a0cce3 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 b9091028d31c6dfa47917c65fd4818a51d98faa5..24b7ece95ad3a44656ba54f861f06281433d54de 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 0fe4f8619c871e24c210f66d86d697965a36b474..510841cf409e53c9887d5bcf7f7c5481b9877f1d 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 d2ff679d22267964941b042d03a26f8bca680fb4..817c464b7a8837bf2a3b477554a1223df078ddc2 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 c827a27d9653be01891997d5e2cd622429aefe4d..98165c01530af18383a2d4516a140ce405b9fa64 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 5511c89cbb89d8ad4ab087903e6c036bf253790c..45b3ae8f74f8945157fab435e1d8b8be3a6429f7 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 98913c57429b4b34e1f39b7951a866ca73423ffb..1abd65b46929e98b3714eba2001a3de44d0a935e 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 c7e0673c167706cf131b5e72bfd567eca5fad1d6..553cafc4d87f50710916eecfca07b12007187775 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 a57443db2230d00fa9ceb03aa74d9cba631e3ac7..fa0505daf8c2bf3a9748072fe3e691a0653f265d 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 74a4fd2acf37d16c86f037fca4448003aac8cc69..1940a2158bae3a8a19261da4dede649d8af554ac 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 3fb7e0a8fb9d8c1eaa71c5301ceff0cf4892b661..0adf80c654ee0e1640d012f27fdfec1086984fb1 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 b1272960426ca7dcc6474047e49199903dc2c016..fd30df733ff6b45075a4600a01e0af0c2a3cdfc9 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 916427308f8d4a5a97c09ffa82dc0d76425bc3e8..d84bafe434e1f7e5bd3d0f4e8bfd1e213a4c9b2f 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 6e4757c7f06abd8c47f713a54bf30d234185c41b..17b278eb61516fc23e2d291ba6ec0c475fdb3edd 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 b174f151335885039c5643b3b33e7cc2724f019e..94b6ade02bc8a8c9ea498592a0ba637acaa76a3d 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 c9b4f98582b6ae77104da5bed17a676d809c0209..42f2bfc83c6202a891c5e74d91191a7cf07c1b34 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 a636eba98d0fbb0c7dccf0d02c5a7e9305ee749c..a1b5d5b4133fd8c7cb1d094f51ecc1b2ab64fcbd 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 9763f151b333c3a117abf963b640b40980062722..f6337634ed12dd8a32e26a22091a5b24e7f38054 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 2028decf75d68e2d4ea7592a6eb35db8e92ff77d..f087150d4d3e2baa14dc10a8e6a9e32f60b0929d 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 f2dae51c86ad90d5bc0d523d42c2f3b37901e454..d65db4ebc722dbd85907b5f8c8da95f3a7796acb 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 2732693bc2adac40eb2c743b62c690291a0981a0..e72086d57ec2d28b7adf1795c74116f6dd24773b 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 2db03bab5263225030eed81b2f9323aa88764e3d..3f0d689d02917d666932dbfcaff7212de0d9a215 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 471c17b8b62e92bfdc4618fbe376a2112ddbf7f7..315b3fabe3bce2502693576eb81e8f7e190fa699 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 c5b386f81b73fcbe6d6d363012e4e31ef848f930..521456784a0584bf18053554f4d87da888931ae3 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 912eb857723ce413060dc568189dcbab1e348e2a..c337c23ce887566c3132e7c84b161c700cbbbf53 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 160148ac3c0c4d6588b49d2d2911558b466b96f1..0c435aeead5ac65919b109684f4e25b563b7140e 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 4a01d4a59a57722e3323780e3d91c0024052f899..4447f2c5daf34da5d7818135fa73f5f84f38a365 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 f8798dbfb6b117a942a903b46f2b78add5187221..5e27dfc9e9b605883b51c32b51b712c5878fdfe9 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 23e1dbec09c044ba28b1dba663af80ce00c86b1c..97ef60d0ead90e7d89ada947aff5d93c39169216 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 667390f4c4339d52aab739018f44edbddc029bed..2e4c538e25d0829ad6a3f2f00212e0d5d54e5a03 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 a948a0378593d7c7721036bb31f0144fb1875c18..6d0b5d627d6417076e2f1a3daf8707e293aafcc0 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 2ec37b65af52fd548e2579da8aa90e0349a46ca7..5d31e76f27afa35376509b31116fcce56a140483 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 ef0a71330318f1d5fbd971de446c5a2f0aa71338..a992fb5c08ab3f5c7fd47db9179c022bfbf88f6f 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 463ca0c9882c4dbea9435e8bf89638fd84f44a7d..48cf40df5b6fd57668249e5fd0eff5859a000372 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 3c71a2e2695a400601e64e603c9d688ab284a035..babf6810cb8cbeb6ca7e4770a595f447472cddc8 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 d9128e76e45af401c0f5afba30f0cbeb1ab13d43..e768daf2cf1f8a42b399a811f60c94636fb3bfad 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 1531e25c504b8a28b6642207c3c0bfabd6478c3c..379e90c5a35156cd758cac780ed5c85edc26c42d 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 c11b1654dffa2cd05be0c53d77d6bd878abbb7ee..d3180e6d5630a18c8a53106b990e682b881ea6cf 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 df002ed74c4017f654fcef36b3b7e899479fcd26..4b4c93b53df0f6166c2b4e4efadfba678d141db8 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 1c6656e147b39d3fab8a0272971a4000f55efc54..ef3e817c8dfb5d2b0e664cff961bdf06a176a4b1 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 b00cd28425ceb10a08f236e627f25b666bd9e260..a62df6d112393938e43cf03ace5b7b100b51cbb1 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 797c8beb7e235a7f91b7684e5fca5eb111f2d2cc..09aff7a815d849745c4070288534e57e89a46574 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 a2f5f682577c7e3b8a076970d7eb8d69fdbe8061..4a79b5021916a1f4812cce8f384efd7bf22d1ba3 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 ca07f47524d942ec35123860162694ba7501d988..fe2689c1c02ffd400df1eff3c60ae8d970530ab5 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 4bdf31431f39022ba5662ea6fa0a5062b2a6360f..a5fb46181d8c584c75bda3adcabbb455078a7e28 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 5eb9deb276fbaaaa13eb0f068951eb76bf96856a..36bbdb562c60f69dd2888a5249968640a451f5d8 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 228419874d1c35d905c4f14a8f23a15fdd5aa09c..1d5aff09ad63aa80864db2f1a66ee75e9a9b4bdc 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 5cf8984aa74916bf8034475c863ab4efc2607fdc..5732445770b8e801a83e7360607bd7515a172bcd 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 310a7bba7d59c27d029a0aef830471609a762ce1..eb196860b9122f97b77be9826a62f514e14a790e 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 909634f399fdc692b243066e55c4a2a0deae4533..96d70db9692ef0f636ca6ec18ad4d0d55fcff5bd 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 5eb5ec3287ebd43e815084651eb3ce1bde791c9c..e1fbe29b12e6ff764bf919cb1c9615ab80972286 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 b0d2e6fefa49c6f2134a0853704d7e4ef9a32cb2..d7011827d02a2d48cf86e3a8498b16b97321a4d6 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 e1a87a0a83892ade0d4a5c3fbb9ffca8bfbdb1a8..9c94262b3877935f0f615c38f62f3d8746775d74 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 d5a86ad2a70f023b14eafb080678d632f6d0835c..b8b133bba74f457c03730aae4c915b1d2d3c7c52 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 a194132bde0f96fb91ea54740115805c82fa0c79..38cfd2f56484f40d3587cae6dbfa01012ffbc1f9 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 50f8aaf6b04b68a20982d987803c8d23b27f9962..7ec690918a43e42fc20e4c6e64d6cfdf081e08c7 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 c09b1883fd861827a763ab2c4233a3de0c09237d..cfa502f79bb0f637848f8e64206e5e064f0796fb 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 8b50a7e1434934ec07234e79ffe9deccda67ff7b..9a650ad447fec8efa096850bf7caa3b209c6cc1d 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 cb5a73b0974b96fce0cd332282e3374fd7e377c2..10269934be62afb62940e3dfe3b7d5b1e4bafa1c 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 391d98c6cda6f1c76f7530fc354fc7d754ebfee5..4c1e2428dc12e7c8898cbfeb0312dc43ea99710d 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 f1eef2c2785915e73775a09329c1b0ebacb69ca2..180c2b08ae409f0cc63fe0ee88ef8e437f1bbb65 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 1f91492eb52b1f64bd9bb54013c4821ec2374950..ecb647dbdfed8159f36b884a3d773c381ca54ee5 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 79bcc89a0238d341e0db8ca06a6680ef953a4aac..72f350903c13d25451b360b774fe0315e48e2440 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 7ec8f1ef1aebf7a2d020839ed32e682d1f802864..ec67550141ae28a18844fffe01c9a152482534ec 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 61f8f6bb786926da1c1b9f7a9a6cfed71c329554..4ec0fcdf73a0be58b4571da1cc32ec6cfc1bbbe1 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 1a92f6c0d11b8e455a95cfc0594b94fdb35019d9..4bcc2ec2dd4567191eecb95a9eec53a86ebcb696 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 1cd2e8fc0cea217544a0b8177caa0e6a79023b2d..797cc940dfead6f6774b08a0139d5c29590860b1 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 3293d52c340a77e2de534baa259de4ce9d5b1bff..de84fa6764c61de0eda7abecc40fb7b29bdc771a 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 44f5d7204fda6cc64badf4d09bf0158bee01dd28..9ca88e2abd54630d63eac91a6756919d86d9c170 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 6f2795ecd23ebfaace800f4db966ba45346c1cdd..c20059b14baea8889384467d0b10751a27b24e22 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 98edc4a7e1cb6ea37f04fc77fec7b0d4cca12c28..ce603bb7e119c1ff2ae11a6a0f4dbcd87a6d984a 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 048aa8b9f3b8d1046edef93050eaf801d202d2bf..7b3e2002a245e94074c2c8260bef3e2a998849ae 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 fc68ae7700009219b78a9ea090c928de7f0b209e..96a1285d3f57425d735020887a51abb89f8f0e42 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 939b9c17c0bce49e1fffce5e73d663d869656163..27df564e3f46d5f28d1b07d0ceec40cc91f1f2e7 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 1cc1503e7b069a89ff0c51ef73838ad1b2e749d9..78e837ab0f72aa0c4745b31429c015cbe3e6ff6a 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 b23d296e3972bd1e946f535e492561834dc51fbb..e565851bd46c697525b38bccf7ad6f8ff4cc0f91 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 63dfd7ad4144d1b4fed5106279097e0cc2cea3d8..d219f02f2abf16e832651f71548056f3be37113b 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 4acb045460d1852724e6639356ef2382a9a132a4..9add258c85d1de0a80acb747d0276c1b670ad244 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 4abca334ceea73e98891ad22ba6bbdc415622990..3bb2de6c94175a20174b3d8e1f6462888710e0dc 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 dbbef8cb10433dd813d23bb212adf180e1248f9a..01662a6d7f2d95487df806217748114dc16d5fb1 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 6f1e34ceca4204da895ea272b617f661bab0b5d3..37807868767865772c54deae47bdf0e64ddc585c 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 47bbaa08cc6428eeff18d8d9a9d4f436a6bf1b65..854d1545d36e7b2c76881771aae3238f51c4a238 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 85ada87737a022b6ba7d3d4a57e8293f9dd1528d..6e329c8fbc4cbec18c57b82e1a0afc196ee96538 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 9e52a4a7add31eab13b2ac01b8eb689212997a5a..c9fd32785cce3f0bc9ed4f261162db80cd62a515 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 7c2832abe48d49d1168bf8e7c323ea6bb5c062eb..ac68507309e6c42c06f817259912c7b778d27f68 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 f2f341f6bd47ff5c2b80bee5737b71e23836eb88..329394f6edc455dbd265f8906a53604fcae3373b 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 986f75aa62d5fabc2b34dca8dc7248fe79c4a801..99c3c5f5f468ed4be101a10541b927833deb30b6 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 0dc044955f853b98507e0c9d308c0e3c46064ab1..884737bfb4395782d4c77bc9bf11d025bbdc8cea 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 bd2579ee1e5f6894a763460c7b9d0aea872043dd..6ab021846d4d190927bd8c5d3177dbaa70209bde 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 96660b2607cd180dc9f488e3fee085db4eee391e..b2fd823c99d7f6a3ff82cdbfe75cac930a037c8b 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 bf97dc683c681bdfffd29c2c084a9652279ef601..e3690d84726cb5715b5e87874b9feb86a684135a 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 6bffc13242593688ec55d0af8e7d6d8f0185b43b..b20d6446bc8058e10e4227e40e1e0e219cfc3eff 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 affd52cd5e9bbf9dfdf647f8977342e53d35f951..e0f2eebd6cb654cf598e16219c1bc52d579d3ea2 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 72b574d0fcef380a73786d7561e1c889e2dde8dd..8e9cc035aaaa71ef62545258748794a757b4b012 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 c84e0064b23b45ea00f486ebbc3f90d6e5e7b41e..c84b2bc7f19416724c6c7022ac4f8db6b6259912 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 67f0adf6688c28bec164ee4852790ab1dae4a31c..714dd989322393c0555c56ffd7b76c2e0bcf2e94 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 0c92cc6e2cccf5640c7bbd06ddd478af7617b361..cd5a57ee1dbbc586b2ca277a80b4b87a6603cf8e 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 f704bcb1ee5e5c1a35109790993f6a7429535fb2..d0da5519ccfa7fe9413c277122b06919c4f22966 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 44fd8c11faac0768a5d104279fef47bda26ecb64..dc49645f9f5e91eaa2459db098b5bc61e16f0c8f 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 91ebb74aff6d912e8ab16531bd71b2de22b32f2f..8d02e21986ad033948edda17194a22111ec6cd23 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 3b36ea7c46d0b74a05addc3e9d0217639912d09d..4b76cc8c88aa1162559d2e7b46043a6d06ad99a6 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 b37ae9b4d74293a1d84f41bf218bffbe6f90102c..2a4fe1313b5a2c03eaac96d59d3756f719793849 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 ffc360da049038ec8c3608b1a492a76e6a79b775..15258028a5f0c52e136aa0e12628bba03eb8863b 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 313cf1ebf28cedc4558e435febecbb2e68644f11..3d7f1184108a5ed326dbcc526de99c33c593ff9f 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 6f80751788a22745d7d3e0dee5124edf151cc391..a8346be677aaf5e6a2518f4f58c12b972e3ab903 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 a7921883331e1fbab1be4a0f8e293e3668afb078..c7b6f755637b3581c3f41f68e7e8b37a5a9f497d 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 a36f0428f51bf842d9880d0e57a5e6df0be83992..618d941b0a047edf69eb0d9c107cf58db3833842 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 b1dc94012527d6139a909c4533e396440fd4e478..ba4c22d6ed72b98bbbe15c6b14d911c1e473ed84 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 0c20a604430fb7d40fea52a2732904f9fc94f3de..df4f377315290932877bfd1619dd0b75150c1206 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 c2b5f437fdd4842e671d2f0b3ab664f9789acff5..06c356988b3236447de7a1953666b1d4839ea819 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 280e1f47f2172cf6198016d5c81303f720b9802f..2f7f0dbed4566907599f348f7bbf5a7f6e8f0eea 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 9f3c4b568319eac15eb9904a991507fab34c950e..f8341782dda95f2583dfcc7f1c961a7575bc0565 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 46483e4586225ebd8768d885e8a7a46eaa524aa4..654ddfb51a7704aeb28c9f49030accebad89aef3 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 932d289bb781d4bcde86830061c72ab8d1ce478d..387a7f45da5004d5b5f221e3464de220ffb3e688 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 94c8ceab78d40ee336176c9d483132119667dd57..bac6aad4ceae5f49648d6a99149f311c354c57bc 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 ec6368481ee921f59f5ab547773e7717f0abbac3..d08a0e588af5c305e9c0a85aa877c0dc0844f40c 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 7e152c2e88e8255d4b5bad387f89e4b6310c2a39..a409b1242980bc0bb2c47f9ee61f7e7438b39dbc 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 baaae6f28766407a56c8c7a38542ff4c6e5b567c..717c3e2c370c5cecfaa735537647c8285d6e9886 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 49a134781b6ed90c78d0d1df4bd199adbfcfd38e..d716cb1fd8a4b5cb396aa7a30826ea8139ada405 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 3ac33e0f4b557130b13a8980a3bcf0b83e778013..198e09b3bea5dfbd3fbf23d3e23f58ed9bb0a40c 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 f16dafe4073695bb943dc7e4fac07a1b9d1a515a..f108c12e14653102217872cab6b5339131d0f133 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 4fad01fa171f9f10ce83290c3d8d9f65612e4dc9..3139d6302225f662db2007a055b37c1e00083f5f 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 bc28b157f0e61366a76d1e2d594015aa61f565ca..fd801d11b7675360a45fbae24fd3d8c7f91d5a9e 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 f1a89d1440e636ef3751d57e3199cbaab6b39fbf..f95c2c785c9bfb6c4768a5579dcbd2a4acc08aca 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 b7adf76a4c6958dc48d79e66d833da3d30548345..1db113c2119b66f339377464f8c4f65ca9e5f162 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 2c2e9d27cb92f49849d7dc1ae1d6d85281c83cda..f78203dea6474f0185ae127438fd0364584c8999 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 501f04ad5045c28361f97d7a8707619047307517..c8ec895903d769e0381ecb3c82edbf46ba075707 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 eb230dbb26a139a2157f24ff005558b386cb2e91..9aff3692e4aea889c15b67e0591425b16407dc68 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 d6a820d8be8f216a81210b11eacd7ac1646f505f..bf6b16d6c6693db22be55d1df1de3489f6dc6c2a 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 ce546e0f6c0e5af393e5748f3df03b8c598ea581..eb5e1bc4ce81560968f5e6c1b60c96c45e99827a 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 1be7960b0f67fa361fd704579e70a48db840305f..c47dea09c965bbff87ec0e69e32c3d1be5c88c50 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 e758b9920612dace621216dd8a1a5dc308079e4b..804b518c1e607757e824e1ce7aaa8a6cde3ca22c 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 d5691c6cae8116e477d34c27563f7291096aca32..4384c227681382e4f9b981637c4f29fd6957309e 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 d378b5696463837ab9eef857f28feae7217504ac..39a1c85d179b45223db3b0dcc2954fb782edec15 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 722765b046139d896502a55ded8913ac38fe7510..8c05033aa40aff652e142862368994c5e2998fc9 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 77920e956e3387dfb2bba5d76590949f6d84bdbe..3380d1b036f42a71391e91b83c2edf766dea6a63 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 7d36094b6f21a19dabb9d1350200781a6137b6f6..9d7ba408372ea2da7119d198f74ad4e5b74730b8 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 161295413797c3df6298a035a27565e0e8d9924f..69732a80813c1b703e8a92a5544ab958c08abf4b 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 76dcf6c365e874958c73a2e66d30dfc18144e95a..d0df07440a42c8da8bce9c061fe7220c7f82b6e6 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 97dba74ca25798422c807d21d62524b704e0f0bf..200cf720908806f0c5f54b56f19971030772521c 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 ae03d3b60ab3d698dc7212d4b8882e8d1dc25f24..628dcd4f66404134813ad542c16654bf5a3c70e3 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 0831365784bf7e41eeaf53586555f7f0206af86a..a4dc1fa20d1fe80cbad91d4084714174f7d4454a 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 4f7204b6f8af5c020bd4c211056122cbd8ecc41f..941b7bd53bbf15ba4c5032d416e8d036d9259aee 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 97a4e0565bc0116c8ec148408ad2655aa64d597a..23e4e2fc1b8016fc5e4b76592dc7af1414aa88e8 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 a1ff4a204c8691836cb898de8445e8f9f0425c32..47905794bee183a42ecf996c14335dc79892587d 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 020a7a2df86fb08a21a43318f475768c402b14ad..0a55d612b78ec275f107818ff9f5d514caa4b27c 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 acfaf255ff8b9e0abcf9aa6797784b5d5662725d..7544eedf026e97193531e08626f66711fe121c0f 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 ee41ac0054ff52ec9edc95670f403ddc4d219688..71959ae032bccc5d9cda38ed32665cd4c9bedc87 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 b56418245525f407e1d27724bbcf2525b4766f12..3cae1470cea184bd846059fbfbdcc529ef3610ea 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 b67703b741e400e4b53132d5207f7d2289a4c6db..f7f9e54f07b9d764c399bd2ba5a654288223a62c 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 cbe1a2b13fae4af974112d9b13a1df5cb441c11c..4db01bbf4020d60b4a85dc9216a4db10c3bfa603 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 ea7ab9a811035b304a1bf18079d3389df0eb5708..6f9bf1b14cae431692032554c801275cb0f47d9c 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 c431b3d52f8cda8502755d74349efbd2957a4a4e..631d4dbe6e283b396e00ba08b9cd50ef5052fa2c 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 c1f3746156ec1b00194e9a3c10f388b90ec37246..af15fddfb39f73ef854946820dc6278c6f4f16d1 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 5e4d69eae98c208afc2d34043700c915a503a63d..9be6ee60e4287ba55160f77635d6bfc498d71173 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 5bf87bc84ad266308a8dcf4547b1faf5548d22f6..2bffde4247d76f7d5399676918ab6a13d307bbae 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 202eeea1c4950d557a086257a82c2b67bd8bcb72..ae454fd4deaf80ecda132ec96df2a85274fa8c54 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 a17626ca963b489996eb514b6f745ec9e720f7b2..31006ae38f3dc3b5a6f79a508d0737cae12cf3c6 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 7c3491db67235bfea4c1323dc52770171d978809..b778d652c4960b730ec273a9576d3259e75cf9c1 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 05bb644f0d0788f83273bf8843dc841dab12c772..47467a1707834c686fa0db10ba0243d4ca7c37e3 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 77d37032f0631cb88f5c903decbf83830c13d31f..094fce7b2b37dd53b127f0be2da87166d599e662 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 bd07aceb62cfdaab6261ffa4039865927316cd58..21acdaeadee3a83fed7e81bd1bd0cb4a876da215 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 ddf1bea184b4846349bdaee07fa0ca47a0356b04..927897cb568deb954ddb981252836914dc4ea1d9 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 605fd737c5afafbac505e613f31bc17c6fa477e4..edf863ccfd6e30e12531ee4b29a54cfbc6bf0595 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 f1400ef384503e436c16e153e0b567599f2fb3c7..89427d3e90d727835e10ac8e56a780757ea8633e 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 d669fde2c6bdd78ceef3a55709f08aaaf452a7bd..d247fef4dcf14fdd3755809f608d00507fe30c5b 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 e4ec6a639fcbf77bd067b88195359e5ce456460a..2791f1c6043d4151f5090cd386caf53b852725b7 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 2bdf1b1e37c6999f0fee4ca4d4e9725f8ba49527..03f40e639f59e48d748c9bfdf54f57c357a99979 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 da2bc87ad7418bf81959c624e3daf606d4492da8..323f633a93ae751e78fae547283fe562f2983ac2 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 512b16cedd1559befdd95487e5d8d06435e38d67..2bc35c0889203a0ea7b981579501ff0257e046ce 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 1b621593617392c7968c69a2f474eea80682374e..c88789b7b9a1906a79834d8713fc339811295080 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 603d920151192d2e483492ca1cb709eacc88bdf6..ec442255b7bc4c8c5ae836e74998fe25b53b1874 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 3203c4f1477403413848548ce2c0d16b6c6d8d40..beb9f8234f9ae3255369da6a51eb2459c7a0f30d 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 ce4537af30cbd8bc2921f98eb780703a5b49a57a..a92679e434c8bb2f0858514dbced5011f1b3d672 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 29722a185d97330835b14abdbe36497e51f6cdec..73ac275cc2b4d08613b88534e01292a9883be56b 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 080896fbfc33c6f5454fb0517135841bfea04df6..3fee61b9cf92995ff7aeb4b5230ec8c7cd3b3917 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 89c48d33fb0ab76ffbfe21a5c65ba527bbcd40c0..e733f73eba6dd00b3e45b888ea996a4517035d7e 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 f19aa4f0f662e17c224e7dda9b272685835964a8..0ee4ff28b6182f2f5a4a2c0baa7029f32677cf54 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 c3a72d6b0239c7af9cadc608f6bdb01864ea7159..90327949068d1b97e8ad12133aa1f6abf2d616c9 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 300e98405c8d66bd5d9439ba804ca42ffe1e49c6..1a4ef0bab47c3f6d2d604c150c5b752c7b0913f2 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 e06af1938a509253e9b62ffddeb0c04d4613c9b0..91fda1533a859dfabea19b3d2358c07b26d89e20 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 468a4021f5ed2f22a445d94b6a01fc8412cd0ac1..c9e7b39f897ad20c0baccde098f0131484acdda3 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 3b37ae6e9e427744ce939ebdadd9fb66ea89037b..d4755464945a00111da37254e7b74e96b3b0c898 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 93206bdf7f6c49ffe8ddb1d6d2f71728dac9f5cf..230fa87d44d88dc9a9e63b3cf4edc70bc3c96ffa 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 d901ef1ce7ac7879b2d2d0eced2d107a64e0d190..8971a39953adb4b7f3d305915bf1b3beba6390df 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 301daafd672617aa88d2ad4ccadaee56a51690cd..70d28cc0afbc8d006ed61d945ad64af1b2f96c5e 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 4c4990f18d4e2c7c7f14244f55ab62927b06b362..72afe83f27ec1438997c38c77a7697c4a0d0efc6 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 9eceeea0ba22e8be4d5f06d5c51887eed3025bb0..a639f6ee17d96ce914545ab3be7eceec399ce979 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 df088c47b98bd24ea66d9f2a894fe1a53f114681..bef66007184588c481c96d7e9443743cc60a4aec 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 606b10eccd9158e3c1001f119f555f04ab4d5e53..bc0a9a7b4e8be2b2dc449835f73339f347ac0104 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 dc17c5266115f647e23b4dea3f57da35e3150480..26d04634b7308ba780045912409904a9f56d2a73 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 5865eb04c21ead4d60ac292b677195c603c85ec6..7973eb003dccf6109706aedcd46e390ec49c26a6 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 a1ee7d5e26ce87d93cdd7ca5311f98c747d003a9..8e52a370c93214ac307f0b502600467181c6e442 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 fec2a13ad3a8fd5565089a012c19754f3d423a54..d890f1d4c5e549ec9e6ea97e4c6afdd57200408c 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 04064ef9de661fd9f448397ece5ffbe89bd2a44a..f94605ef2e67d933774eea0dc71312d02db10a0c 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 fbcf50209633c213b9dbbaf6bbc9c5eed5dcebf5..e87f3f757049494f6edcd51abfc6640f3ae33cff 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 443ee3e5e4ab15a1416cedb7824c375af9d1659f..457c502b45c043773521a7b40926be820cb34796 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 dfd90be0a99986d4c7bf8152c6c33e0d0174ba17..d60238317006f8938558a621dd98222271f3c36c 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 056f3e8892bef71b923c36c92f06f646a252d34a..aa2676f09f4e29d2c5f0221e94a00c96002987f0 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 424dc1c60cce1f6cef715f760756cb8dce7b4b5c..6bacc078a135fc45c314f6dc3b3d94b26b1eb40c 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 6278d50458553aa251d02122cb4441e21a830e4a..1031856d64c12c4541ef340ab9e0334b33712b78 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 5c16cc5a0f700734866657931dd5888441ae0df3..610b47331a307d737579d62e82fe66acf4351023 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 2182b26ed4fbc036510bf1f12e18b2f3a431c122..026db18198ef82d38add28ad961ee99d87ecdbd5 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 214e3120de59a7a443d0f23226f663316401ec5e..ed9ddeb9a3de9b3dbb5e2731cb8a6bbfa554a72c 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 a374d55121f1e66cfaea00b794418d0952326cb7..5cdee3fe952b8b08f6e8418bacbc63b84bef5606 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 e55c46a1ae5c6023cabe0ab12d83dc82e01133d7..6deab7030e5ccb253ff267e6884592d0e92a5b5e 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 b9696bb81c1a019ef3cf1f74803b0844fd674313..fb27f0847a973373b9e041d50fe96784f76af132 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 5a103cca366f6f4d4f48212ef40f6b4e83816714..57c96967abb6dd313eace5df31ffabeb159a5892 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 c8450f7825ef989afe6bd399d0a84ecfd1782448..7e9daa686fd2f3be208685b12dc4e1c1dab2e7e7 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 3502d8c707ff084476f3b282d3353154c2b5be70..5ba5effd7457a50db9279539d5b0c2550530efd6 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 2179a34d82fbab985c435fc2a0972c51c86e119a..52e8da645dae624c1a620424990845e608360a32 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 4661978811c2761b6703f651bd6d90c8370b81b6..9ff7147db6ac22352a21f3899e6153ecdefd332d 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 5d3db60bf344aca496c95b0dd00b625251875678..af01740fa47b56a9d749e954abe1de37cbe9cba1 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 766cd40c092ed097e5ac66282b5598726c705c9f..21bbb68189cdbe91faff83a36c0c7fb7141808e3 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 5519050240d433c655f044272eb0e48abfa4c538..c499f6557acfd41860486e40dedb80f5f404e515 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 c9444b73426fdf6ae9a1ddab89fdd77ef54d0403..707462c0cd13431e2459f884bbbdd3867e5e9d4d 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 c7fa6c23ce079f3945e77303881251b0ac80d6ca..1afc852efd5fb1b407c7cceb32562390376a27cb 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 73523e0f7a4c566913c60a6f720e739d0d15e7c2..b2a6e772e439db8426918e2d07ffcdfd625d5470 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 8d35bac3f6058de9947e5938ff152d669a740002..cfb0dac9259a73879e76db4c125c42854fe3bbe7 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 362bc5b353b579fb64cbafe3ea65d3925959a391..37a7cd740c3551aa8a0ed5937e5c33cc36f7c48f 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 8e38f08ef854c2368bdb42d15afc0ab55aa8f980..1373e2b42af5afcc1307544906b6399f7b28eb3e 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 6fa42c39b1408611873ace0f8f4323c28ca81fbf..42a040d445084a5af836b3a760ae3eaf43920ec4 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 550e31de0b7acd2abad35c87c4736b0424cde632..311a0949bdcc49893592098e34eef499dc92d50f 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 eda22023bf1dcf711011f1b645320fa66a786582..19b86fd2eb54ee6fc58c9de86e7e538b5bdd508b 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 21776ece2f13ad63cae671831908405df8067e7b..187eac1a2ce6de28538601f7d53f14ca2d6b3ea1 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 6aa68fa9ceb751efd315a9ea83628f3ad77e4f29..50c634c56b84d2fdc5ee25127722d66712ed3562 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 b932ae24b56104142097bd735dfdf1ed57d493e8..2150a4ecc4a641588481528255f7e28cc3747b9e 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 5cf60a6e4cb3697f5e369b7b81871d2a123c302d..831066b3f9b4ffd4cc3d842a7a27c46b71186014 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 3edeffd61acce5402878986dabf2dfe4127bbae3..40253d8246f9b9791df865971e0d7d3b773ddf34 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 0019770b590664681a393329e3e83f4681257020..2efee6cf83e940d37232e2e72c7353965a545132 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 3eb71a47dd60710c24e083e5807cfd265d37e41b..675730fbac8b922b07471a78d27bdbf174318e3c 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 93bf297bcd740284feee7e9219796add503f5886..1ccd668c418c73c0862841908b54cae28d88d68e 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 fcc50a34c373aea71fa307317d8bc6e1706c39b0..b93ba7a69e3a633c54aebcd531fa44c3d711c26e 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 f1246d80c259cb551f881541e45efb71a0be3ecd..34c31ea8bbcbac8f8c9d4288a3d4e65d8e9e3abf 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 643dd3e071c263cc5d686d22e3ebbc294ba8c0b5..487442ff1abb73e6e1e5fadbb58652d3f20ac2ba 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 4f907308f5cbc2e787cf89030b6c9c93248cf8d0..c86458a9fb8ee1ca421178a90e6ce7f237205e37 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 1dd040301c496ff7b7b908925cc97a362ce974ec..7e6851917eb9635818e27c72424f8cee2bfe45ba 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 f2d2f706b6a4e228e3c17b2c35dc79ea492d55e9..e4ead6eb0bb67b65dd625bee1b89dd1f3d2f8d8c 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 7907168c05f41af812ec0a8d2ceed42663f6c4af..7d729e8d60ac6482abc24ad75fc6ce9aeb7b3751 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 8f1d48cab1b6a8ce499c0edc20fe6fe39c519e6d..397adbec921b1e9c31d2fd3630b1a7147aeed52a 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 b758f73942081f4fcbf10947333ccb0dff55f80b..26f425032f8069eedfb75434f7630cf89ac00769 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 b534dfe04783c7cdbf2a54fc65c497e564c5b49e..69917ac562dd1a65dd59bd7fa54f3ada4241d76f 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 37420f75113edb0b4507ae30f59ce7bde0968fed..cc0b7e17ba39a5c9bf8d59144ef34a94e05c1278 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 179c4a36e02a45797e3bac2fda9d40b0b046d62b..fd9e088745605b12b080aea60ebb958c5e9bc095 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 a470cbf5bcc16d66c13cc24e3d32976ced208281..957ba19f88abcf0ad44663fe9ba5ceb479cc9a1d 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 d068c271302970af4fd32af4f4535563df147ce2..2bca986fc6a91bc35a8f64133cfbfc0b77b25897 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 ec5b46dad27a90366ca72fc729c896e93b3d92ad..33535a6919639ae172f3d54344591ca5cc3613e5 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 78608ffa9c59726d2e2e8a63e213092cf0c5d464..dce3d6ef2db2df2c12ee37f65c6b1f7577bd3402 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 901424c30caa514228e308f1cc16406c80f7376d..a33617c824f5f37df2d8c0f9145342f3b3b0d726 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 af52a7b34b9b4157da9f028b0956ed153adee0f6..8a25e0ed181f7335c616e0cbba9af4c7d41b1894 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 6f23d83bf746e5217ff1d9ad359b5e7a154366d8..0e3188c00d39c83e03373021fd8294077bef6578 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 820e5e1affa35bbd67f391cb560ff49227ee6780..e85dd67b99cd834165bc9cff9aeb68c6077f23e6 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 9e597b8f3b3bccb82d31877b10892a5531043c57..0a121c67beea1c382479dbd9f6cd967754e07be9 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 df59f40e37d8ecefcf62722ed0bcb23e6b4c21e3..22ae15f832e857a04881c60a727e66584cff6c57 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 d35d64787cfc75c0826767df654bc75bf074e538..8f5d9430157f12f0c731fa8755349e6e9c97c607 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 dc9afb4389dbb6ed350a6cb9b223e6e7939c613d..c8aa2f78d97b72a08299c8b2297555dc7a7a9b7c 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 c494c6d61a525b2bedb89faf72c56f757c5a0acd..1f4f196ec5ffafac8ccbacbf793c6f9784fad79d 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 a607a7f9c8d9577d3656624093562f4c17dcf4a1..7f89366d1b24772b47de301244a935d55abed953 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 8ad1906b1d989e3b9b401e63c027094b64504653..d700641de3992d34c2aa54aa6dce433287e2d066 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 a9af5637b60cbffe7786c359812c7de215894c7f..a7f1454e2d9ccb6e046d456e13ab2c848a9a1730 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 d1c035ede6c0d49703b8aa2e3ccc9fd9a152ea60..bc8ccad00687ee76371eb781672e8b36ce88d25b 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 b1268c9c661470d701d6645d30d15fa94806c106..a4c1843e9f47979e1e2679411aa1726af9a13282 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 cd187586980b1c3469cd1769e4e0c7862a15b552..4e8d3d34daa76334d52a9110bbf350f50a6037b1 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 0a2b43fe979022764aaa934c45a858a4b977d186..f3d98be5b28ff4852378a1861b40a7fc43d0747f 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 2b1586b91068e132e688dcfd83edafa06e20915a..662ca0f8e37e81a37e14825b5cf7b71770723826 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 e3a66c7e6d73b49332a5bcad9ab5c9cf0d70caf5..d4a90660183878dee202550d9ae4e23bc50038be 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 1dbdea50e009efbe2aa948467f5c7c4db4ff3d80..5f4ce9e39bebaba9ccbbaf67f4db2096e1584f0b 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 e7d15d1fad6c8ca63f561835e1bbc719af86a131..fd7398133f4c0a395afd4a9bb9430782be211498 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 17274323963b1a4172f69d423ee6b8ddac18bc08..0322b66a0b2a46a1e07d960d588dda2dc8d644ab 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 9794c3ff9c3622591dea7f0bff1003ea32b20b28..749ae0ab3f96e20282ab9ac4427416a5696f1369 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 440a4fbdbdb7d83e95e612f2a0d4a72231a5816c..62e7bc2b337298a82a72208bc847722280aad879 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 77ca68e8ffa9829425f5465a669ec4cc1198ad4f..2035f4ccc8132f1e20f2ef06d3193ed5b5a19e8d 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 a55c6a8f58b469af14b10ae617ccf2a1b7b296e4..7d0695b5a7160a329f23d89a87408327481fa105 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 b6254418c17bcd7cc10f133695e49b39518bd19d..f4dccf9e87945ac5fb34abec4ca4c2746320c6d3 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 b421e4568547d6d3b7587ca560199ff19ca8a3df..0d971e8800e63b9e8ead79c991b7cf9ebb009c0b 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 8303c08efa69fa4f843665496fc34240a1e1013b..f8237629e15bfb1044362aaf536b3237a464b1a5 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 78f71e0eb1d32a439ae83427687e0e3f2d49df6c..dc080f0df17449819c267146048741acbbe2bfac 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;