# HG changeset patch # User Bruno Haible # Date 1261684902 -3600 # Node ID a48d3d749ca54fa49f5af564975a294b82ca0b24 # Parent 16a0ada3a1015262f751c06a68454b9be96e8d55 Refactor common macros used in tests. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,878 @@ +2009-12-24 Bruno Haible + + Refactor common macros used in tests. + * tests/macros.h: New file. + * tests/test-areadlink.c: Include macros.h. Don't include + and/or , 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 test-nanosleep: fix typo diff --git a/modules/acl-tests b/modules/acl-tests --- a/modules/acl-tests +++ b/modules/acl-tests @@ -6,6 +6,7 @@ tests/test-set-mode-acl.c tests/test-copy-acl.c tests/test-sameacls.c +tests/macros.h Depends-on: progname diff --git a/modules/areadlink-tests b/modules/areadlink-tests --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/modules/c-stack-tests +++ b/modules/c-stack-tests @@ -2,6 +2,7 @@ tests/test-c-stack.c tests/test-c-stack.sh tests/test-c-stack2.sh +tests/macros.h Depends-on: exitfail diff --git a/modules/c-strcase-tests b/modules/c-strcase-tests --- a/modules/c-strcase-tests +++ b/modules/c-strcase-tests @@ -2,6 +2,7 @@ tests/test-c-strcase.sh tests/test-c-strcasecmp.c tests/test-c-strncasecmp.c +tests/macros.h m4/locale-fr.m4 m4/locale-tr.m4 m4/codeset.m4 diff --git a/modules/c-strcasestr-tests b/modules/c-strcasestr-tests --- 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 --- 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 --- a/modules/canonicalize-lgpl-tests +++ b/modules/canonicalize-lgpl-tests @@ -1,6 +1,7 @@ Files: +tests/test-canonicalize-lgpl.c tests/signature.h -tests/test-canonicalize-lgpl.c +tests/macros.h Depends-on: same-inode diff --git a/modules/canonicalize-tests b/modules/canonicalize-tests --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/modules/dup2-tests +++ b/modules/dup2-tests @@ -1,6 +1,7 @@ Files: +tests/test-dup2.c tests/signature.h -tests/test-dup2.c +tests/macros.h Depends-on: binary-io diff --git a/modules/dup3-tests b/modules/dup3-tests --- a/modules/dup3-tests +++ b/modules/dup3-tests @@ -1,6 +1,7 @@ Files: +tests/test-dup3.c tests/signature.h -tests/test-dup3.c +tests/macros.h Depends-on: open diff --git a/modules/duplocale-tests b/modules/duplocale-tests --- a/modules/duplocale-tests +++ b/modules/duplocale-tests @@ -1,6 +1,7 @@ Files: +tests/test-duplocale.c tests/signature.h -tests/test-duplocale.c +tests/macros.h Depends-on: diff --git a/modules/fbufmode-tests b/modules/fbufmode-tests --- 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 --- a/modules/fchdir-tests +++ b/modules/fchdir-tests @@ -1,6 +1,7 @@ Files: +tests/test-fchdir.c tests/signature.h -tests/test-fchdir.c +tests/macros.h Depends-on: getcwd diff --git a/modules/fcntl-safer-tests b/modules/fcntl-safer-tests --- 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 --- a/modules/fcntl-tests +++ b/modules/fcntl-tests @@ -1,6 +1,7 @@ Files: +tests/test-fcntl.c tests/signature.h -tests/test-fcntl.c +tests/macros.h Depends-on: binary-io diff --git a/modules/fdopendir-tests b/modules/fdopendir-tests --- a/modules/fdopendir-tests +++ b/modules/fdopendir-tests @@ -1,6 +1,7 @@ Files: +tests/test-fdopendir.c tests/signature.h -tests/test-fdopendir.c +tests/macros.h Depends-on: open diff --git a/modules/fdutimensat-tests b/modules/fdutimensat-tests --- a/modules/fdutimensat-tests +++ b/modules/fdutimensat-tests @@ -5,6 +5,7 @@ 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 --- 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 --- 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 --- a/modules/flock-tests +++ b/modules/flock-tests @@ -1,6 +1,7 @@ Files: +tests/test-flock.c tests/signature.h -tests/test-flock.c +tests/macros.h Depends-on: unistd diff --git a/modules/floorf-tests b/modules/floorf-tests --- 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 --- 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 --- a/modules/fnmatch-tests +++ b/modules/fnmatch-tests @@ -1,6 +1,7 @@ Files: +tests/test-fnmatch.c tests/signature.h -tests/test-fnmatch.c +tests/macros.h Makefile.am: TESTS += test-fnmatch diff --git a/modules/fopen-safer-tests b/modules/fopen-safer-tests --- 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 --- 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 --- 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 --- 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.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 --- 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 --- 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 --- 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 --- 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 --- a/modules/freadptr-tests +++ b/modules/freadptr-tests @@ -3,6 +3,7 @@ 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 --- 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 --- a/modules/freopen-tests +++ b/modules/freopen-tests @@ -1,6 +1,7 @@ Files: +tests/test-freopen.c tests/signature.h -tests/test-freopen.c +tests/macros.h Depends-on: diff --git a/modules/frexp-nolibm-tests b/modules/frexp-nolibm-tests --- a/modules/frexp-nolibm-tests +++ b/modules/frexp-nolibm-tests @@ -1,6 +1,7 @@ Files: +tests/test-frexp.c tests/signature.h -tests/test-frexp.c +tests/macros.h Depends-on: isnand-nolibm diff --git a/modules/frexp-tests b/modules/frexp-tests --- 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 --- a/modules/frexpl-nolibm-tests +++ b/modules/frexpl-nolibm-tests @@ -1,6 +1,7 @@ Files: +tests/test-frexpl.c tests/signature.h -tests/test-frexpl.c +tests/macros.h Depends-on: fpucw diff --git a/modules/frexpl-tests b/modules/frexpl-tests --- 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 --- 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 --- 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 --- 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 --- a/modules/fsync-tests +++ b/modules/fsync-tests @@ -1,6 +1,7 @@ Files: +tests/test-fsync.c tests/signature.h -tests/test-fsync.c +tests/macros.h Depends-on: diff --git a/modules/ftell-tests b/modules/ftell-tests --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/modules/getcwd-tests +++ b/modules/getcwd-tests @@ -1,6 +1,7 @@ Files: +tests/test-getcwd.c tests/signature.h -tests/test-getcwd.c +tests/macros.h Depends-on: diff --git a/modules/getdate-tests b/modules/getdate-tests --- 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 --- a/modules/getdelim-tests +++ b/modules/getdelim-tests @@ -1,6 +1,7 @@ Files: +tests/test-getdelim.c tests/signature.h -tests/test-getdelim.c +tests/macros.h Depends-on: diff --git a/modules/getdtablesize-tests b/modules/getdtablesize-tests --- a/modules/getdtablesize-tests +++ b/modules/getdtablesize-tests @@ -1,6 +1,7 @@ Files: +tests/test-getdtablesize.c tests/signature.h -tests/test-getdtablesize.c +tests/macros.h Depends-on: diff --git a/modules/getgroups-tests b/modules/getgroups-tests --- a/modules/getgroups-tests +++ b/modules/getgroups-tests @@ -1,6 +1,7 @@ Files: +tests/test-getgroups.c tests/signature.h -tests/test-getgroups.c +tests/macros.h Depends-on: diff --git a/modules/getline-tests b/modules/getline-tests --- a/modules/getline-tests +++ b/modules/getline-tests @@ -1,6 +1,7 @@ Files: +tests/test-getline.c tests/signature.h -tests/test-getline.c +tests/macros.h Depends-on: diff --git a/modules/getndelim2-tests b/modules/getndelim2-tests --- 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 --- a/modules/glob-tests +++ b/modules/glob-tests @@ -1,6 +1,7 @@ Files: +tests/test-glob.c tests/signature.h -tests/test-glob.c +tests/macros.h Makefile.am: TESTS += test-glob diff --git a/modules/hash-tests b/modules/hash-tests --- 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 --- 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 --- a/modules/iconv-tests +++ b/modules/iconv-tests @@ -1,6 +1,7 @@ Files: +tests/test-iconv.c tests/signature.h -tests/test-iconv.c +tests/macros.h Depends-on: diff --git a/modules/iconv_open-utf-tests b/modules/iconv_open-utf-tests --- 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 --- a/modules/idpriv-drop-tests +++ b/modules/idpriv-drop-tests @@ -7,6 +7,7 @@ tests/test-idpriv-drop.sh tests/test-idpriv-drop.su.sh tests/test-idpriv-drop.c +tests/macros.h Depends-on: stdbool diff --git a/modules/idpriv-droptemp-tests b/modules/idpriv-droptemp-tests --- a/modules/idpriv-droptemp-tests +++ b/modules/idpriv-droptemp-tests @@ -7,6 +7,7 @@ tests/test-idpriv-droptemp.sh tests/test-idpriv-droptemp.su.sh tests/test-idpriv-droptemp.c +tests/macros.h Depends-on: stdbool diff --git a/modules/inet_ntop-tests b/modules/inet_ntop-tests --- a/modules/inet_ntop-tests +++ b/modules/inet_ntop-tests @@ -1,6 +1,7 @@ Files: +tests/test-inet_ntop.c tests/signature.h -tests/test-inet_ntop.c +tests/macros.h Depends-on: netinet_in diff --git a/modules/inet_pton-tests b/modules/inet_pton-tests --- a/modules/inet_pton-tests +++ b/modules/inet_pton-tests @@ -1,6 +1,7 @@ Files: +tests/test-inet_pton.c tests/signature.h -tests/test-inet_pton.c +tests/macros.h Depends-on: netinet_in diff --git a/modules/isblank-tests b/modules/isblank-tests --- a/modules/isblank-tests +++ b/modules/isblank-tests @@ -1,6 +1,7 @@ Files: +tests/test-isblank.c tests/signature.h -tests/test-isblank.c +tests/macros.h Depends-on: diff --git a/modules/isfinite-tests b/modules/isfinite-tests --- 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 --- a/modules/isinf-tests +++ b/modules/isinf-tests @@ -3,6 +3,7 @@ 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 --- 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 --- a/modules/isnand-nolibm-tests +++ b/modules/isnand-nolibm-tests @@ -2,6 +2,7 @@ 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 --- a/modules/isnand-tests +++ b/modules/isnand-tests @@ -2,6 +2,7 @@ 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 --- a/modules/isnanf-nolibm-tests +++ b/modules/isnanf-nolibm-tests @@ -2,6 +2,7 @@ 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 --- a/modules/isnanf-tests +++ b/modules/isnanf-tests @@ -2,6 +2,7 @@ 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 --- a/modules/isnanl-nolibm-tests +++ b/modules/isnanl-nolibm-tests @@ -2,6 +2,7 @@ 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 --- a/modules/isnanl-tests +++ b/modules/isnanl-tests @@ -2,6 +2,7 @@ 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/modules/mbmemcasecmp-tests +++ b/modules/mbmemcasecmp-tests @@ -4,6 +4,7 @@ tests/test-mbmemcasecmp3.sh tests/test-mbmemcasecmp.c tests/test-mbmemcasecmp.h +tests/macros.h m4/locale-fr.m4 m4/locale-tr.m4 m4/codeset.m4 diff --git a/modules/mbmemcasecoll-tests b/modules/mbmemcasecoll-tests --- a/modules/mbmemcasecoll-tests +++ b/modules/mbmemcasecoll-tests @@ -4,6 +4,7 @@ tests/test-mbmemcasecoll3.sh tests/test-mbmemcasecoll.c tests/test-mbmemcasecmp.h +tests/macros.h m4/locale-fr.m4 m4/locale-tr.m4 m4/codeset.m4 diff --git a/modules/mbrtowc-tests b/modules/mbrtowc-tests --- 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 --- 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 --- a/modules/mbscasestr-tests +++ b/modules/mbscasestr-tests @@ -6,6 +6,7 @@ tests/test-mbscasestr3.c tests/test-mbscasestr4.sh tests/test-mbscasestr4.c +tests/macros.h m4/locale-fr.m4 m4/locale-tr.m4 m4/locale-zh.m4 diff --git a/modules/mbschr-tests b/modules/mbschr-tests --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/modules/mbsstr-tests +++ b/modules/mbsstr-tests @@ -4,6 +4,7 @@ tests/test-mbsstr2.c tests/test-mbsstr3.sh tests/test-mbsstr3.c +tests/macros.h m4/locale-fr.m4 m4/locale-zh.m4 m4/codeset.m4 diff --git a/modules/memchr-tests b/modules/memchr-tests --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/modules/nanosleep-tests +++ b/modules/nanosleep-tests @@ -1,6 +1,7 @@ Files: +tests/test-nanosleep.c tests/signature.h -tests/test-nanosleep.c +tests/macros.h Depends-on: diff --git a/modules/nl_langinfo-tests b/modules/nl_langinfo-tests --- 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 --- a/modules/obstack-printf-tests +++ b/modules/obstack-printf-tests @@ -1,6 +1,7 @@ Files: +tests/test-obstack-printf.c tests/signature.h -tests/test-obstack-printf.c +tests/macros.h Depends-on: progname diff --git a/modules/open-tests b/modules/open-tests --- 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 --- 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-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 --- a/modules/pipe-filter-gi-tests +++ b/modules/pipe-filter-gi-tests @@ -5,6 +5,7 @@ tests/test-pipe-filter-gi2.sh tests/test-pipe-filter-gi2-main.c tests/test-pipe-filter-gi2-child.c +tests/macros.h Depends-on: binary-io diff --git a/modules/pipe-filter-ii-tests b/modules/pipe-filter-ii-tests --- a/modules/pipe-filter-ii-tests +++ b/modules/pipe-filter-ii-tests @@ -5,6 +5,7 @@ tests/test-pipe-filter-ii2.sh tests/test-pipe-filter-ii2-main.c tests/test-pipe-filter-ii2-child.c +tests/macros.h Depends-on: binary-io diff --git a/modules/pipe2-tests b/modules/pipe2-tests --- a/modules/pipe2-tests +++ b/modules/pipe2-tests @@ -1,6 +1,7 @@ Files: +tests/test-pipe2.c tests/signature.h -tests/test-pipe2.c +tests/macros.h Depends-on: stdbool diff --git a/modules/popen-safer-tests b/modules/popen-safer-tests --- a/modules/popen-safer-tests +++ b/modules/popen-safer-tests @@ -2,6 +2,7 @@ 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/modules/random_r-tests +++ b/modules/random_r-tests @@ -1,6 +1,7 @@ Files: +tests/test-random_r.c tests/signature.h -tests/test-random_r.c +tests/macros.h Depends-on: diff --git a/modules/rawmemchr-tests b/modules/rawmemchr-tests --- a/modules/rawmemchr-tests +++ b/modules/rawmemchr-tests @@ -1,6 +1,7 @@ Files: +tests/test-rawmemchr.c tests/signature.h -tests/test-rawmemchr.c +tests/macros.h Depends-on: diff --git a/modules/rbtree-list-tests b/modules/rbtree-list-tests --- 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 --- 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 --- 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 --- 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 --- a/modules/remove-tests +++ b/modules/remove-tests @@ -1,6 +1,7 @@ Files: +tests/test-remove.c tests/signature.h -tests/test-remove.c +tests/macros.h Depends-on: symlink diff --git a/modules/rename-tests b/modules/rename-tests --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/modules/setenv-tests +++ b/modules/setenv-tests @@ -1,6 +1,7 @@ Files: +tests/test-setenv.c tests/signature.h -tests/test-setenv.c +tests/macros.h Depends-on: diff --git a/modules/sigaction-tests b/modules/sigaction-tests --- a/modules/sigaction-tests +++ b/modules/sigaction-tests @@ -1,6 +1,7 @@ Files: +tests/test-sigaction.c tests/signature.h -tests/test-sigaction.c +tests/macros.h Depends-on: diff --git a/modules/signbit-tests b/modules/signbit-tests --- 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 --- a/modules/sleep-tests +++ b/modules/sleep-tests @@ -1,6 +1,7 @@ Files: +tests/test-sleep.c tests/signature.h -tests/test-sleep.c +tests/macros.h Depends-on: diff --git a/modules/snprintf-posix-tests b/modules/snprintf-posix-tests --- 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 --- a/modules/snprintf-tests +++ b/modules/snprintf-tests @@ -1,6 +1,7 @@ Files: +tests/test-snprintf.c tests/signature.h -tests/test-snprintf.c +tests/macros.h Depends-on: diff --git a/modules/sprintf-posix-tests b/modules/sprintf-posix-tests --- 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 --- 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 --- 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 --- a/modules/strcasestr-tests +++ b/modules/strcasestr-tests @@ -1,6 +1,7 @@ Files: +tests/test-strcasestr.c tests/signature.h -tests/test-strcasestr.c +tests/macros.h Depends-on: diff --git a/modules/strchrnul-tests b/modules/strchrnul-tests --- a/modules/strchrnul-tests +++ b/modules/strchrnul-tests @@ -1,6 +1,7 @@ Files: +tests/test-strchrnul.c tests/signature.h -tests/test-strchrnul.c +tests/macros.h Depends-on: diff --git a/modules/strerror-tests b/modules/strerror-tests --- a/modules/strerror-tests +++ b/modules/strerror-tests @@ -1,6 +1,7 @@ Files: +tests/test-strerror.c tests/signature.h -tests/test-strerror.c +tests/macros.h Depends-on: diff --git a/modules/striconv-tests b/modules/striconv-tests --- 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 --- 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 --- 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 --- a/modules/strsignal-tests +++ b/modules/strsignal-tests @@ -1,6 +1,7 @@ Files: +tests/test-strsignal.c tests/signature.h -tests/test-strsignal.c +tests/macros.h Depends-on: diff --git a/modules/strstr-tests b/modules/strstr-tests --- 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 --- a/modules/strtod-tests +++ b/modules/strtod-tests @@ -1,6 +1,7 @@ Files: +tests/test-strtod.c tests/signature.h -tests/test-strtod.c +tests/macros.h Depends-on: float diff --git a/modules/strverscmp-tests b/modules/strverscmp-tests --- a/modules/strverscmp-tests +++ b/modules/strverscmp-tests @@ -1,6 +1,7 @@ Files: +tests/test-strverscmp.c tests/signature.h -tests/test-strverscmp.c +tests/macros.h Depends-on: diff --git a/modules/symlink-tests b/modules/symlink-tests --- 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 --- 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 --- 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 --- 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 --- 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 --- a/modules/uname-tests +++ b/modules/uname-tests @@ -1,6 +1,7 @@ Files: +tests/test-uname.c tests/signature.h -tests/test-uname.c +tests/macros.h Depends-on: diff --git a/modules/unicase/cased-tests b/modules/unicase/cased-tests --- a/modules/unicase/cased-tests +++ b/modules/unicase/cased-tests @@ -2,6 +2,7 @@ tests/unicase/test-cased.c tests/unicase/test-predicate-part1.h tests/unicase/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unicase/ignorable-tests b/modules/unicase/ignorable-tests --- a/modules/unicase/ignorable-tests +++ b/modules/unicase/ignorable-tests @@ -2,6 +2,7 @@ tests/unicase/test-ignorable.c tests/unicase/test-predicate-part1.h tests/unicase/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unicase/locale-language-tests b/modules/unicase/locale-language-tests --- 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 --- a/modules/unicase/tolower-tests +++ b/modules/unicase/tolower-tests @@ -2,6 +2,7 @@ tests/unicase/test-uc_tolower.c tests/unicase/test-mapping-part1.h tests/unicase/test-mapping-part2.h +tests/macros.h Depends-on: diff --git a/modules/unicase/totitle-tests b/modules/unicase/totitle-tests --- a/modules/unicase/totitle-tests +++ b/modules/unicase/totitle-tests @@ -2,6 +2,7 @@ tests/unicase/test-uc_totitle.c tests/unicase/test-mapping-part1.h tests/unicase/test-mapping-part2.h +tests/macros.h Depends-on: diff --git a/modules/unicase/toupper-tests b/modules/unicase/toupper-tests --- a/modules/unicase/toupper-tests +++ b/modules/unicase/toupper-tests @@ -2,6 +2,7 @@ tests/unicase/test-uc_toupper.c tests/unicase/test-mapping-part1.h tests/unicase/test-mapping-part2.h +tests/macros.h Depends-on: diff --git a/modules/unicase/u16-casecmp-tests b/modules/unicase/u16-casecmp-tests --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/modules/unicase/ulc-casecmp-tests +++ b/modules/unicase/ulc-casecmp-tests @@ -3,6 +3,7 @@ tests/unicase/test-ulc-casecmp2.sh tests/unicase/test-ulc-casecmp.c tests/unicase/test-casecmp.h +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/unicase/ulc-casecoll-tests b/modules/unicase/ulc-casecoll-tests --- a/modules/unicase/ulc-casecoll-tests +++ b/modules/unicase/ulc-casecoll-tests @@ -3,6 +3,7 @@ tests/unicase/test-ulc-casecoll2.sh tests/unicase/test-ulc-casecoll.c tests/unicase/test-casecmp.h +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/uniconv/u16-conv-from-enc-tests b/modules/uniconv/u16-conv-from-enc-tests --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/modules/unictype/category-C-tests +++ b/modules/unictype/category-C-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_C.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Cc-tests b/modules/unictype/category-Cc-tests --- a/modules/unictype/category-Cc-tests +++ b/modules/unictype/category-Cc-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Cc.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Cf-tests b/modules/unictype/category-Cf-tests --- a/modules/unictype/category-Cf-tests +++ b/modules/unictype/category-Cf-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Cf.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Cn-tests b/modules/unictype/category-Cn-tests --- a/modules/unictype/category-Cn-tests +++ b/modules/unictype/category-Cn-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Cn.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Co-tests b/modules/unictype/category-Co-tests --- a/modules/unictype/category-Co-tests +++ b/modules/unictype/category-Co-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Co.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Cs-tests b/modules/unictype/category-Cs-tests --- a/modules/unictype/category-Cs-tests +++ b/modules/unictype/category-Cs-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Cs.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-L-tests b/modules/unictype/category-L-tests --- a/modules/unictype/category-L-tests +++ b/modules/unictype/category-L-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_L.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Ll-tests b/modules/unictype/category-Ll-tests --- a/modules/unictype/category-Ll-tests +++ b/modules/unictype/category-Ll-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Ll.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Lm-tests b/modules/unictype/category-Lm-tests --- a/modules/unictype/category-Lm-tests +++ b/modules/unictype/category-Lm-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Lm.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Lo-tests b/modules/unictype/category-Lo-tests --- a/modules/unictype/category-Lo-tests +++ b/modules/unictype/category-Lo-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Lo.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Lt-tests b/modules/unictype/category-Lt-tests --- a/modules/unictype/category-Lt-tests +++ b/modules/unictype/category-Lt-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Lt.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Lu-tests b/modules/unictype/category-Lu-tests --- a/modules/unictype/category-Lu-tests +++ b/modules/unictype/category-Lu-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Lu.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-M-tests b/modules/unictype/category-M-tests --- a/modules/unictype/category-M-tests +++ b/modules/unictype/category-M-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_M.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Mc-tests b/modules/unictype/category-Mc-tests --- a/modules/unictype/category-Mc-tests +++ b/modules/unictype/category-Mc-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Mc.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Me-tests b/modules/unictype/category-Me-tests --- a/modules/unictype/category-Me-tests +++ b/modules/unictype/category-Me-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Me.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Mn-tests b/modules/unictype/category-Mn-tests --- a/modules/unictype/category-Mn-tests +++ b/modules/unictype/category-Mn-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Mn.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-N-tests b/modules/unictype/category-N-tests --- a/modules/unictype/category-N-tests +++ b/modules/unictype/category-N-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_N.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Nd-tests b/modules/unictype/category-Nd-tests --- a/modules/unictype/category-Nd-tests +++ b/modules/unictype/category-Nd-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Nd.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Nl-tests b/modules/unictype/category-Nl-tests --- a/modules/unictype/category-Nl-tests +++ b/modules/unictype/category-Nl-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Nl.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-No-tests b/modules/unictype/category-No-tests --- a/modules/unictype/category-No-tests +++ b/modules/unictype/category-No-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_No.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-P-tests b/modules/unictype/category-P-tests --- a/modules/unictype/category-P-tests +++ b/modules/unictype/category-P-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_P.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Pc-tests b/modules/unictype/category-Pc-tests --- a/modules/unictype/category-Pc-tests +++ b/modules/unictype/category-Pc-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Pc.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Pd-tests b/modules/unictype/category-Pd-tests --- a/modules/unictype/category-Pd-tests +++ b/modules/unictype/category-Pd-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Pd.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Pe-tests b/modules/unictype/category-Pe-tests --- a/modules/unictype/category-Pe-tests +++ b/modules/unictype/category-Pe-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Pe.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Pf-tests b/modules/unictype/category-Pf-tests --- a/modules/unictype/category-Pf-tests +++ b/modules/unictype/category-Pf-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Pf.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Pi-tests b/modules/unictype/category-Pi-tests --- a/modules/unictype/category-Pi-tests +++ b/modules/unictype/category-Pi-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Pi.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Po-tests b/modules/unictype/category-Po-tests --- a/modules/unictype/category-Po-tests +++ b/modules/unictype/category-Po-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Po.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Ps-tests b/modules/unictype/category-Ps-tests --- a/modules/unictype/category-Ps-tests +++ b/modules/unictype/category-Ps-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Ps.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-S-tests b/modules/unictype/category-S-tests --- a/modules/unictype/category-S-tests +++ b/modules/unictype/category-S-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_S.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Sc-tests b/modules/unictype/category-Sc-tests --- a/modules/unictype/category-Sc-tests +++ b/modules/unictype/category-Sc-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Sc.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Sk-tests b/modules/unictype/category-Sk-tests --- a/modules/unictype/category-Sk-tests +++ b/modules/unictype/category-Sk-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Sk.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Sm-tests b/modules/unictype/category-Sm-tests --- a/modules/unictype/category-Sm-tests +++ b/modules/unictype/category-Sm-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Sm.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-So-tests b/modules/unictype/category-So-tests --- a/modules/unictype/category-So-tests +++ b/modules/unictype/category-So-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_So.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Z-tests b/modules/unictype/category-Z-tests --- a/modules/unictype/category-Z-tests +++ b/modules/unictype/category-Z-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Z.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Zl-tests b/modules/unictype/category-Zl-tests --- a/modules/unictype/category-Zl-tests +++ b/modules/unictype/category-Zl-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Zl.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Zp-tests b/modules/unictype/category-Zp-tests --- a/modules/unictype/category-Zp-tests +++ b/modules/unictype/category-Zp-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Zp.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Zs-tests b/modules/unictype/category-Zs-tests --- a/modules/unictype/category-Zs-tests +++ b/modules/unictype/category-Zs-tests @@ -2,6 +2,7 @@ tests/unictype/test-categ_Zs.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-and-not-tests b/modules/unictype/category-and-not-tests --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/modules/unictype/ctype-alnum-tests +++ b/modules/unictype/ctype-alnum-tests @@ -2,6 +2,7 @@ tests/unictype/test-ctype_alnum.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-alpha-tests b/modules/unictype/ctype-alpha-tests --- a/modules/unictype/ctype-alpha-tests +++ b/modules/unictype/ctype-alpha-tests @@ -2,6 +2,7 @@ tests/unictype/test-ctype_alpha.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-blank-tests b/modules/unictype/ctype-blank-tests --- a/modules/unictype/ctype-blank-tests +++ b/modules/unictype/ctype-blank-tests @@ -2,6 +2,7 @@ tests/unictype/test-ctype_blank.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-cntrl-tests b/modules/unictype/ctype-cntrl-tests --- a/modules/unictype/ctype-cntrl-tests +++ b/modules/unictype/ctype-cntrl-tests @@ -2,6 +2,7 @@ tests/unictype/test-ctype_cntrl.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-digit-tests b/modules/unictype/ctype-digit-tests --- a/modules/unictype/ctype-digit-tests +++ b/modules/unictype/ctype-digit-tests @@ -2,6 +2,7 @@ tests/unictype/test-ctype_digit.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-graph-tests b/modules/unictype/ctype-graph-tests --- a/modules/unictype/ctype-graph-tests +++ b/modules/unictype/ctype-graph-tests @@ -2,6 +2,7 @@ tests/unictype/test-ctype_graph.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-lower-tests b/modules/unictype/ctype-lower-tests --- a/modules/unictype/ctype-lower-tests +++ b/modules/unictype/ctype-lower-tests @@ -2,6 +2,7 @@ tests/unictype/test-ctype_lower.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-print-tests b/modules/unictype/ctype-print-tests --- a/modules/unictype/ctype-print-tests +++ b/modules/unictype/ctype-print-tests @@ -2,6 +2,7 @@ tests/unictype/test-ctype_print.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-punct-tests b/modules/unictype/ctype-punct-tests --- a/modules/unictype/ctype-punct-tests +++ b/modules/unictype/ctype-punct-tests @@ -2,6 +2,7 @@ tests/unictype/test-ctype_punct.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-space-tests b/modules/unictype/ctype-space-tests --- a/modules/unictype/ctype-space-tests +++ b/modules/unictype/ctype-space-tests @@ -2,6 +2,7 @@ tests/unictype/test-ctype_space.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-upper-tests b/modules/unictype/ctype-upper-tests --- a/modules/unictype/ctype-upper-tests +++ b/modules/unictype/ctype-upper-tests @@ -2,6 +2,7 @@ tests/unictype/test-ctype_upper.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-xdigit-tests b/modules/unictype/ctype-xdigit-tests --- a/modules/unictype/ctype-xdigit-tests +++ b/modules/unictype/ctype-xdigit-tests @@ -2,6 +2,7 @@ tests/unictype/test-ctype_xdigit.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/decimal-digit-tests b/modules/unictype/decimal-digit-tests --- 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 --- 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 --- 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 --- 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 --- a/modules/unictype/property-alphabetic-tests +++ b/modules/unictype/property-alphabetic-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_alphabetic.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-ascii-hex-digit-tests b/modules/unictype/property-ascii-hex-digit-tests --- a/modules/unictype/property-ascii-hex-digit-tests +++ b/modules/unictype/property-ascii-hex-digit-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_ascii_hex_digit.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-arabic-digit-tests b/modules/unictype/property-bidi-arabic-digit-tests --- a/modules/unictype/property-bidi-arabic-digit-tests +++ b/modules/unictype/property-bidi-arabic-digit-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_bidi_arabic_digit.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-arabic-right-to-left-tests b/modules/unictype/property-bidi-arabic-right-to-left-tests --- a/modules/unictype/property-bidi-arabic-right-to-left-tests +++ b/modules/unictype/property-bidi-arabic-right-to-left-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_bidi_arabic_right_to_left.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-block-separator-tests b/modules/unictype/property-bidi-block-separator-tests --- a/modules/unictype/property-bidi-block-separator-tests +++ b/modules/unictype/property-bidi-block-separator-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_bidi_block_separator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-boundary-neutral-tests b/modules/unictype/property-bidi-boundary-neutral-tests --- a/modules/unictype/property-bidi-boundary-neutral-tests +++ b/modules/unictype/property-bidi-boundary-neutral-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_bidi_boundary_neutral.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-common-separator-tests b/modules/unictype/property-bidi-common-separator-tests --- a/modules/unictype/property-bidi-common-separator-tests +++ b/modules/unictype/property-bidi-common-separator-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_bidi_common_separator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-control-tests b/modules/unictype/property-bidi-control-tests --- a/modules/unictype/property-bidi-control-tests +++ b/modules/unictype/property-bidi-control-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_bidi_control.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-embedding-or-override-tests b/modules/unictype/property-bidi-embedding-or-override-tests --- a/modules/unictype/property-bidi-embedding-or-override-tests +++ b/modules/unictype/property-bidi-embedding-or-override-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_bidi_embedding_or_override.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-eur-num-separator-tests b/modules/unictype/property-bidi-eur-num-separator-tests --- a/modules/unictype/property-bidi-eur-num-separator-tests +++ b/modules/unictype/property-bidi-eur-num-separator-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_bidi_eur_num_separator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-eur-num-terminator-tests b/modules/unictype/property-bidi-eur-num-terminator-tests --- a/modules/unictype/property-bidi-eur-num-terminator-tests +++ b/modules/unictype/property-bidi-eur-num-terminator-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_bidi_eur_num_terminator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-european-digit-tests b/modules/unictype/property-bidi-european-digit-tests --- a/modules/unictype/property-bidi-european-digit-tests +++ b/modules/unictype/property-bidi-european-digit-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_bidi_european_digit.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-hebrew-right-to-left-tests b/modules/unictype/property-bidi-hebrew-right-to-left-tests --- a/modules/unictype/property-bidi-hebrew-right-to-left-tests +++ b/modules/unictype/property-bidi-hebrew-right-to-left-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_bidi_hebrew_right_to_left.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-left-to-right-tests b/modules/unictype/property-bidi-left-to-right-tests --- a/modules/unictype/property-bidi-left-to-right-tests +++ b/modules/unictype/property-bidi-left-to-right-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_bidi_left_to_right.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-non-spacing-mark-tests b/modules/unictype/property-bidi-non-spacing-mark-tests --- a/modules/unictype/property-bidi-non-spacing-mark-tests +++ b/modules/unictype/property-bidi-non-spacing-mark-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_bidi_non_spacing_mark.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-other-neutral-tests b/modules/unictype/property-bidi-other-neutral-tests --- a/modules/unictype/property-bidi-other-neutral-tests +++ b/modules/unictype/property-bidi-other-neutral-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_bidi_other_neutral.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-pdf-tests b/modules/unictype/property-bidi-pdf-tests --- a/modules/unictype/property-bidi-pdf-tests +++ b/modules/unictype/property-bidi-pdf-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_bidi_pdf.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-segment-separator-tests b/modules/unictype/property-bidi-segment-separator-tests --- a/modules/unictype/property-bidi-segment-separator-tests +++ b/modules/unictype/property-bidi-segment-separator-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_bidi_segment_separator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-whitespace-tests b/modules/unictype/property-bidi-whitespace-tests --- a/modules/unictype/property-bidi-whitespace-tests +++ b/modules/unictype/property-bidi-whitespace-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_bidi_whitespace.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-byname-tests b/modules/unictype/property-byname-tests --- 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 --- a/modules/unictype/property-combining-tests +++ b/modules/unictype/property-combining-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_combining.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-composite-tests b/modules/unictype/property-composite-tests --- a/modules/unictype/property-composite-tests +++ b/modules/unictype/property-composite-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_composite.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-currency-symbol-tests b/modules/unictype/property-currency-symbol-tests --- a/modules/unictype/property-currency-symbol-tests +++ b/modules/unictype/property-currency-symbol-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_currency_symbol.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-dash-tests b/modules/unictype/property-dash-tests --- a/modules/unictype/property-dash-tests +++ b/modules/unictype/property-dash-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_dash.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-decimal-digit-tests b/modules/unictype/property-decimal-digit-tests --- a/modules/unictype/property-decimal-digit-tests +++ b/modules/unictype/property-decimal-digit-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_decimal_digit.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-default-ignorable-code-point-tests b/modules/unictype/property-default-ignorable-code-point-tests --- a/modules/unictype/property-default-ignorable-code-point-tests +++ b/modules/unictype/property-default-ignorable-code-point-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_default_ignorable_code_point.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-deprecated-tests b/modules/unictype/property-deprecated-tests --- a/modules/unictype/property-deprecated-tests +++ b/modules/unictype/property-deprecated-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_deprecated.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-diacritic-tests b/modules/unictype/property-diacritic-tests --- a/modules/unictype/property-diacritic-tests +++ b/modules/unictype/property-diacritic-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_diacritic.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-extender-tests b/modules/unictype/property-extender-tests --- a/modules/unictype/property-extender-tests +++ b/modules/unictype/property-extender-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_extender.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-format-control-tests b/modules/unictype/property-format-control-tests --- a/modules/unictype/property-format-control-tests +++ b/modules/unictype/property-format-control-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_format_control.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-grapheme-base-tests b/modules/unictype/property-grapheme-base-tests --- a/modules/unictype/property-grapheme-base-tests +++ b/modules/unictype/property-grapheme-base-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_grapheme_base.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-grapheme-extend-tests b/modules/unictype/property-grapheme-extend-tests --- a/modules/unictype/property-grapheme-extend-tests +++ b/modules/unictype/property-grapheme-extend-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_grapheme_extend.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-grapheme-link-tests b/modules/unictype/property-grapheme-link-tests --- a/modules/unictype/property-grapheme-link-tests +++ b/modules/unictype/property-grapheme-link-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_grapheme_link.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-hex-digit-tests b/modules/unictype/property-hex-digit-tests --- a/modules/unictype/property-hex-digit-tests +++ b/modules/unictype/property-hex-digit-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_hex_digit.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-hyphen-tests b/modules/unictype/property-hyphen-tests --- a/modules/unictype/property-hyphen-tests +++ b/modules/unictype/property-hyphen-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_hyphen.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-id-continue-tests b/modules/unictype/property-id-continue-tests --- a/modules/unictype/property-id-continue-tests +++ b/modules/unictype/property-id-continue-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_id_continue.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-id-start-tests b/modules/unictype/property-id-start-tests --- a/modules/unictype/property-id-start-tests +++ b/modules/unictype/property-id-start-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_id_start.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-ideographic-tests b/modules/unictype/property-ideographic-tests --- a/modules/unictype/property-ideographic-tests +++ b/modules/unictype/property-ideographic-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_ideographic.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-ids-binary-operator-tests b/modules/unictype/property-ids-binary-operator-tests --- a/modules/unictype/property-ids-binary-operator-tests +++ b/modules/unictype/property-ids-binary-operator-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_ids_binary_operator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-ids-trinary-operator-tests b/modules/unictype/property-ids-trinary-operator-tests --- a/modules/unictype/property-ids-trinary-operator-tests +++ b/modules/unictype/property-ids-trinary-operator-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_ids_trinary_operator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-ignorable-control-tests b/modules/unictype/property-ignorable-control-tests --- a/modules/unictype/property-ignorable-control-tests +++ b/modules/unictype/property-ignorable-control-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_ignorable_control.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-iso-control-tests b/modules/unictype/property-iso-control-tests --- a/modules/unictype/property-iso-control-tests +++ b/modules/unictype/property-iso-control-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_iso_control.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-join-control-tests b/modules/unictype/property-join-control-tests --- a/modules/unictype/property-join-control-tests +++ b/modules/unictype/property-join-control-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_join_control.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-left-of-pair-tests b/modules/unictype/property-left-of-pair-tests --- a/modules/unictype/property-left-of-pair-tests +++ b/modules/unictype/property-left-of-pair-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_left_of_pair.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-line-separator-tests b/modules/unictype/property-line-separator-tests --- a/modules/unictype/property-line-separator-tests +++ b/modules/unictype/property-line-separator-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_line_separator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-logical-order-exception-tests b/modules/unictype/property-logical-order-exception-tests --- a/modules/unictype/property-logical-order-exception-tests +++ b/modules/unictype/property-logical-order-exception-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_logical_order_exception.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-lowercase-tests b/modules/unictype/property-lowercase-tests --- a/modules/unictype/property-lowercase-tests +++ b/modules/unictype/property-lowercase-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_lowercase.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-math-tests b/modules/unictype/property-math-tests --- a/modules/unictype/property-math-tests +++ b/modules/unictype/property-math-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_math.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-non-break-tests b/modules/unictype/property-non-break-tests --- a/modules/unictype/property-non-break-tests +++ b/modules/unictype/property-non-break-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_non_break.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-not-a-character-tests b/modules/unictype/property-not-a-character-tests --- a/modules/unictype/property-not-a-character-tests +++ b/modules/unictype/property-not-a-character-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_not_a_character.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-numeric-tests b/modules/unictype/property-numeric-tests --- a/modules/unictype/property-numeric-tests +++ b/modules/unictype/property-numeric-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_numeric.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-other-alphabetic-tests b/modules/unictype/property-other-alphabetic-tests --- a/modules/unictype/property-other-alphabetic-tests +++ b/modules/unictype/property-other-alphabetic-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_other_alphabetic.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-other-default-ignorable-code-point-tests b/modules/unictype/property-other-default-ignorable-code-point-tests --- a/modules/unictype/property-other-default-ignorable-code-point-tests +++ b/modules/unictype/property-other-default-ignorable-code-point-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_other_default_ignorable_code_point.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-other-grapheme-extend-tests b/modules/unictype/property-other-grapheme-extend-tests --- a/modules/unictype/property-other-grapheme-extend-tests +++ b/modules/unictype/property-other-grapheme-extend-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_other_grapheme_extend.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-other-id-continue-tests b/modules/unictype/property-other-id-continue-tests --- a/modules/unictype/property-other-id-continue-tests +++ b/modules/unictype/property-other-id-continue-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_other_id_continue.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-other-id-start-tests b/modules/unictype/property-other-id-start-tests --- a/modules/unictype/property-other-id-start-tests +++ b/modules/unictype/property-other-id-start-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_other_id_start.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-other-lowercase-tests b/modules/unictype/property-other-lowercase-tests --- a/modules/unictype/property-other-lowercase-tests +++ b/modules/unictype/property-other-lowercase-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_other_lowercase.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-other-math-tests b/modules/unictype/property-other-math-tests --- a/modules/unictype/property-other-math-tests +++ b/modules/unictype/property-other-math-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_other_math.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-other-uppercase-tests b/modules/unictype/property-other-uppercase-tests --- a/modules/unictype/property-other-uppercase-tests +++ b/modules/unictype/property-other-uppercase-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_other_uppercase.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-paired-punctuation-tests b/modules/unictype/property-paired-punctuation-tests --- a/modules/unictype/property-paired-punctuation-tests +++ b/modules/unictype/property-paired-punctuation-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_paired_punctuation.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-paragraph-separator-tests b/modules/unictype/property-paragraph-separator-tests --- a/modules/unictype/property-paragraph-separator-tests +++ b/modules/unictype/property-paragraph-separator-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_paragraph_separator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-pattern-syntax-tests b/modules/unictype/property-pattern-syntax-tests --- a/modules/unictype/property-pattern-syntax-tests +++ b/modules/unictype/property-pattern-syntax-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_pattern_syntax.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-pattern-white-space-tests b/modules/unictype/property-pattern-white-space-tests --- a/modules/unictype/property-pattern-white-space-tests +++ b/modules/unictype/property-pattern-white-space-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_pattern_white_space.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-private-use-tests b/modules/unictype/property-private-use-tests --- a/modules/unictype/property-private-use-tests +++ b/modules/unictype/property-private-use-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_private_use.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-punctuation-tests b/modules/unictype/property-punctuation-tests --- a/modules/unictype/property-punctuation-tests +++ b/modules/unictype/property-punctuation-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_punctuation.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-quotation-mark-tests b/modules/unictype/property-quotation-mark-tests --- a/modules/unictype/property-quotation-mark-tests +++ b/modules/unictype/property-quotation-mark-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_quotation_mark.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-radical-tests b/modules/unictype/property-radical-tests --- a/modules/unictype/property-radical-tests +++ b/modules/unictype/property-radical-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_radical.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-sentence-terminal-tests b/modules/unictype/property-sentence-terminal-tests --- a/modules/unictype/property-sentence-terminal-tests +++ b/modules/unictype/property-sentence-terminal-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_sentence_terminal.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-soft-dotted-tests b/modules/unictype/property-soft-dotted-tests --- a/modules/unictype/property-soft-dotted-tests +++ b/modules/unictype/property-soft-dotted-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_soft_dotted.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-space-tests b/modules/unictype/property-space-tests --- a/modules/unictype/property-space-tests +++ b/modules/unictype/property-space-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_space.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-terminal-punctuation-tests b/modules/unictype/property-terminal-punctuation-tests --- a/modules/unictype/property-terminal-punctuation-tests +++ b/modules/unictype/property-terminal-punctuation-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_terminal_punctuation.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-test-tests b/modules/unictype/property-test-tests --- 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 --- a/modules/unictype/property-titlecase-tests +++ b/modules/unictype/property-titlecase-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_titlecase.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-unassigned-code-value-tests b/modules/unictype/property-unassigned-code-value-tests --- a/modules/unictype/property-unassigned-code-value-tests +++ b/modules/unictype/property-unassigned-code-value-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_unassigned_code_value.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-unified-ideograph-tests b/modules/unictype/property-unified-ideograph-tests --- a/modules/unictype/property-unified-ideograph-tests +++ b/modules/unictype/property-unified-ideograph-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_unified_ideograph.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-uppercase-tests b/modules/unictype/property-uppercase-tests --- a/modules/unictype/property-uppercase-tests +++ b/modules/unictype/property-uppercase-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_uppercase.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-variation-selector-tests b/modules/unictype/property-variation-selector-tests --- a/modules/unictype/property-variation-selector-tests +++ b/modules/unictype/property-variation-selector-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_variation_selector.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-white-space-tests b/modules/unictype/property-white-space-tests --- a/modules/unictype/property-white-space-tests +++ b/modules/unictype/property-white-space-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_white_space.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-xid-continue-tests b/modules/unictype/property-xid-continue-tests --- a/modules/unictype/property-xid-continue-tests +++ b/modules/unictype/property-xid-continue-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_xid_continue.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-xid-start-tests b/modules/unictype/property-xid-start-tests --- a/modules/unictype/property-xid-start-tests +++ b/modules/unictype/property-xid-start-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_xid_start.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-zero-width-tests b/modules/unictype/property-zero-width-tests --- a/modules/unictype/property-zero-width-tests +++ b/modules/unictype/property-zero-width-tests @@ -2,6 +2,7 @@ tests/unictype/test-pr_zero_width.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/scripts-tests b/modules/unictype/scripts-tests --- 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 --- 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 --- a/modules/unictype/syntax-c-whitespace-tests +++ b/modules/unictype/syntax-c-whitespace-tests @@ -2,6 +2,7 @@ tests/unictype/test-sy_c_whitespace.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/syntax-java-ident-tests b/modules/unictype/syntax-java-ident-tests --- 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 --- a/modules/unictype/syntax-java-whitespace-tests +++ b/modules/unictype/syntax-java-whitespace-tests @@ -2,6 +2,7 @@ tests/unictype/test-sy_java_whitespace.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unilbrk/u16-possible-linebreaks-tests b/modules/unilbrk/u16-possible-linebreaks-tests --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/modules/uninorm/nfc-tests +++ b/modules/uninorm/nfc-tests @@ -8,6 +8,7 @@ tests/uninorm/test-u32-normalize-big.h tests/uninorm/test-u32-normalize-big.c tests/uninorm/NormalizationTest.txt +tests/macros.h Depends-on: unistr/u8-cmp diff --git a/modules/uninorm/nfd-tests b/modules/uninorm/nfd-tests --- a/modules/uninorm/nfd-tests +++ b/modules/uninorm/nfd-tests @@ -8,6 +8,7 @@ tests/uninorm/test-u32-normalize-big.h tests/uninorm/test-u32-normalize-big.c tests/uninorm/NormalizationTest.txt +tests/macros.h Depends-on: unistr/u8-cmp diff --git a/modules/uninorm/nfkc-tests b/modules/uninorm/nfkc-tests --- a/modules/uninorm/nfkc-tests +++ b/modules/uninorm/nfkc-tests @@ -8,6 +8,7 @@ tests/uninorm/test-u32-normalize-big.h tests/uninorm/test-u32-normalize-big.c tests/uninorm/NormalizationTest.txt +tests/macros.h Depends-on: unistr/u8-cmp diff --git a/modules/uninorm/nfkd-tests b/modules/uninorm/nfkd-tests --- a/modules/uninorm/nfkd-tests +++ b/modules/uninorm/nfkd-tests @@ -8,6 +8,7 @@ tests/uninorm/test-u32-normalize-big.h tests/uninorm/test-u32-normalize-big.c tests/uninorm/NormalizationTest.txt +tests/macros.h Depends-on: unistr/u8-cmp diff --git a/modules/uninorm/u16-normcmp-tests b/modules/uninorm/u16-normcmp-tests --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/modules/unistdio/u16-asnprintf-tests +++ b/modules/unistdio/u16-asnprintf-tests @@ -2,6 +2,7 @@ tests/unistdio/test-u16-asnprintf1.c tests/unistdio/test-u16-asnprintf1.h tests/unistdio/test-u16-printf1.h +tests/macros.h Depends-on: diff --git a/modules/unistdio/u16-vasnprintf-tests b/modules/unistdio/u16-vasnprintf-tests --- a/modules/unistdio/u16-vasnprintf-tests +++ b/modules/unistdio/u16-vasnprintf-tests @@ -6,6 +6,7 @@ tests/unistdio/test-u16-vasnprintf2.c tests/unistdio/test-u16-vasnprintf3.sh tests/unistdio/test-u16-vasnprintf3.c +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/unistdio/u16-vasprintf-tests b/modules/unistdio/u16-vasprintf-tests --- 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 --- 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 --- 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 --- a/modules/unistdio/u32-asnprintf-tests +++ b/modules/unistdio/u32-asnprintf-tests @@ -2,6 +2,7 @@ tests/unistdio/test-u32-asnprintf1.c tests/unistdio/test-u32-asnprintf1.h tests/unistdio/test-u32-printf1.h +tests/macros.h Depends-on: diff --git a/modules/unistdio/u32-vasnprintf-tests b/modules/unistdio/u32-vasnprintf-tests --- a/modules/unistdio/u32-vasnprintf-tests +++ b/modules/unistdio/u32-vasnprintf-tests @@ -6,6 +6,7 @@ tests/unistdio/test-u32-vasnprintf2.c tests/unistdio/test-u32-vasnprintf3.sh tests/unistdio/test-u32-vasnprintf3.c +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/unistdio/u32-vasprintf-tests b/modules/unistdio/u32-vasprintf-tests --- 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 --- 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 --- 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 --- a/modules/unistdio/u8-asnprintf-tests +++ b/modules/unistdio/u8-asnprintf-tests @@ -2,6 +2,7 @@ tests/unistdio/test-u8-asnprintf1.c tests/unistdio/test-u8-asnprintf1.h tests/unistdio/test-u8-printf1.h +tests/macros.h Depends-on: diff --git a/modules/unistdio/u8-vasnprintf-tests b/modules/unistdio/u8-vasnprintf-tests --- a/modules/unistdio/u8-vasnprintf-tests +++ b/modules/unistdio/u8-vasnprintf-tests @@ -6,6 +6,7 @@ tests/unistdio/test-u8-vasnprintf2.c tests/unistdio/test-u8-vasnprintf3.sh tests/unistdio/test-u8-vasnprintf3.c +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/unistdio/u8-vasprintf-tests b/modules/unistdio/u8-vasprintf-tests --- 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 --- 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 --- 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 --- a/modules/unistdio/ulc-asnprintf-tests +++ b/modules/unistdio/ulc-asnprintf-tests @@ -2,6 +2,7 @@ tests/unistdio/test-ulc-asnprintf1.c tests/unistdio/test-ulc-asnprintf1.h tests/unistdio/test-ulc-printf1.h +tests/macros.h Depends-on: diff --git a/modules/unistdio/ulc-vasnprintf-tests b/modules/unistdio/ulc-vasnprintf-tests --- a/modules/unistdio/ulc-vasnprintf-tests +++ b/modules/unistdio/ulc-vasnprintf-tests @@ -6,6 +6,7 @@ tests/unistdio/test-ulc-vasnprintf2.c tests/unistdio/test-ulc-vasnprintf3.sh tests/unistdio/test-ulc-vasnprintf3.c +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/unistdio/ulc-vasprintf-tests b/modules/unistdio/ulc-vasprintf-tests --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/modules/uniwidth/width-tests +++ b/modules/uniwidth/width-tests @@ -2,6 +2,7 @@ tests/uniwidth/test-uc_width.c tests/uniwidth/test-uc_width2.c tests/uniwidth/test-uc_width2.sh +tests/macros.h Depends-on: diff --git a/modules/unlink-tests b/modules/unlink-tests --- 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 --- a/modules/unsetenv-tests +++ b/modules/unsetenv-tests @@ -1,6 +1,7 @@ Files: +tests/test-unsetenv.c tests/signature.h -tests/test-unsetenv.c +tests/macros.h Depends-on: putenv diff --git a/modules/usleep-tests b/modules/usleep-tests --- a/modules/usleep-tests +++ b/modules/usleep-tests @@ -1,6 +1,7 @@ Files: +tests/test-usleep.c tests/signature.h -tests/test-usleep.c +tests/macros.h Depends-on: time diff --git a/modules/utimens-tests b/modules/utimens-tests --- a/modules/utimens-tests +++ b/modules/utimens-tests @@ -5,6 +5,7 @@ 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 --- 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 --- a/modules/vasnprintf-posix-tests +++ b/modules/vasnprintf-posix-tests @@ -3,6 +3,7 @@ tests/test-vasnprintf-posix2.sh tests/test-vasnprintf-posix2.c tests/nan.h +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/vasnprintf-tests b/modules/vasnprintf-tests --- 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 --- 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 --- a/modules/vasprintf-tests +++ b/modules/vasprintf-tests @@ -1,6 +1,7 @@ Files: +tests/test-vasprintf.c tests/signature.h -tests/test-vasprintf.c +tests/macros.h Depends-on: diff --git a/modules/vdprintf-posix-tests b/modules/vdprintf-posix-tests --- 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 --- 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 --- 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 --- 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 --- a/modules/vsnprintf-tests +++ b/modules/vsnprintf-tests @@ -1,6 +1,7 @@ Files: +tests/test-vsnprintf.c tests/signature.h -tests/test-vsnprintf.c +tests/macros.h Depends-on: diff --git a/modules/vsprintf-posix-tests b/modules/vsprintf-posix-tests --- 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 --- 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 --- 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 --- 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 --- 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 --- a/modules/wcwidth-tests +++ b/modules/wcwidth-tests @@ -1,6 +1,7 @@ Files: +tests/test-wcwidth.c tests/signature.h -tests/test-wcwidth.c +tests/macros.h Depends-on: localcharset diff --git a/modules/xmemdup0-tests b/modules/xmemdup0-tests --- 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 --- a/modules/xprintf-posix-tests +++ b/modules/xprintf-posix-tests @@ -5,6 +5,7 @@ tests/test-fprintf-posix.h tests/test-printf-posix.h tests/test-printf-posix.output +tests/macros.h Depends-on: stdint diff --git a/modules/xvasprintf-tests b/modules/xvasprintf-tests --- 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 --- /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 . */ + + +/* 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 +#include + +/* 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 .) + - 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 --- a/tests/test-areadlink-with-size.c +++ b/tests/test-areadlink-with-size.c @@ -29,17 +29,7 @@ #include #include -#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 --- a/tests/test-areadlink.c +++ b/tests/test-areadlink.c @@ -29,17 +29,7 @@ #include #include -#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 --- a/tests/test-areadlinkat-with-size.c +++ b/tests/test-areadlinkat-with-size.c @@ -29,17 +29,7 @@ #include #include -#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 --- a/tests/test-areadlinkat.c +++ b/tests/test-areadlinkat.c @@ -29,17 +29,7 @@ #include #include -#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 --- 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 #include #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 , 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 --- a/tests/test-argv-iter.c +++ b/tests/test-argv-iter.c @@ -20,23 +20,13 @@ #include "argv-iter.h" -#include #include #include +#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 --- a/tests/test-array-mergesort.c +++ b/tests/test-array-mergesort.c @@ -24,20 +24,9 @@ #define STATIC static #include "array-mergesort.h" -#include #include -#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 --- a/tests/test-array_list.c +++ b/tests/test-array_list.c @@ -19,28 +19,16 @@ #include "gl_array_list.h" -#include #include #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 --- a/tests/test-array_oset.c +++ b/tests/test-array_oset.c @@ -19,13 +19,13 @@ #include "gl_array_oset.h" -#include #include #include #include "gl_xlist.h" #include "gl_array_list.h" #include "progname.h" +#include "macros.h" static const char *objects[30] = { @@ -33,18 +33,6 @@ "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "<", ">", "[", "]" }; -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] diff --git a/tests/test-avltree_list.c b/tests/test-avltree_list.c --- a/tests/test-avltree_list.c +++ b/tests/test-avltree_list.c @@ -19,11 +19,11 @@ #include "gl_avltree_list.h" -#include #include #include "gl_array_list.h" #include "progname.h" +#include "macros.h" extern void gl_avltree_list_check_invariants (gl_list_t list); @@ -32,18 +32,6 @@ "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o" }; -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] diff --git a/tests/test-avltree_oset.c b/tests/test-avltree_oset.c --- a/tests/test-avltree_oset.c +++ b/tests/test-avltree_oset.c @@ -19,12 +19,12 @@ #include "gl_avltree_oset.h" -#include #include #include #include "gl_array_oset.h" #include "progname.h" +#include "macros.h" extern void gl_avltree_oset_check_invariants (gl_oset_t set); @@ -34,18 +34,6 @@ "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "<", ">", "[", "]" }; -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] diff --git a/tests/test-avltreehash_list.c b/tests/test-avltreehash_list.c --- a/tests/test-avltreehash_list.c +++ b/tests/test-avltreehash_list.c @@ -20,12 +20,12 @@ #include "gl_avltreehash_list.h" #include -#include #include #include #include "gl_array_list.h" #include "progname.h" +#include "macros.h" extern void gl_avltreehash_list_check_invariants (gl_list_t list); @@ -59,18 +59,6 @@ return h; } -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] diff --git a/tests/test-base64.c b/tests/test-base64.c --- a/tests/test-base64.c +++ b/tests/test-base64.c @@ -20,23 +20,12 @@ #include "base64.h" #include -#include #include #include #include #include -#define 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 --- 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 #include -#define 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 --- a/tests/test-bitrotate.c +++ b/tests/test-bitrotate.c @@ -20,21 +20,7 @@ #include "bitrotate.h" -#include -#include - -#define 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 --- a/tests/test-btowc.c +++ b/tests/test-btowc.c @@ -25,19 +25,8 @@ #include #include -#include -#define 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 --- a/tests/test-byteswap.c +++ b/tests/test-byteswap.c @@ -1,5 +1,5 @@ /* Test of 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 -#include -#include - -#define 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 --- 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 -#include -#include -#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 --- 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 -#include #if HAVE_SETRLIMIT /* At least FreeBSD 5.0 needs extra headers before will compile. */ @@ -29,17 +28,7 @@ # include #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 --- 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 -#include -#include #include -#define 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 --- 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 #include #include -#define 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 --- 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 -#include -#include #include -#define 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 --- 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 #include #include -#define 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 --- a/tests/test-canonicalize-lgpl.c +++ b/tests/test-canonicalize-lgpl.c @@ -32,18 +32,7 @@ #include #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 --- a/tests/test-canonicalize.c +++ b/tests/test-canonicalize.c @@ -29,18 +29,7 @@ #include #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 --- a/tests/test-carray_list.c +++ b/tests/test-carray_list.c @@ -19,29 +19,17 @@ #include "gl_carray_list.h" -#include #include #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 --- a/tests/test-ceilf1.c +++ b/tests/test-ceilf1.c @@ -23,23 +23,9 @@ #include "signature.h" SIGNATURE_CHECK (ceilf, float, (float)); -#include -#include - #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 --- 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 #include #include -#include #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 --- a/tests/test-ceill.c +++ b/tests/test-ceill.c @@ -24,24 +24,11 @@ SIGNATURE_CHECK (ceill, long double, (long double)); #include -#include -#include #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 --- a/tests/test-chown.c +++ b/tests/test-chown.c @@ -32,18 +32,7 @@ #include "mgetgroups.h" #include "stat-time.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define BASE "test-chown.t" diff --git a/tests/test-cloexec.c b/tests/test-cloexec.c --- a/tests/test-cloexec.c +++ b/tests/test-cloexec.c @@ -22,8 +22,6 @@ #include #include -#include -#include #include #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 --- 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 #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 --- 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 -#include - #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 --- 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 #include -#include -#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 --- a/tests/test-dprintf-posix.c +++ b/tests/test-dprintf-posix.c @@ -25,20 +25,9 @@ #include #include -#include #include -#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 --- a/tests/test-dup2.c +++ b/tests/test-dup2.c @@ -25,8 +25,6 @@ #include #include -#include -#include #include "binary-io.h" #include "cloexec.h" @@ -37,17 +35,7 @@ # include #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 --- a/tests/test-dup3.c +++ b/tests/test-dup3.c @@ -27,8 +27,6 @@ #include #include #include -#include -#include #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ /* Get declarations of the Win32 API functions. */ @@ -37,18 +35,7 @@ #endif #include "binary-io.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" /* Return true if FD is open. */ static bool diff --git a/tests/test-duplocale.c b/tests/test-duplocale.c --- a/tests/test-duplocale.c +++ b/tests/test-duplocale.c @@ -28,20 +28,9 @@ #include #include #include -#include #include -#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 --- 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 -#include -#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 --- a/tests/test-fchdir.c +++ b/tests/test-fchdir.c @@ -25,23 +25,11 @@ #include #include -#include #include #include #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 --- a/tests/test-fchownat.c +++ b/tests/test-fchownat.c @@ -33,18 +33,7 @@ #include "mgetgroups.h" #include "openat.h" #include "stat-time.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define BASE "test-fchownat.t" diff --git a/tests/test-fcntl-safer.c b/tests/test-fcntl-safer.c --- a/tests/test-fcntl-safer.c +++ b/tests/test-fcntl-safer.c @@ -23,20 +23,9 @@ #include #include #include -#include #include -#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 --- a/tests/test-fcntl.c +++ b/tests/test-fcntl.c @@ -28,8 +28,6 @@ #include #include #include -#include -#include #include #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ @@ -39,6 +37,7 @@ #endif #include "binary-io.h" +#include "macros.h" /* Use O_CLOEXEC if available, but test works without it. */ #ifndef O_CLOEXEC @@ -50,18 +49,6 @@ static int zero (void) { return 0; } #endif -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) - /* Return true if FD is open. */ static bool is_open (int fd) diff --git a/tests/test-fdopendir.c b/tests/test-fdopendir.c --- a/tests/test-fdopendir.c +++ b/tests/test-fdopendir.c @@ -25,21 +25,9 @@ #include #include -#include -#include #include -#define 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 --- a/tests/test-fdutimensat.c +++ b/tests/test-fdutimensat.c @@ -25,17 +25,7 @@ #include #include -#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 --- a/tests/test-fflush2.c +++ b/tests/test-fflush2.c @@ -18,21 +18,8 @@ #include -#include - #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 --- a/tests/test-file-has-acl.c +++ b/tests/test-file-has-acl.c @@ -27,17 +27,7 @@ #include #include -#define 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 --- a/tests/test-filevercmp.c +++ b/tests/test-filevercmp.c @@ -19,20 +19,9 @@ #include "filevercmp.h" -#include -#include +#include -#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 --- a/tests/test-flock.c +++ b/tests/test-flock.c @@ -22,23 +22,10 @@ SIGNATURE_CHECK (flock, int, (int, int)); #include -#include -#include #include #include -#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 --- a/tests/test-floorf1.c +++ b/tests/test-floorf1.c @@ -23,23 +23,9 @@ #include "signature.h" SIGNATURE_CHECK (floorf, float, (float)); -#include -#include - #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 --- 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 #include #include -#include #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 --- a/tests/test-floorl.c +++ b/tests/test-floorl.c @@ -24,24 +24,11 @@ SIGNATURE_CHECK (floorl, long double, (long double)); #include -#include -#include #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 --- 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 -#include - -#define 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 --- a/tests/test-fopen.h +++ b/tests/test-fopen.h @@ -19,20 +19,9 @@ /* Include and a form of first. */ #include -#include #include -#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 --- a/tests/test-fpending.c +++ b/tests/test-fpending.c @@ -24,17 +24,7 @@ #include #include -#define 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 --- a/tests/test-fprintf-posix.c +++ b/tests/test-fprintf-posix.c @@ -26,20 +26,9 @@ #include #include #include -#include #include -#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 --- a/tests/test-fpurge.c +++ b/tests/test-fpurge.c @@ -20,27 +20,16 @@ #include -#include #include +#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 --- a/tests/test-freadable.c +++ b/tests/test-freadable.c @@ -21,7 +21,8 @@ #include "freadable.h" #include -#include + +#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 --- 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 #include #include -#define 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 --- a/tests/test-freading.c +++ b/tests/test-freading.c @@ -21,7 +21,8 @@ #include "freading.h" #include -#include + +#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 --- 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 #include #include #include -#define 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 --- 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 #include -#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 --- a/tests/test-freadseek.c +++ b/tests/test-freadseek.c @@ -25,17 +25,7 @@ #include #include -#define 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 --- 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 - -#define 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 --- a/tests/test-frexp.c +++ b/tests/test-frexp.c @@ -24,29 +24,16 @@ SIGNATURE_CHECK (frexp, double, (double, int *)); #include -#include -#include #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 --- a/tests/test-frexpl.c +++ b/tests/test-frexpl.c @@ -24,30 +24,17 @@ SIGNATURE_CHECK (frexpl, long double, (long double, int *)); #include -#include -#include #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 --- 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 - -#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 --- 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 -#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 --- a/tests/test-fstatat.c +++ b/tests/test-fstatat.c @@ -33,18 +33,7 @@ #include "openat.h" #include "pathmax.h" #include "same-inode.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define BASE "test-fstatat.t" diff --git a/tests/test-fstrcmp.c b/tests/test-fstrcmp.c --- a/tests/test-fstrcmp.c +++ b/tests/test-fstrcmp.c @@ -21,22 +21,9 @@ #include "fstrcmp.h" #include -#include -#include #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 --- a/tests/test-fsync.c +++ b/tests/test-fsync.c @@ -22,20 +22,9 @@ SIGNATURE_CHECK (fsync, int, (int)); #include -#include #include -#define 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 --- a/tests/test-ftell.c +++ b/tests/test-ftell.c @@ -23,9 +23,8 @@ #include "signature.h" SIGNATURE_CHECK (ftell, long, (FILE *)); -#include - #include "binary-io.h" +#include "macros.h" /* None of the files accessed by this test are large, so disable the fseek link warning if we are not using the gnulib fseek module. */ @@ -33,18 +32,6 @@ # undef fseek #endif -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) - #ifndef FUNC_UNGETC_BROKEN # define FUNC_UNGETC_BROKEN 0 #endif diff --git a/tests/test-ftello.c b/tests/test-ftello.c --- a/tests/test-ftello.c +++ b/tests/test-ftello.c @@ -23,9 +23,8 @@ #include "signature.h" SIGNATURE_CHECK (ftello, off_t, (FILE *)); -#include - #include "binary-io.h" +#include "macros.h" /* None of the files accessed by this test are large, so disable the fseek link warning if we are not using the gnulib fseek module. */ @@ -33,18 +32,6 @@ # undef fseek #endif -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) - #ifndef FUNC_UNGETC_BROKEN # define FUNC_UNGETC_BROKEN 0 #endif diff --git a/tests/test-func.c b/tests/test-func.c --- a/tests/test-func.c +++ b/tests/test-func.c @@ -19,20 +19,8 @@ #include #include -#include -#include -#define 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 --- a/tests/test-futimens.c +++ b/tests/test-futimens.c @@ -34,18 +34,7 @@ #include "stat-time.h" #include "timespec.h" #include "utimecmp.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define BASE "test-futimens.t" diff --git a/tests/test-fwritable.c b/tests/test-fwritable.c --- a/tests/test-fwritable.c +++ b/tests/test-fwritable.c @@ -21,7 +21,8 @@ #include "fwritable.h" #include -#include + +#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 --- a/tests/test-fwriting.c +++ b/tests/test-fwriting.c @@ -21,7 +21,8 @@ #include "fwriting.h" #include -#include + +#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 --- a/tests/test-getcwd.c +++ b/tests/test-getcwd.c @@ -25,17 +25,7 @@ #include #include -#define 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 --- a/tests/test-getdate.c +++ b/tests/test-getdate.c @@ -26,19 +26,7 @@ #include #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 --- a/tests/test-getdelim.c +++ b/tests/test-getdelim.c @@ -27,17 +27,7 @@ #include #include -#define 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 --- a/tests/test-getdtablesize.c +++ b/tests/test-getdtablesize.c @@ -23,20 +23,7 @@ #include "signature.h" SIGNATURE_CHECK (getdtablesize, int, (void)); -#include -#include - -#define 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 --- a/tests/test-getgroups.c +++ b/tests/test-getgroups.c @@ -28,17 +28,7 @@ #include #include -#define 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 --- a/tests/test-getline.c +++ b/tests/test-getline.c @@ -27,17 +27,7 @@ #include #include -#define 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 --- a/tests/test-getndelim2.c +++ b/tests/test-getndelim2.c @@ -25,17 +25,7 @@ #include #include -#define 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 --- a/tests/test-glob.c +++ b/tests/test-glob.c @@ -25,22 +25,9 @@ glob_t *)); SIGNATURE_CHECK (globfree, void, (glob_t *)); -#include -#include #include -#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 --- a/tests/test-hash.c +++ b/tests/test-hash.c @@ -28,21 +28,11 @@ #include #include +#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 --- a/tests/test-i-ring.c +++ b/tests/test-i-ring.c @@ -20,20 +20,7 @@ #include "i-ring.h" -#include -#include - -#define 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 --- 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 -#include -#include #include -#define 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 --- a/tests/test-iconv.c +++ b/tests/test-iconv.c @@ -34,21 +34,9 @@ #endif #include -#include -#include #include -#define 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 --- a/tests/test-idpriv-drop.c +++ b/tests/test-idpriv-drop.c @@ -24,17 +24,7 @@ #include #include -#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 --- a/tests/test-idpriv-droptemp.c +++ b/tests/test-idpriv-droptemp.c @@ -24,17 +24,7 @@ #include #include -#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 --- a/tests/test-inet_ntop.c +++ b/tests/test-inet_ntop.c @@ -26,21 +26,9 @@ #include #include -#include -#include #include -#define 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 --- a/tests/test-inet_pton.c +++ b/tests/test-inet_pton.c @@ -25,20 +25,8 @@ #include #include -#include -#include -#define 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 --- a/tests/test-isblank.c +++ b/tests/test-isblank.c @@ -25,19 +25,8 @@ #include #include -#include -#define 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 --- a/tests/test-isfinite.c +++ b/tests/test-isfinite.c @@ -28,20 +28,8 @@ #include #include -#include -#include -#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 --- a/tests/test-isinf.c +++ b/tests/test-isinf.c @@ -28,20 +28,8 @@ #include #include -#include -#include -#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 --- a/tests/test-isnan.c +++ b/tests/test-isnan.c @@ -28,22 +28,9 @@ #include #include -#include -#include #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 --- 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 , 2007. */ #include -#include -#include #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 --- 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 , 2007. */ #include -#include -#include #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 --- a/tests/test-isnanl.h +++ b/tests/test-isnanl.h @@ -18,22 +18,9 @@ #include #include -#include -#include #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 --- a/tests/test-lchown.c +++ b/tests/test-lchown.c @@ -32,18 +32,7 @@ #include "mgetgroups.h" #include "stat-time.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define BASE "test-lchown.t" diff --git a/tests/test-ldexpl.c b/tests/test-ldexpl.c --- a/tests/test-ldexpl.c +++ b/tests/test-ldexpl.c @@ -24,24 +24,11 @@ SIGNATURE_CHECK (ldexpl, long double, (long double, int)); #include -#include -#include #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 --- a/tests/test-link.c +++ b/tests/test-link.c @@ -30,17 +30,7 @@ #include #include -#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 --- a/tests/test-linkat.c +++ b/tests/test-linkat.c @@ -34,18 +34,7 @@ #include "filenamecat.h" #include "same-inode.h" #include "xgetcwd.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define BASE "test-linkat.t" diff --git a/tests/test-linked_list.c b/tests/test-linked_list.c --- a/tests/test-linked_list.c +++ b/tests/test-linked_list.c @@ -19,29 +19,17 @@ #include "gl_linked_list.h" -#include #include #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 --- a/tests/test-linkedhash_list.c +++ b/tests/test-linkedhash_list.c @@ -20,12 +20,12 @@ #include "gl_linkedhash_list.h" #include -#include #include #include #include "gl_array_list.h" #include "progname.h" +#include "macros.h" static const char *objects[15] = { @@ -57,18 +57,6 @@ return h; } -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] diff --git a/tests/test-localename.c b/tests/test-localename.c --- a/tests/test-localename.c +++ b/tests/test-localename.c @@ -21,22 +21,10 @@ #include "localename.h" #include -#include #include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- a/tests/test-lseek.c +++ b/tests/test-lseek.c @@ -24,19 +24,8 @@ SIGNATURE_CHECK (lseek, off_t, (int, off_t, int)); #include -#include -#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 --- a/tests/test-lstat.c +++ b/tests/test-lstat.c @@ -35,18 +35,7 @@ #include #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 --- a/tests/test-mbmemcasecmp.c +++ b/tests/test-mbmemcasecmp.c @@ -22,22 +22,9 @@ #include #include -#include -#include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- a/tests/test-mbmemcasecoll.c +++ b/tests/test-mbmemcasecoll.c @@ -22,22 +22,9 @@ #include #include -#include -#include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- a/tests/test-mbrtowc.c +++ b/tests/test-mbrtowc.c @@ -26,20 +26,9 @@ #include #include -#include #include -#define 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 --- 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 #include -#include -#include -#define 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 --- 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 -#include #include -#define 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 --- 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 #include -#include #include -#define 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 --- 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 #include -#include -#include -#define 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 --- 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 #include -#include -#include -#define 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 --- 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 #include -#include -#include -#define 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 --- 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 #include -#include -#include -#define 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 --- a/tests/test-mbsinit.c +++ b/tests/test-mbsinit.c @@ -24,20 +24,8 @@ SIGNATURE_CHECK (mbsinit, int, (const mbstate_t *)); #include -#include -#include -#define 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 --- 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 #include -#include -#include -#define 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 --- a/tests/test-mbsnrtowcs.c +++ b/tests/test-mbsnrtowcs.c @@ -26,20 +26,9 @@ #include #include -#include #include -#define 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 --- 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 #include -#include -#include -#define 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 --- 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 #include -#include -#include -#define 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 --- 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 #include -#include -#include -#define 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 --- a/tests/test-mbsrtowcs.c +++ b/tests/test-mbsrtowcs.c @@ -26,20 +26,9 @@ #include #include -#include #include -#define 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 --- 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 #include -#include -#include -#define 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 --- 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 -#include #include -#define 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 --- 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 #include -#include #include -#define 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 --- 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 #include -#include -#include -#define 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 --- 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 #include #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 --- a/tests/test-memchr2.c +++ b/tests/test-memchr2.c @@ -19,23 +19,11 @@ #include "memchr2.h" -#include #include #include #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 --- 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 -#include - #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 --- 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 -#include #include #include #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 --- 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 #include #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 --- a/tests/test-mkdir.c +++ b/tests/test-mkdir.c @@ -30,17 +30,7 @@ #include #include -#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 --- a/tests/test-mkdirat.c +++ b/tests/test-mkdirat.c @@ -30,17 +30,7 @@ #include #include -#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 --- a/tests/test-mkfifo.c +++ b/tests/test-mkfifo.c @@ -30,17 +30,7 @@ #include #include -#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 --- a/tests/test-mkfifoat.c +++ b/tests/test-mkfifoat.c @@ -32,17 +32,7 @@ #include #include -#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 --- a/tests/test-mknod.c +++ b/tests/test-mknod.c @@ -30,17 +30,7 @@ #include #include -#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 --- a/tests/test-nanosleep.c +++ b/tests/test-nanosleep.c @@ -25,23 +25,10 @@ #include #include -#include -#include #include #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 --- a/tests/test-nl_langinfo.c +++ b/tests/test-nl_langinfo.c @@ -24,23 +24,11 @@ SIGNATURE_CHECK (nl_langinfo, char *, (nl_item)); #include -#include #include #include #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 --- a/tests/test-obstack-printf.c +++ b/tests/test-obstack-printf.c @@ -33,18 +33,7 @@ #include #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 --- a/tests/test-open.c +++ b/tests/test-open.c @@ -26,20 +26,9 @@ #include #include #include -#include #include -#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 --- a/tests/test-openat.c +++ b/tests/test-openat.c @@ -27,20 +27,9 @@ #include #include #include -#include #include -#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 --- a/tests/test-pipe-filter-gi1.c +++ b/tests/test-pipe-filter-gi1.c @@ -19,25 +19,11 @@ #include "pipe-filter.h" -#include -#include - #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 --- 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 --- a/tests/test-pipe-filter-ii1.c +++ b/tests/test-pipe-filter-ii1.c @@ -19,25 +19,11 @@ #include "pipe-filter.h" -#include -#include - #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 --- 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 --- a/tests/test-pipe2.c +++ b/tests/test-pipe2.c @@ -32,18 +32,7 @@ #endif #include "binary-io.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" /* Return true if FD is open. */ static bool diff --git a/tests/test-popen.h b/tests/test-popen.h --- a/tests/test-popen.h +++ b/tests/test-popen.h @@ -24,17 +24,7 @@ #include #include -#define 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 --- a/tests/test-posixtm.c +++ b/tests/test-posixtm.c @@ -27,18 +27,7 @@ #include #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 --- 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 -#include #include #include #include -#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 --- 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 -#include -#include -#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 --- 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 -#include -#include #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 --- a/tests/test-printf-posix.c +++ b/tests/test-printf-posix.c @@ -25,20 +25,9 @@ #include #include -#include #include -#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 --- a/tests/test-priv-set.c +++ b/tests/test-priv-set.c @@ -24,22 +24,10 @@ # include #endif #include -#include -#include #include #include -#define 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 --- a/tests/test-quotearg.c +++ b/tests/test-quotearg.c @@ -25,24 +25,12 @@ #include #include #include -#include #include #include #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 --- a/tests/test-random_r.c +++ b/tests/test-random_r.c @@ -25,20 +25,9 @@ SIGNATURE_CHECK (setstate_r, int, (char *, struct random_data *)); SIGNATURE_CHECK (random_r, int, (struct random_data *, int32_t *)); -#include #include -#define 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 --- 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 #include -#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 --- a/tests/test-rbtree_list.c +++ b/tests/test-rbtree_list.c @@ -19,11 +19,11 @@ #include "gl_rbtree_list.h" -#include #include #include "gl_array_list.h" #include "progname.h" +#include "macros.h" extern void gl_rbtree_list_check_invariants (gl_list_t list); @@ -32,18 +32,6 @@ "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o" }; -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] diff --git a/tests/test-rbtree_oset.c b/tests/test-rbtree_oset.c --- a/tests/test-rbtree_oset.c +++ b/tests/test-rbtree_oset.c @@ -19,12 +19,12 @@ #include "gl_rbtree_oset.h" -#include #include #include #include "gl_array_oset.h" #include "progname.h" +#include "macros.h" extern void gl_rbtree_oset_check_invariants (gl_oset_t set); @@ -34,18 +34,6 @@ "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "<", ">", "[", "]" }; -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] diff --git a/tests/test-rbtreehash_list.c b/tests/test-rbtreehash_list.c --- a/tests/test-rbtreehash_list.c +++ b/tests/test-rbtreehash_list.c @@ -20,12 +20,12 @@ #include "gl_rbtreehash_list.h" #include -#include #include #include #include "gl_array_list.h" #include "progname.h" +#include "macros.h" extern void gl_rbtreehash_list_check_invariants (gl_list_t list); @@ -59,18 +59,6 @@ return h; } -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] diff --git a/tests/test-readlink.c b/tests/test-readlink.c --- a/tests/test-readlink.c +++ b/tests/test-readlink.c @@ -31,17 +31,7 @@ #include #include -#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 --- a/tests/test-remove.c +++ b/tests/test-remove.c @@ -30,17 +30,7 @@ #include #include -#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 --- a/tests/test-rename.c +++ b/tests/test-rename.c @@ -29,17 +29,7 @@ #include #include -#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 --- a/tests/test-renameat.c +++ b/tests/test-renameat.c @@ -32,18 +32,7 @@ #include "filenamecat.h" #include "xgetcwd.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define BASE "test-renameat.t" diff --git a/tests/test-rmdir.c b/tests/test-rmdir.c --- a/tests/test-rmdir.c +++ b/tests/test-rmdir.c @@ -30,17 +30,7 @@ #include #include -#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 --- a/tests/test-round1.c +++ b/tests/test-round1.c @@ -25,23 +25,9 @@ #include "signature.h" SIGNATURE_CHECK (round, double, (double)); -#include -#include - #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 --- a/tests/test-roundf1.c +++ b/tests/test-roundf1.c @@ -25,23 +25,9 @@ #include "signature.h" SIGNATURE_CHECK (roundf, float, (float)); -#include -#include - #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 --- a/tests/test-roundl.c +++ b/tests/test-roundl.c @@ -26,24 +26,11 @@ SIGNATURE_CHECK (roundl, long double, (long double)); #include -#include -#include #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 --- a/tests/test-safe-alloc.c +++ b/tests/test-safe-alloc.c @@ -24,20 +24,7 @@ #include "safe-alloc.h" -#include -#include - -#define 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 --- 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 --- 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 #include #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 --- a/tests/test-setenv.c +++ b/tests/test-setenv.c @@ -24,21 +24,10 @@ SIGNATURE_CHECK (setenv, int, (char const *, char const *, int)); #include -#include #include #include -#define 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 --- 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 -#include +#include -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - signal (SIGABRT, SIG_DFL); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #ifndef SA_NOCLDSTOP # define SA_NOCLDSTOP 0 diff --git a/tests/test-signbit.c b/tests/test-signbit.c --- a/tests/test-signbit.c +++ b/tests/test-signbit.c @@ -27,20 +27,8 @@ #include #include -#include -#include -#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 --- a/tests/test-sleep.c +++ b/tests/test-sleep.c @@ -24,20 +24,8 @@ SIGNATURE_CHECK (sleep, unsigned int, (unsigned int)); #include -#include -#include -#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 --- 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 #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 #include -#define 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 --- a/tests/test-sprintf-posix.c +++ b/tests/test-sprintf-posix.c @@ -29,18 +29,7 @@ #include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- a/tests/test-stat-time.c +++ b/tests/test-stat-time.c @@ -22,22 +22,10 @@ #include #include -#include -#include #include #include -#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 --- a/tests/test-stat.c +++ b/tests/test-stat.c @@ -31,23 +31,11 @@ #include #include #include -#include #include #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 --- a/tests/test-strcasestr.c +++ b/tests/test-strcasestr.c @@ -24,21 +24,10 @@ SIGNATURE_CHECK (strcasestr, char *, (char const *, char const *)); #include -#include #include #include -#define 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 --- 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 #include -#define 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 --- a/tests/test-strerror.c +++ b/tests/test-strerror.c @@ -25,20 +25,8 @@ SIGNATURE_CHECK (strerror, char *, (int)); #include -#include -#include -#define 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 --- 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 -#include #include #include -#define 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 --- a/tests/test-striconveh.c +++ b/tests/test-striconveh.c @@ -25,22 +25,10 @@ #endif #include -#include #include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 -#include #include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- a/tests/test-strsignal.c +++ b/tests/test-strsignal.c @@ -25,20 +25,8 @@ SIGNATURE_CHECK (strsignal, char *, (int)); #include -#include -#include -#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 --- a/tests/test-strstr.c +++ b/tests/test-strstr.c @@ -23,23 +23,11 @@ SIGNATURE_CHECK (strstr, char *, (char const *, char const *)); #include -#include #include #include #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 --- a/tests/test-strtod.c +++ b/tests/test-strtod.c @@ -25,22 +25,10 @@ #include #include #include -#include #include #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 --- 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 -#include - -#define 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 --- a/tests/test-symlink.c +++ b/tests/test-symlink.c @@ -30,17 +30,7 @@ #include #include -#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 --- a/tests/test-symlinkat.c +++ b/tests/test-symlinkat.c @@ -32,22 +32,12 @@ #include #include +#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 --- a/tests/test-trunc1.c +++ b/tests/test-trunc1.c @@ -23,23 +23,9 @@ #include "signature.h" SIGNATURE_CHECK (trunc, double, (double)); -#include -#include - #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 --- 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 #include #include -#include #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 --- a/tests/test-truncf1.c +++ b/tests/test-truncf1.c @@ -23,23 +23,9 @@ #include "signature.h" SIGNATURE_CHECK (truncf, float, (float)); -#include -#include - #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 --- 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 #include #include -#include #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 --- a/tests/test-truncl.c +++ b/tests/test-truncl.c @@ -24,24 +24,11 @@ SIGNATURE_CHECK (truncl, long double, (long double)); #include -#include -#include #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 --- a/tests/test-uname.c +++ b/tests/test-uname.c @@ -24,20 +24,9 @@ SIGNATURE_CHECK (uname, int, (struct utsname *)); #include -#include #include -#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 --- a/tests/test-unlink.c +++ b/tests/test-unlink.c @@ -32,18 +32,7 @@ #include #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 --- a/tests/test-unlinkat.c +++ b/tests/test-unlinkat.c @@ -31,18 +31,7 @@ #include #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 --- a/tests/test-unsetenv.c +++ b/tests/test-unsetenv.c @@ -24,21 +24,10 @@ SIGNATURE_CHECK (unsetenv, int, (char const *)); #include -#include #include #include -#define 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 --- a/tests/test-usleep.c +++ b/tests/test-usleep.c @@ -23,21 +23,9 @@ #include "signature.h" SIGNATURE_CHECK (usleep, int, (useconds_t)); -#include -#include #include -#define 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 --- a/tests/test-utimens.c +++ b/tests/test-utimens.c @@ -24,17 +24,7 @@ #include #include -#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 --- a/tests/test-utimensat.c +++ b/tests/test-utimensat.c @@ -35,18 +35,7 @@ #include "stat-time.h" #include "timespec.h" #include "utimecmp.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define BASE "test-utimensat.t" diff --git a/tests/test-vasnprintf-posix.c b/tests/test-vasnprintf-posix.c --- a/tests/test-vasnprintf-posix.c +++ b/tests/test-vasnprintf-posix.c @@ -23,26 +23,13 @@ #include #include #include -#include #include #include #include +#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 --- 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 -#include #include #include -#define 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 --- 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 -#include #include #include -#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 --- a/tests/test-vasprintf-posix.c +++ b/tests/test-vasprintf-posix.c @@ -27,21 +27,9 @@ #include #include +#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 --- a/tests/test-vasprintf.c +++ b/tests/test-vasprintf.c @@ -28,17 +28,7 @@ #include #include -#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 --- a/tests/test-vdprintf-posix.c +++ b/tests/test-vdprintf-posix.c @@ -26,20 +26,9 @@ #include #include #include -#include #include -#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 --- a/tests/test-vfprintf-posix.c +++ b/tests/test-vfprintf-posix.c @@ -26,20 +26,9 @@ #include #include #include -#include #include -#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 --- a/tests/test-vprintf-posix.c +++ b/tests/test-vprintf-posix.c @@ -26,20 +26,9 @@ #include #include #include -#include #include -#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 --- 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 #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 -#include #include -#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 --- a/tests/test-vsprintf-posix.c +++ b/tests/test-vsprintf-posix.c @@ -30,18 +30,7 @@ #include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 -#include #include #include -#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 --- a/tests/test-wcsnrtombs.c +++ b/tests/test-wcsnrtombs.c @@ -25,21 +25,10 @@ mbstate_t *)); #include -#include #include #include -#define 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 --- a/tests/test-wcsrtombs.c +++ b/tests/test-wcsrtombs.c @@ -25,21 +25,10 @@ mbstate_t *)); #include -#include #include #include -#define 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 --- a/tests/test-wctype.c +++ b/tests/test-wctype.c @@ -20,20 +20,7 @@ #include -#include -#include - -#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 --- a/tests/test-wcwidth.c +++ b/tests/test-wcwidth.c @@ -24,23 +24,10 @@ SIGNATURE_CHECK (wcwidth, int, (wchar_t)); #include -#include -#include #include #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 --- a/tests/test-xfprintf-posix.c +++ b/tests/test-xfprintf-posix.c @@ -22,24 +22,11 @@ #include #include -#include #include -#include #include #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 --- a/tests/test-xmemdup0.c +++ b/tests/test-xmemdup0.c @@ -21,23 +21,11 @@ #include "xmemdup0.h" -#include #include #include #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 --- a/tests/test-xprintf-posix.c +++ b/tests/test-xprintf-posix.c @@ -21,24 +21,11 @@ #include "xprintf.h" #include -#include #include -#include #include #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 --- a/tests/test-xvasprintf.c +++ b/tests/test-xvasprintf.c @@ -21,23 +21,11 @@ #include "xvasprintf.h" #include -#include #include #include #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 --- a/tests/unicase/test-locale-language.c +++ b/tests/unicase/test-locale-language.c @@ -21,21 +21,9 @@ #include "unicase.h" #include -#include -#include #include -#define 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 --- a/tests/unicase/test-mapping-part1.h +++ b/tests/unicase/test-mapping-part1.h @@ -18,23 +18,9 @@ #include "unicase.h" -#include -#include #include -#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 --- a/tests/unicase/test-predicate-part1.h +++ b/tests/unicase/test-predicate-part1.h @@ -18,23 +18,9 @@ #include "unicase/caseprop.h" -#include -#include #include -#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 --- a/tests/unicase/test-u16-casecmp.c +++ b/tests/unicase/test-u16-casecmp.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u16-casecoll.c +++ b/tests/unicase/test-u16-casecoll.c @@ -21,23 +21,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u16-casefold.c +++ b/tests/unicase/test-u16-casefold.c @@ -20,24 +20,11 @@ #include "unicase.h" -#include #include #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 --- a/tests/unicase/test-u16-is-cased.c +++ b/tests/unicase/test-u16-is-cased.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u16-is-casefolded.c +++ b/tests/unicase/test-u16-is-casefolded.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u16-is-lowercase.c +++ b/tests/unicase/test-u16-is-lowercase.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u16-is-titlecase.c +++ b/tests/unicase/test-u16-is-titlecase.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u16-is-uppercase.c +++ b/tests/unicase/test-u16-is-uppercase.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u16-tolower.c +++ b/tests/unicase/test-u16-tolower.c @@ -20,24 +20,11 @@ #include "unicase.h" -#include #include #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 --- a/tests/unicase/test-u16-totitle.c +++ b/tests/unicase/test-u16-totitle.c @@ -20,24 +20,11 @@ #include "unicase.h" -#include #include #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 --- a/tests/unicase/test-u16-toupper.c +++ b/tests/unicase/test-u16-toupper.c @@ -20,24 +20,11 @@ #include "unicase.h" -#include #include #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 --- a/tests/unicase/test-u32-casecmp.c +++ b/tests/unicase/test-u32-casecmp.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u32-casecoll.c +++ b/tests/unicase/test-u32-casecoll.c @@ -21,23 +21,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u32-casefold.c +++ b/tests/unicase/test-u32-casefold.c @@ -20,24 +20,11 @@ #include "unicase.h" -#include #include #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 --- a/tests/unicase/test-u32-is-cased.c +++ b/tests/unicase/test-u32-is-cased.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u32-is-casefolded.c +++ b/tests/unicase/test-u32-is-casefolded.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u32-is-lowercase.c +++ b/tests/unicase/test-u32-is-lowercase.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u32-is-titlecase.c +++ b/tests/unicase/test-u32-is-titlecase.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u32-is-uppercase.c +++ b/tests/unicase/test-u32-is-uppercase.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u32-tolower.c +++ b/tests/unicase/test-u32-tolower.c @@ -20,24 +20,11 @@ #include "unicase.h" -#include #include #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 --- a/tests/unicase/test-u32-totitle.c +++ b/tests/unicase/test-u32-totitle.c @@ -20,24 +20,11 @@ #include "unicase.h" -#include #include #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 --- a/tests/unicase/test-u32-toupper.c +++ b/tests/unicase/test-u32-toupper.c @@ -20,24 +20,11 @@ #include "unicase.h" -#include #include #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 --- a/tests/unicase/test-u8-casecmp.c +++ b/tests/unicase/test-u8-casecmp.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u8-casecoll.c +++ b/tests/unicase/test-u8-casecoll.c @@ -21,23 +21,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u8-casefold.c +++ b/tests/unicase/test-u8-casefold.c @@ -20,24 +20,11 @@ #include "unicase.h" -#include #include #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 --- a/tests/unicase/test-u8-is-cased.c +++ b/tests/unicase/test-u8-is-cased.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u8-is-casefolded.c +++ b/tests/unicase/test-u8-is-casefolded.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u8-is-lowercase.c +++ b/tests/unicase/test-u8-is-lowercase.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u8-is-titlecase.c +++ b/tests/unicase/test-u8-is-titlecase.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u8-is-uppercase.c +++ b/tests/unicase/test-u8-is-uppercase.c @@ -20,23 +20,8 @@ #include "unicase.h" -#include -#include - #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 --- a/tests/unicase/test-u8-tolower.c +++ b/tests/unicase/test-u8-tolower.c @@ -20,24 +20,11 @@ #include "unicase.h" -#include #include #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 --- a/tests/unicase/test-u8-totitle.c +++ b/tests/unicase/test-u8-totitle.c @@ -20,24 +20,11 @@ #include "unicase.h" -#include #include #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 --- a/tests/unicase/test-u8-toupper.c +++ b/tests/unicase/test-u8-toupper.c @@ -20,24 +20,11 @@ #include "unicase.h" -#include #include #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 --- a/tests/unicase/test-ulc-casecmp.c +++ b/tests/unicase/test-ulc-casecmp.c @@ -21,21 +21,7 @@ #include "unicase.h" #include -#include -#include - -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- a/tests/unicase/test-ulc-casecoll.c +++ b/tests/unicase/test-ulc-casecoll.c @@ -22,23 +22,9 @@ #include "unicase.h" #include -#include -#include #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 --- 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 #include #include #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 --- 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 -#include #include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 #include #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 --- 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 -#include #include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 #include #include #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 --- 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 -#include #include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 #include #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 --- 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 -#include #include #include - -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 #include #include #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 --- 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 -#include #include #include #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 --- 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 #include #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 --- 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 -#include #include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#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 --- 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 -#include #include -#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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#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 --- a/tests/unictype/test-pr_byname.c +++ b/tests/unictype/test-pr_byname.c @@ -18,21 +18,9 @@ #include "unictype.h" -#include -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 -#include #include -#define 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 --- 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 #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- a/tests/uninorm/test-canonical-decomposition.c +++ b/tests/uninorm/test-canonical-decomposition.c @@ -20,20 +20,7 @@ #include "uninorm.h" -#include -#include - -#define 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 --- a/tests/uninorm/test-compat-decomposition.c +++ b/tests/uninorm/test-compat-decomposition.c @@ -20,22 +20,8 @@ #include "uninorm/decompose-internal.h" -#include -#include - #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 --- a/tests/uninorm/test-composition.c +++ b/tests/uninorm/test-composition.c @@ -20,20 +20,7 @@ #include "uninorm.h" -#include -#include - -#define 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 --- a/tests/uninorm/test-decomposing-form.c +++ b/tests/uninorm/test-decomposing-form.c @@ -20,20 +20,7 @@ #include "uninorm.h" -#include -#include - -#define 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 --- a/tests/uninorm/test-decomposition.c +++ b/tests/uninorm/test-decomposition.c @@ -20,20 +20,7 @@ #include "uninorm.h" -#include -#include - -#define 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 --- a/tests/uninorm/test-u16-nfc.c +++ b/tests/uninorm/test-u16-nfc.c @@ -23,24 +23,11 @@ #include "uninorm.h" #include -#include #include #include #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 --- a/tests/uninorm/test-u16-nfd.c +++ b/tests/uninorm/test-u16-nfd.c @@ -23,24 +23,11 @@ #include "uninorm.h" #include -#include #include #include #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 --- a/tests/uninorm/test-u16-nfkc.c +++ b/tests/uninorm/test-u16-nfkc.c @@ -23,24 +23,11 @@ #include "uninorm.h" #include -#include #include #include #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 --- a/tests/uninorm/test-u16-nfkd.c +++ b/tests/uninorm/test-u16-nfkd.c @@ -23,24 +23,11 @@ #include "uninorm.h" #include -#include #include #include #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 --- a/tests/uninorm/test-u16-normcmp.c +++ b/tests/uninorm/test-u16-normcmp.c @@ -20,21 +20,7 @@ #include "uninorm.h" -#include -#include - -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- a/tests/uninorm/test-u16-normcoll.c +++ b/tests/uninorm/test-u16-normcoll.c @@ -21,21 +21,7 @@ #include "uninorm.h" -#include -#include - -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- a/tests/uninorm/test-u32-nfc.c +++ b/tests/uninorm/test-u32-nfc.c @@ -23,24 +23,11 @@ #include "uninorm.h" #include -#include #include #include #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 --- a/tests/uninorm/test-u32-nfd.c +++ b/tests/uninorm/test-u32-nfd.c @@ -23,24 +23,11 @@ #include "uninorm.h" #include -#include #include #include #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 --- a/tests/uninorm/test-u32-nfkc.c +++ b/tests/uninorm/test-u32-nfkc.c @@ -23,24 +23,11 @@ #include "uninorm.h" #include -#include #include #include #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 --- a/tests/uninorm/test-u32-nfkd.c +++ b/tests/uninorm/test-u32-nfkd.c @@ -23,24 +23,11 @@ #include "uninorm.h" #include -#include #include #include #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 --- 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 --- a/tests/uninorm/test-u32-normcmp.c +++ b/tests/uninorm/test-u32-normcmp.c @@ -20,21 +20,7 @@ #include "uninorm.h" -#include -#include - -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- a/tests/uninorm/test-u32-normcoll.c +++ b/tests/uninorm/test-u32-normcoll.c @@ -21,21 +21,7 @@ #include "uninorm.h" -#include -#include - -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- a/tests/uninorm/test-u8-nfc.c +++ b/tests/uninorm/test-u8-nfc.c @@ -23,24 +23,11 @@ #include "uninorm.h" #include -#include #include #include #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 --- a/tests/uninorm/test-u8-nfd.c +++ b/tests/uninorm/test-u8-nfd.c @@ -23,24 +23,11 @@ #include "uninorm.h" #include -#include #include #include #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 --- a/tests/uninorm/test-u8-nfkc.c +++ b/tests/uninorm/test-u8-nfkc.c @@ -23,24 +23,11 @@ #include "uninorm.h" #include -#include #include #include #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 --- a/tests/uninorm/test-u8-nfkd.c +++ b/tests/uninorm/test-u8-nfkd.c @@ -23,24 +23,11 @@ #include "uninorm.h" #include -#include #include #include #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 --- a/tests/uninorm/test-u8-normcmp.c +++ b/tests/uninorm/test-u8-normcmp.c @@ -20,21 +20,7 @@ #include "uninorm.h" -#include -#include - -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- a/tests/uninorm/test-u8-normcoll.c +++ b/tests/uninorm/test-u8-normcoll.c @@ -21,21 +21,7 @@ #include "uninorm.h" -#include -#include - -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- a/tests/uninorm/test-uninorm-filter-nfc.c +++ b/tests/uninorm/test-uninorm-filter-nfc.c @@ -20,23 +20,10 @@ #include "uninorm.h" -#include #include #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 --- 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 #include #include -#include #include #include #include #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 --- 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 #include #include -#include #include #include #include #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 --- 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 #include -#include #include #include #include #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 --- 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 #include -#include #include #include #include #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 --- 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 #include #include -#include #include #include #include #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 --- a/tests/unistdio/test-u16-vsnprintf1.c +++ b/tests/unistdio/test-u16-vsnprintf1.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -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 --- a/tests/unistdio/test-u16-vsprintf1.c +++ b/tests/unistdio/test-u16-vsprintf1.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -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 --- 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 #include #include -#include #include #include #include #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 --- 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 #include #include -#include #include #include #include #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 --- 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 #include -#include #include #include #include #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 --- 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 #include -#include #include #include #include #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 --- 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 #include #include -#include #include #include #include #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 --- a/tests/unistdio/test-u32-vsnprintf1.c +++ b/tests/unistdio/test-u32-vsnprintf1.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -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 --- a/tests/unistdio/test-u32-vsprintf1.c +++ b/tests/unistdio/test-u32-vsprintf1.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -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 --- 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 #include #include -#include #include #include #include #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 --- 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 #include #include -#include #include #include #include #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 --- 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 #include -#include #include #include #include #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 --- 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 #include -#include #include #include #include #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 --- 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 #include #include -#include #include #include #include #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 --- a/tests/unistdio/test-u8-vsnprintf1.c +++ b/tests/unistdio/test-u8-vsnprintf1.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -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 --- a/tests/unistdio/test-u8-vsprintf1.c +++ b/tests/unistdio/test-u8-vsprintf1.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -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 --- 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 #include -#include #include #include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 #include -#include #include #include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 #include -#include #include #include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 #include -#include #include #include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 #include -#include #include #include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- a/tests/unistdio/test-ulc-vsnprintf1.c +++ b/tests/unistdio/test-ulc-vsnprintf1.c @@ -22,26 +22,13 @@ #include #include -#include #include #include #include #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 --- a/tests/unistdio/test-ulc-vsprintf1.c +++ b/tests/unistdio/test-ulc-vsprintf1.c @@ -22,26 +22,13 @@ #include #include -#include #include #include #include #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 --- a/tests/uniwbrk/test-u16-wordbreaks.c +++ b/tests/uniwbrk/test-u16-wordbreaks.c @@ -20,21 +20,9 @@ #include "uniwbrk.h" -#include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- a/tests/uniwbrk/test-u32-wordbreaks.c +++ b/tests/uniwbrk/test-u32-wordbreaks.c @@ -20,21 +20,9 @@ #include "uniwbrk.h" -#include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- a/tests/uniwbrk/test-u8-wordbreaks.c +++ b/tests/uniwbrk/test-u8-wordbreaks.c @@ -20,21 +20,9 @@ #include "uniwbrk.h" -#include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- a/tests/uniwbrk/test-ulc-wordbreaks.c +++ b/tests/uniwbrk/test-ulc-wordbreaks.c @@ -21,21 +21,9 @@ #include "uniwbrk.h" #include -#include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[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 --- 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 -#include - -#define 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 --- 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 -#include - -#define 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 --- 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 -#include - -#define 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 --- 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 -#include - -#define 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 --- 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 -#include - -#define 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 --- 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 -#include - -#define 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 --- 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 -#include - -#define 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 --- 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 -#include -#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;