From 987e5651e8d1c5aa933c9ce88562806af4093702 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 24 Dec 2009 21:01:42 +0100 Subject: [PATCH] Refactor common macros used in tests. --- ChangeLog | 875 ++++++++++++++++++ modules/acl-tests | 1 + modules/areadlink-tests | 1 + modules/areadlink-with-size-tests | 1 + modules/areadlinkat-tests | 1 + modules/areadlinkat-with-size-tests | 1 + modules/argmatch-tests | 1 + modules/argv-iter-tests | 1 + modules/array-list-tests | 1 + modules/array-mergesort-tests | 1 + modules/array-oset-tests | 1 + modules/avltree-list-tests | 1 + modules/avltree-oset-tests | 1 + modules/avltreehash-list-tests | 1 + modules/base64-tests | 1 + modules/binary-io-tests | 1 + modules/bitrotate-tests | 1 + modules/btowc-tests | 3 +- modules/byteswap-tests | 1 + modules/c-ctype-tests | 1 + modules/c-stack-tests | 1 + modules/c-strcase-tests | 1 + modules/c-strcasestr-tests | 1 + modules/c-strstr-tests | 1 + modules/canonicalize-lgpl-tests | 3 +- modules/canonicalize-tests | 1 + modules/carray-list-tests | 1 + modules/ceilf-tests | 3 +- modules/ceill-tests | 3 +- modules/chown-tests | 3 +- modules/cloexec-tests | 1 + modules/copy-file-tests | 1 + modules/count-one-bits-tests | 1 + modules/dprintf-posix-tests | 3 +- modules/dup2-tests | 3 +- modules/dup3-tests | 3 +- modules/duplocale-tests | 3 +- modules/fbufmode-tests | 1 + modules/fchdir-tests | 3 +- modules/fcntl-safer-tests | 1 + modules/fcntl-tests | 3 +- modules/fdopendir-tests | 3 +- modules/fdutimensat-tests | 1 + modules/fflush-tests | 3 +- modules/filevercmp-tests | 1 + modules/flock-tests | 3 +- modules/floorf-tests | 3 +- modules/floorl-tests | 3 +- modules/fnmatch-tests | 3 +- modules/fopen-safer-tests | 1 + modules/fopen-tests | 3 +- modules/fpending-tests | 1 + modules/fprintf-posix-tests | 3 +- modules/fpurge-tests | 1 + modules/freadable-tests | 1 + modules/freadahead-tests | 1 + modules/freading-tests | 1 + modules/freadptr-tests | 1 + modules/freadseek-tests | 1 + modules/freopen-tests | 3 +- modules/frexp-nolibm-tests | 3 +- modules/frexp-tests | 3 +- modules/frexpl-nolibm-tests | 3 +- modules/frexpl-tests | 3 +- modules/fseek-tests | 3 +- modules/fseeko-tests | 3 +- modules/fstrcmp-tests | 1 + modules/fsync-tests | 3 +- modules/ftell-tests | 3 +- modules/ftello-tests | 3 +- modules/func-tests | 1 + modules/futimens-tests | 3 +- modules/fwritable-tests | 1 + modules/fwriting-tests | 1 + modules/getcwd-tests | 3 +- modules/getdate-tests | 1 + modules/getdelim-tests | 3 +- modules/getdtablesize-tests | 3 +- modules/getgroups-tests | 3 +- modules/getline-tests | 3 +- modules/getndelim2-tests | 1 + modules/glob-tests | 3 +- modules/hash-tests | 1 + modules/i-ring-tests | 1 + modules/iconv-tests | 3 +- modules/iconv_open-utf-tests | 1 + modules/idpriv-drop-tests | 1 + modules/idpriv-droptemp-tests | 1 + modules/inet_ntop-tests | 3 +- modules/inet_pton-tests | 3 +- modules/isblank-tests | 3 +- modules/isfinite-tests | 1 + modules/isinf-tests | 1 + modules/isnan-tests | 1 + modules/isnand-nolibm-tests | 1 + modules/isnand-tests | 1 + modules/isnanf-nolibm-tests | 1 + modules/isnanf-tests | 1 + modules/isnanl-nolibm-tests | 1 + modules/isnanl-tests | 1 + modules/lchown-tests | 3 +- modules/ldexpl-tests | 3 +- modules/link-tests | 3 +- modules/linkat-tests | 3 +- modules/linked-list-tests | 1 + modules/linkedhash-list-tests | 1 + modules/localename-tests | 1 + modules/lseek-tests | 3 +- modules/lstat-tests | 3 +- modules/mbmemcasecmp-tests | 1 + modules/mbmemcasecoll-tests | 1 + modules/mbrtowc-tests | 3 +- modules/mbscasecmp-tests | 1 + modules/mbscasestr-tests | 1 + modules/mbschr-tests | 1 + modules/mbscspn-tests | 1 + modules/mbsinit-tests | 3 +- modules/mbsncasecmp-tests | 1 + modules/mbsnrtowcs-tests | 3 +- modules/mbspbrk-tests | 1 + modules/mbspcasecmp-tests | 1 + modules/mbsrchr-tests | 1 + modules/mbsrtowcs-tests | 3 +- modules/mbsspn-tests | 1 + modules/mbsstr-tests | 1 + modules/memchr-tests | 3 +- modules/memchr2-tests | 1 + modules/memcmp-tests | 3 +- modules/memmem-tests | 3 +- modules/memrchr-tests | 3 +- modules/mkdir-tests | 3 +- modules/mkfifo-tests | 3 +- modules/mkfifoat-tests | 3 +- modules/mknod-tests | 3 +- modules/nanosleep-tests | 3 +- modules/nl_langinfo-tests | 3 +- modules/obstack-printf-tests | 3 +- modules/open-tests | 3 +- modules/openat-tests | 3 +- modules/pipe-filter-gi-tests | 1 + modules/pipe-filter-ii-tests | 1 + modules/pipe2-tests | 3 +- modules/popen-safer-tests | 1 + modules/popen-tests | 3 +- modules/posixtm-tests | 1 + modules/pread-tests | 3 +- modules/printf-frexp-tests | 1 + modules/printf-frexpl-tests | 1 + modules/printf-posix-tests | 3 +- modules/priv-set-tests | 1 + modules/quotearg-tests | 1 + modules/random_r-tests | 3 +- modules/rawmemchr-tests | 3 +- modules/rbtree-list-tests | 1 + modules/rbtree-oset-tests | 1 + modules/rbtreehash-list-tests | 1 + modules/readlink-tests | 3 +- modules/remove-tests | 3 +- modules/rename-tests | 3 +- modules/renameat-tests | 3 +- modules/rmdir-tests | 3 +- modules/round-tests | 3 +- modules/roundf-tests | 3 +- modules/roundl-tests | 3 +- modules/safe-alloc-tests | 1 + modules/setenv-tests | 3 +- modules/sigaction-tests | 3 +- modules/signbit-tests | 1 + modules/sleep-tests | 3 +- modules/snprintf-posix-tests | 3 +- modules/snprintf-tests | 3 +- modules/sprintf-posix-tests | 3 +- modules/stat-tests | 3 +- modules/stat-time-tests | 1 + modules/strcasestr-tests | 3 +- modules/strchrnul-tests | 3 +- modules/strerror-tests | 3 +- modules/striconv-tests | 1 + modules/striconveh-tests | 1 + modules/striconveha-tests | 1 + modules/strsignal-tests | 3 +- modules/strstr-tests | 3 +- modules/strtod-tests | 3 +- modules/strverscmp-tests | 3 +- modules/symlink-tests | 3 +- modules/symlinkat-tests | 3 +- modules/trunc-tests | 3 +- modules/truncf-tests | 3 +- modules/truncl-tests | 3 +- modules/uname-tests | 3 +- modules/unicase/cased-tests | 1 + modules/unicase/ignorable-tests | 1 + modules/unicase/locale-language-tests | 1 + modules/unicase/tolower-tests | 1 + modules/unicase/totitle-tests | 1 + modules/unicase/toupper-tests | 1 + modules/unicase/u16-casecmp-tests | 1 + modules/unicase/u16-casecoll-tests | 1 + modules/unicase/u16-casefold-tests | 1 + modules/unicase/u16-is-cased-tests | 1 + modules/unicase/u16-is-casefolded-tests | 1 + modules/unicase/u16-is-lowercase-tests | 1 + modules/unicase/u16-is-titlecase-tests | 1 + modules/unicase/u16-is-uppercase-tests | 1 + modules/unicase/u16-tolower-tests | 1 + modules/unicase/u16-totitle-tests | 1 + modules/unicase/u16-toupper-tests | 1 + modules/unicase/u32-casecmp-tests | 1 + modules/unicase/u32-casecoll-tests | 1 + modules/unicase/u32-casefold-tests | 1 + modules/unicase/u32-is-cased-tests | 1 + modules/unicase/u32-is-casefolded-tests | 1 + modules/unicase/u32-is-lowercase-tests | 1 + modules/unicase/u32-is-titlecase-tests | 1 + modules/unicase/u32-is-uppercase-tests | 1 + modules/unicase/u32-tolower-tests | 1 + modules/unicase/u32-totitle-tests | 1 + modules/unicase/u32-toupper-tests | 1 + modules/unicase/u8-casecmp-tests | 1 + modules/unicase/u8-casecoll-tests | 1 + modules/unicase/u8-casefold-tests | 1 + modules/unicase/u8-is-cased-tests | 1 + modules/unicase/u8-is-casefolded-tests | 1 + modules/unicase/u8-is-lowercase-tests | 1 + modules/unicase/u8-is-titlecase-tests | 1 + modules/unicase/u8-is-uppercase-tests | 1 + modules/unicase/u8-tolower-tests | 1 + modules/unicase/u8-totitle-tests | 1 + modules/unicase/u8-toupper-tests | 1 + modules/unicase/ulc-casecmp-tests | 1 + modules/unicase/ulc-casecoll-tests | 1 + modules/uniconv/u16-conv-from-enc-tests | 1 + modules/uniconv/u16-conv-to-enc-tests | 1 + modules/uniconv/u16-strconv-from-enc-tests | 1 + modules/uniconv/u16-strconv-to-enc-tests | 1 + modules/uniconv/u32-conv-from-enc-tests | 1 + modules/uniconv/u32-conv-to-enc-tests | 1 + modules/uniconv/u32-strconv-from-enc-tests | 1 + modules/uniconv/u32-strconv-to-enc-tests | 1 + modules/uniconv/u8-conv-from-enc-tests | 1 + modules/uniconv/u8-conv-to-enc-tests | 1 + modules/uniconv/u8-strconv-from-enc-tests | 1 + modules/uniconv/u8-strconv-to-enc-tests | 1 + modules/unictype/bidicategory-byname-tests | 1 + modules/unictype/bidicategory-name-tests | 1 + modules/unictype/bidicategory-of-tests | 1 + modules/unictype/bidicategory-test-tests | 1 + modules/unictype/block-list-tests | 1 + modules/unictype/block-of-tests | 1 + modules/unictype/block-test-tests | 1 + modules/unictype/category-C-tests | 1 + modules/unictype/category-Cc-tests | 1 + modules/unictype/category-Cf-tests | 1 + modules/unictype/category-Cn-tests | 1 + modules/unictype/category-Co-tests | 1 + modules/unictype/category-Cs-tests | 1 + modules/unictype/category-L-tests | 1 + modules/unictype/category-Ll-tests | 1 + modules/unictype/category-Lm-tests | 1 + modules/unictype/category-Lo-tests | 1 + modules/unictype/category-Lt-tests | 1 + modules/unictype/category-Lu-tests | 1 + modules/unictype/category-M-tests | 1 + modules/unictype/category-Mc-tests | 1 + modules/unictype/category-Me-tests | 1 + modules/unictype/category-Mn-tests | 1 + modules/unictype/category-N-tests | 1 + modules/unictype/category-Nd-tests | 1 + modules/unictype/category-Nl-tests | 1 + modules/unictype/category-No-tests | 1 + modules/unictype/category-P-tests | 1 + modules/unictype/category-Pc-tests | 1 + modules/unictype/category-Pd-tests | 1 + modules/unictype/category-Pe-tests | 1 + modules/unictype/category-Pf-tests | 1 + modules/unictype/category-Pi-tests | 1 + modules/unictype/category-Po-tests | 1 + modules/unictype/category-Ps-tests | 1 + modules/unictype/category-S-tests | 1 + modules/unictype/category-Sc-tests | 1 + modules/unictype/category-Sk-tests | 1 + modules/unictype/category-Sm-tests | 1 + modules/unictype/category-So-tests | 1 + modules/unictype/category-Z-tests | 1 + modules/unictype/category-Zl-tests | 1 + modules/unictype/category-Zp-tests | 1 + modules/unictype/category-Zs-tests | 1 + modules/unictype/category-and-not-tests | 1 + modules/unictype/category-and-tests | 1 + modules/unictype/category-byname-tests | 1 + modules/unictype/category-name-tests | 1 + modules/unictype/category-none-tests | 1 + modules/unictype/category-of-tests | 1 + modules/unictype/category-or-tests | 1 + .../unictype/category-test-withtable-tests | 1 + modules/unictype/combining-class-tests | 1 + modules/unictype/ctype-alnum-tests | 1 + modules/unictype/ctype-alpha-tests | 1 + modules/unictype/ctype-blank-tests | 1 + modules/unictype/ctype-cntrl-tests | 1 + modules/unictype/ctype-digit-tests | 1 + modules/unictype/ctype-graph-tests | 1 + modules/unictype/ctype-lower-tests | 1 + modules/unictype/ctype-print-tests | 1 + modules/unictype/ctype-punct-tests | 1 + modules/unictype/ctype-space-tests | 1 + modules/unictype/ctype-upper-tests | 1 + modules/unictype/ctype-xdigit-tests | 1 + modules/unictype/decimal-digit-tests | 1 + modules/unictype/digit-tests | 1 + modules/unictype/mirror-tests | 1 + modules/unictype/numeric-tests | 1 + modules/unictype/property-alphabetic-tests | 1 + .../unictype/property-ascii-hex-digit-tests | 1 + .../unictype/property-bidi-arabic-digit-tests | 1 + .../property-bidi-arabic-right-to-left-tests | 1 + .../property-bidi-block-separator-tests | 1 + .../property-bidi-boundary-neutral-tests | 1 + .../property-bidi-common-separator-tests | 1 + modules/unictype/property-bidi-control-tests | 1 + .../property-bidi-embedding-or-override-tests | 1 + .../property-bidi-eur-num-separator-tests | 1 + .../property-bidi-eur-num-terminator-tests | 1 + .../property-bidi-european-digit-tests | 1 + .../property-bidi-hebrew-right-to-left-tests | 1 + .../property-bidi-left-to-right-tests | 1 + .../property-bidi-non-spacing-mark-tests | 1 + .../property-bidi-other-neutral-tests | 1 + modules/unictype/property-bidi-pdf-tests | 1 + .../property-bidi-segment-separator-tests | 1 + .../unictype/property-bidi-whitespace-tests | 1 + modules/unictype/property-byname-tests | 1 + modules/unictype/property-combining-tests | 1 + modules/unictype/property-composite-tests | 1 + .../unictype/property-currency-symbol-tests | 1 + modules/unictype/property-dash-tests | 1 + modules/unictype/property-decimal-digit-tests | 1 + ...roperty-default-ignorable-code-point-tests | 1 + modules/unictype/property-deprecated-tests | 1 + modules/unictype/property-diacritic-tests | 1 + modules/unictype/property-extender-tests | 1 + .../unictype/property-format-control-tests | 1 + modules/unictype/property-grapheme-base-tests | 1 + .../unictype/property-grapheme-extend-tests | 1 + modules/unictype/property-grapheme-link-tests | 1 + modules/unictype/property-hex-digit-tests | 1 + modules/unictype/property-hyphen-tests | 1 + modules/unictype/property-id-continue-tests | 1 + modules/unictype/property-id-start-tests | 1 + modules/unictype/property-ideographic-tests | 1 + .../property-ids-binary-operator-tests | 1 + .../property-ids-trinary-operator-tests | 1 + .../unictype/property-ignorable-control-tests | 1 + modules/unictype/property-iso-control-tests | 1 + modules/unictype/property-join-control-tests | 1 + modules/unictype/property-left-of-pair-tests | 1 + .../unictype/property-line-separator-tests | 1 + .../property-logical-order-exception-tests | 1 + modules/unictype/property-lowercase-tests | 1 + modules/unictype/property-math-tests | 1 + modules/unictype/property-non-break-tests | 1 + .../unictype/property-not-a-character-tests | 1 + modules/unictype/property-numeric-tests | 1 + .../unictype/property-other-alphabetic-tests | 1 + ...y-other-default-ignorable-code-point-tests | 1 + .../property-other-grapheme-extend-tests | 1 + .../unictype/property-other-id-continue-tests | 1 + .../unictype/property-other-id-start-tests | 1 + .../unictype/property-other-lowercase-tests | 1 + modules/unictype/property-other-math-tests | 1 + .../unictype/property-other-uppercase-tests | 1 + .../property-paired-punctuation-tests | 1 + .../property-paragraph-separator-tests | 1 + .../unictype/property-pattern-syntax-tests | 1 + .../property-pattern-white-space-tests | 1 + modules/unictype/property-private-use-tests | 1 + modules/unictype/property-punctuation-tests | 1 + .../unictype/property-quotation-mark-tests | 1 + modules/unictype/property-radical-tests | 1 + .../unictype/property-sentence-terminal-tests | 1 + modules/unictype/property-soft-dotted-tests | 1 + modules/unictype/property-space-tests | 1 + .../property-terminal-punctuation-tests | 1 + modules/unictype/property-test-tests | 1 + modules/unictype/property-titlecase-tests | 1 + .../property-unassigned-code-value-tests | 1 + .../unictype/property-unified-ideograph-tests | 1 + modules/unictype/property-uppercase-tests | 1 + .../property-variation-selector-tests | 1 + modules/unictype/property-white-space-tests | 1 + modules/unictype/property-xid-continue-tests | 1 + modules/unictype/property-xid-start-tests | 1 + modules/unictype/property-zero-width-tests | 1 + modules/unictype/scripts-tests | 1 + modules/unictype/syntax-c-ident-tests | 1 + modules/unictype/syntax-c-whitespace-tests | 1 + modules/unictype/syntax-java-ident-tests | 1 + modules/unictype/syntax-java-whitespace-tests | 1 + modules/unilbrk/u16-possible-linebreaks-tests | 1 + modules/unilbrk/u16-width-linebreaks-tests | 1 + modules/unilbrk/u32-possible-linebreaks-tests | 1 + modules/unilbrk/u32-width-linebreaks-tests | 1 + modules/unilbrk/u8-possible-linebreaks-tests | 1 + modules/unilbrk/u8-width-linebreaks-tests | 1 + modules/unilbrk/ulc-possible-linebreaks-tests | 1 + modules/unilbrk/ulc-width-linebreaks-tests | 1 + modules/uninorm/canonical-decomposition-tests | 1 + modules/uninorm/compat-decomposition-tests | 1 + modules/uninorm/composition-tests | 1 + modules/uninorm/decomposing-form-tests | 1 + modules/uninorm/decomposition-tests | 1 + modules/uninorm/filter-tests | 1 + modules/uninorm/nfc-tests | 1 + modules/uninorm/nfd-tests | 1 + modules/uninorm/nfkc-tests | 1 + modules/uninorm/nfkd-tests | 1 + modules/uninorm/u16-normcmp-tests | 1 + modules/uninorm/u16-normcoll-tests | 1 + modules/uninorm/u32-normcmp-tests | 1 + modules/uninorm/u32-normcoll-tests | 1 + modules/uninorm/u8-normcmp-tests | 1 + modules/uninorm/u8-normcoll-tests | 1 + modules/unistdio/u16-asnprintf-tests | 1 + modules/unistdio/u16-vasnprintf-tests | 1 + modules/unistdio/u16-vasprintf-tests | 1 + modules/unistdio/u16-vsnprintf-tests | 1 + modules/unistdio/u16-vsprintf-tests | 1 + modules/unistdio/u32-asnprintf-tests | 1 + modules/unistdio/u32-vasnprintf-tests | 1 + modules/unistdio/u32-vasprintf-tests | 1 + modules/unistdio/u32-vsnprintf-tests | 1 + modules/unistdio/u32-vsprintf-tests | 1 + modules/unistdio/u8-asnprintf-tests | 1 + modules/unistdio/u8-vasnprintf-tests | 1 + modules/unistdio/u8-vasprintf-tests | 1 + modules/unistdio/u8-vsnprintf-tests | 1 + modules/unistdio/u8-vsprintf-tests | 1 + modules/unistdio/ulc-asnprintf-tests | 1 + modules/unistdio/ulc-vasnprintf-tests | 1 + modules/unistdio/ulc-vasprintf-tests | 1 + modules/unistdio/ulc-vsnprintf-tests | 1 + modules/unistdio/ulc-vsprintf-tests | 1 + modules/uniwbrk/u16-wordbreaks-tests | 1 + modules/uniwbrk/u32-wordbreaks-tests | 1 + modules/uniwbrk/u8-wordbreaks-tests | 1 + modules/uniwbrk/ulc-wordbreaks-tests | 1 + modules/uniwidth/u16-strwidth-tests | 1 + modules/uniwidth/u16-width-tests | 1 + modules/uniwidth/u32-strwidth-tests | 1 + modules/uniwidth/u32-width-tests | 1 + modules/uniwidth/u8-strwidth-tests | 1 + modules/uniwidth/u8-width-tests | 1 + modules/uniwidth/width-tests | 1 + modules/unlink-tests | 3 +- modules/unsetenv-tests | 3 +- modules/usleep-tests | 3 +- modules/utimens-tests | 1 + modules/utimensat-tests | 3 +- modules/vasnprintf-posix-tests | 1 + modules/vasnprintf-tests | 1 + modules/vasprintf-posix-tests | 1 + modules/vasprintf-tests | 3 +- modules/vdprintf-posix-tests | 3 +- modules/vfprintf-posix-tests | 3 +- modules/vprintf-posix-tests | 3 +- modules/vsnprintf-posix-tests | 3 +- modules/vsnprintf-tests | 3 +- modules/vsprintf-posix-tests | 3 +- modules/wcrtomb-tests | 3 +- modules/wcsnrtombs-tests | 3 +- modules/wcsrtombs-tests | 3 +- modules/wctype-tests | 1 + modules/wcwidth-tests | 3 +- modules/xmemdup0-tests | 1 + modules/xprintf-posix-tests | 1 + modules/xvasprintf-tests | 1 + tests/macros.h | 56 ++ tests/test-areadlink-with-size.c | 12 +- tests/test-areadlink.c | 12 +- tests/test-areadlinkat-with-size.c | 12 +- tests/test-areadlinkat.c | 12 +- tests/test-argmatch.c | 16 +- tests/test-argv-iter.c | 14 +- tests/test-array-mergesort.c | 13 +- tests/test-array_list.c | 14 +- tests/test-array_oset.c | 14 +- tests/test-avltree_list.c | 14 +- tests/test-avltree_oset.c | 14 +- tests/test-avltreehash_list.c | 14 +- tests/test-base64.c | 13 +- tests/test-binary-io.c | 14 +- tests/test-bitrotate.c | 16 +- tests/test-btowc.c | 13 +- tests/test-byteswap.c | 17 +- tests/test-c-ctype.c | 16 +- tests/test-c-stack.c | 15 +- tests/test-c-strcasecmp.c | 16 +- tests/test-c-strcasestr.c | 15 +- tests/test-c-strncasecmp.c | 16 +- tests/test-c-strstr.c | 15 +- tests/test-canonicalize-lgpl.c | 13 +- tests/test-canonicalize.c | 13 +- tests/test-carray_list.c | 14 +- tests/test-ceilf1.c | 16 +- tests/test-ceilf2.c | 16 +- tests/test-ceill.c | 15 +- tests/test-chown.c | 13 +- tests/test-cloexec.c | 15 +- tests/test-copy-acl.c | 15 +- tests/test-copy-file.c | 18 +- tests/test-count-one-bits.c | 16 +- tests/test-dprintf-posix.c | 13 +- tests/test-dup2.c | 14 +- tests/test-dup3.c | 15 +- tests/test-duplocale.c | 13 +- tests/test-fbufmode.c | 17 +- tests/test-fchdir.c | 14 +- tests/test-fchownat.c | 13 +- tests/test-fcntl-safer.c | 13 +- tests/test-fcntl.c | 15 +- tests/test-fdopendir.c | 14 +- tests/test-fdutimensat.c | 12 +- tests/test-fflush2.c | 15 +- tests/test-file-has-acl.c | 12 +- tests/test-filevercmp.c | 15 +- tests/test-flock.c | 15 +- tests/test-floorf1.c | 16 +- tests/test-floorf2.c | 16 +- tests/test-floorl.c | 15 +- tests/test-fnmatch.c | 16 +- tests/test-fopen.h | 13 +- tests/test-fpending.c | 12 +- tests/test-fprintf-posix.c | 13 +- tests/test-fpurge.c | 15 +- tests/test-freadable.c | 15 +- tests/test-freadahead.c | 15 +- tests/test-freading.c | 15 +- tests/test-freadptr.c | 15 +- tests/test-freadptr2.c | 14 +- tests/test-freadseek.c | 12 +- tests/test-freopen.c | 14 +- tests/test-frexp.c | 15 +- tests/test-frexpl.c | 15 +- tests/test-fseek.c | 14 +- tests/test-fseeko.c | 13 +- tests/test-fstatat.c | 13 +- tests/test-fstrcmp.c | 15 +- tests/test-fsync.c | 13 +- tests/test-ftell.c | 15 +- tests/test-ftello.c | 15 +- tests/test-func.c | 16 +- tests/test-futimens.c | 13 +- tests/test-fwritable.c | 15 +- tests/test-fwriting.c | 15 +- tests/test-getcwd.c | 12 +- tests/test-getdate.c | 14 +- tests/test-getdelim.c | 12 +- tests/test-getdtablesize.c | 15 +- tests/test-getgroups.c | 12 +- tests/test-getline.c | 12 +- tests/test-getndelim2.c | 12 +- tests/test-glob.c | 15 +- tests/test-hash.c | 14 +- tests/test-i-ring.c | 15 +- tests/test-iconv-utf.c | 16 +- tests/test-iconv.c | 14 +- tests/test-idpriv-drop.c | 12 +- tests/test-idpriv-droptemp.c | 12 +- tests/test-inet_ntop.c | 14 +- tests/test-inet_pton.c | 14 +- tests/test-isblank.c | 15 +- tests/test-isfinite.c | 16 +- tests/test-isinf.c | 16 +- tests/test-isnan.c | 15 +- tests/test-isnand.h | 17 +- tests/test-isnanf.h | 17 +- tests/test-isnanl.h | 15 +- tests/test-lchown.c | 13 +- tests/test-ldexpl.c | 15 +- tests/test-link.c | 12 +- tests/test-linkat.c | 13 +- tests/test-linked_list.c | 14 +- tests/test-linkedhash_list.c | 14 +- tests/test-localename.c | 14 +- tests/test-lseek.c | 13 +- tests/test-lstat.c | 13 +- tests/test-mbmemcasecmp.c | 15 +- tests/test-mbmemcasecoll.c | 15 +- tests/test-mbrtowc.c | 13 +- tests/test-mbscasecmp.c | 18 +- tests/test-mbscasestr1.c | 15 +- tests/test-mbscasestr2.c | 15 +- tests/test-mbscasestr3.c | 18 +- tests/test-mbscasestr4.c | 16 +- tests/test-mbschr.c | 16 +- tests/test-mbscspn.c | 16 +- tests/test-mbsinit.c | 14 +- tests/test-mbsncasecmp.c | 18 +- tests/test-mbsnrtowcs.c | 13 +- tests/test-mbspbrk.c | 16 +- tests/test-mbspcasecmp.c | 18 +- tests/test-mbsrchr.c | 16 +- tests/test-mbsrtowcs.c | 13 +- tests/test-mbsspn.c | 16 +- tests/test-mbsstr1.c | 15 +- tests/test-mbsstr2.c | 15 +- tests/test-mbsstr3.c | 18 +- tests/test-memchr.c | 14 +- tests/test-memchr2.c | 14 +- tests/test-memcmp.c | 16 +- tests/test-memmem.c | 14 +- tests/test-memrchr.c | 14 +- tests/test-mkdir.c | 12 +- tests/test-mkdirat.c | 12 +- tests/test-mkfifo.c | 12 +- tests/test-mkfifoat.c | 12 +- tests/test-mknod.c | 12 +- tests/test-nanosleep.c | 15 +- tests/test-nl_langinfo.c | 14 +- tests/test-obstack-printf.c | 13 +- tests/test-open.c | 13 +- tests/test-openat.c | 13 +- tests/test-pipe-filter-gi1.c | 16 +- tests/test-pipe-filter-gi2-main.c | 13 +- tests/test-pipe-filter-ii1.c | 16 +- tests/test-pipe-filter-ii2-main.c | 13 +- tests/test-pipe2.c | 13 +- tests/test-popen.h | 12 +- tests/test-posixtm.c | 13 +- tests/test-pread.c | 14 +- tests/test-printf-frexp.c | 16 +- tests/test-printf-frexpl.c | 17 +- tests/test-printf-posix.c | 13 +- tests/test-priv-set.c | 14 +- tests/test-quotearg.c | 14 +- tests/test-random_r.c | 13 +- tests/test-rawmemchr.c | 13 +- tests/test-rbtree_list.c | 14 +- tests/test-rbtree_oset.c | 14 +- tests/test-rbtreehash_list.c | 14 +- tests/test-readlink.c | 12 +- tests/test-remove.c | 12 +- tests/test-rename.c | 12 +- tests/test-renameat.c | 13 +- tests/test-rmdir.c | 12 +- tests/test-round1.c | 16 +- tests/test-roundf1.c | 16 +- tests/test-roundl.c | 15 +- tests/test-safe-alloc.c | 15 +- tests/test-sameacls.c | 15 +- tests/test-set-mode-acl.c | 16 +- tests/test-setenv.c | 13 +- tests/test-sigaction.c | 18 +- tests/test-signbit.c | 16 +- tests/test-sleep.c | 14 +- tests/test-snprintf-posix.c | 15 +- tests/test-snprintf.c | 13 +- tests/test-sprintf-posix.c | 13 +- tests/test-stat-time.c | 14 +- tests/test-stat.c | 14 +- tests/test-strcasestr.c | 13 +- tests/test-strchrnul.c | 13 +- tests/test-strerror.c | 16 +- tests/test-striconv.c | 15 +- tests/test-striconveh.c | 14 +- tests/test-striconveha.c | 16 +- tests/test-strsignal.c | 16 +- tests/test-strstr.c | 14 +- tests/test-strtod.c | 14 +- tests/test-strverscmp.c | 15 +- tests/test-symlink.c | 12 +- tests/test-symlinkat.c | 14 +- tests/test-trunc1.c | 16 +- tests/test-trunc2.c | 16 +- tests/test-truncf1.c | 16 +- tests/test-truncf2.c | 16 +- tests/test-truncl.c | 15 +- tests/test-uname.c | 13 +- tests/test-unlink.c | 13 +- tests/test-unlinkat.c | 13 +- tests/test-unsetenv.c | 13 +- tests/test-usleep.c | 14 +- tests/test-utimens.c | 12 +- tests/test-utimensat.c | 13 +- tests/test-vasnprintf-posix.c | 15 +- tests/test-vasnprintf-posix2.c | 15 +- tests/test-vasnprintf.c | 15 +- tests/test-vasprintf-posix.c | 14 +- tests/test-vasprintf.c | 12 +- tests/test-vdprintf-posix.c | 13 +- tests/test-vfprintf-posix.c | 13 +- tests/test-vprintf-posix.c | 13 +- tests/test-vsnprintf-posix.c | 15 +- tests/test-vsnprintf.c | 13 +- tests/test-vsprintf-posix.c | 13 +- tests/test-wcrtomb.c | 13 +- tests/test-wcsnrtombs.c | 13 +- tests/test-wcsrtombs.c | 13 +- tests/test-wctype.c | 15 +- tests/test-wcwidth.c | 15 +- tests/test-xfprintf-posix.c | 15 +- tests/test-xmemdup0.c | 14 +- tests/test-xprintf-posix.c | 15 +- tests/test-xvasprintf.c | 14 +- tests/unicase/test-locale-language.c | 14 +- tests/unicase/test-mapping-part1.h | 16 +- tests/unicase/test-predicate-part1.h | 16 +- tests/unicase/test-u16-casecmp.c | 17 +- tests/unicase/test-u16-casecoll.c | 17 +- tests/unicase/test-u16-casefold.c | 15 +- tests/unicase/test-u16-is-cased.c | 17 +- tests/unicase/test-u16-is-casefolded.c | 17 +- tests/unicase/test-u16-is-lowercase.c | 17 +- tests/unicase/test-u16-is-titlecase.c | 17 +- tests/unicase/test-u16-is-uppercase.c | 17 +- tests/unicase/test-u16-tolower.c | 15 +- tests/unicase/test-u16-totitle.c | 15 +- tests/unicase/test-u16-toupper.c | 15 +- tests/unicase/test-u32-casecmp.c | 17 +- tests/unicase/test-u32-casecoll.c | 17 +- tests/unicase/test-u32-casefold.c | 15 +- tests/unicase/test-u32-is-cased.c | 17 +- tests/unicase/test-u32-is-casefolded.c | 17 +- tests/unicase/test-u32-is-lowercase.c | 17 +- tests/unicase/test-u32-is-titlecase.c | 17 +- tests/unicase/test-u32-is-uppercase.c | 17 +- tests/unicase/test-u32-tolower.c | 15 +- tests/unicase/test-u32-totitle.c | 15 +- tests/unicase/test-u32-toupper.c | 15 +- tests/unicase/test-u8-casecmp.c | 17 +- tests/unicase/test-u8-casecoll.c | 17 +- tests/unicase/test-u8-casefold.c | 15 +- tests/unicase/test-u8-is-cased.c | 17 +- tests/unicase/test-u8-is-casefolded.c | 17 +- tests/unicase/test-u8-is-lowercase.c | 17 +- tests/unicase/test-u8-is-titlecase.c | 17 +- tests/unicase/test-u8-is-uppercase.c | 17 +- tests/unicase/test-u8-tolower.c | 15 +- tests/unicase/test-u8-totitle.c | 15 +- tests/unicase/test-u8-toupper.c | 15 +- tests/unicase/test-ulc-casecmp.c | 16 +- tests/unicase/test-ulc-casecoll.c | 16 +- tests/uniconv/test-u16-conv-from-enc.c | 15 +- tests/uniconv/test-u16-conv-to-enc.c | 14 +- tests/uniconv/test-u16-strconv-from-enc.c | 15 +- tests/uniconv/test-u16-strconv-to-enc.c | 16 +- tests/uniconv/test-u32-conv-from-enc.c | 15 +- tests/uniconv/test-u32-conv-to-enc.c | 14 +- tests/uniconv/test-u32-strconv-from-enc.c | 15 +- tests/uniconv/test-u32-strconv-to-enc.c | 17 +- tests/uniconv/test-u8-conv-from-enc.c | 15 +- tests/uniconv/test-u8-conv-to-enc.c | 15 +- tests/uniconv/test-u8-strconv-from-enc.c | 15 +- tests/uniconv/test-u8-strconv-to-enc.c | 16 +- tests/unictype/test-bidi_byname.c | 16 +- tests/unictype/test-bidi_name.c | 16 +- tests/unictype/test-bidi_of.c | 16 +- tests/unictype/test-bidi_test.c | 16 +- tests/unictype/test-block_list.c | 16 +- tests/unictype/test-block_of.c | 16 +- tests/unictype/test-block_test.c | 16 +- tests/unictype/test-categ_and.c | 16 +- tests/unictype/test-categ_and_not.c | 16 +- tests/unictype/test-categ_byname.c | 16 +- tests/unictype/test-categ_name.c | 16 +- tests/unictype/test-categ_none.c | 16 +- tests/unictype/test-categ_of.c | 16 +- tests/unictype/test-categ_or.c | 16 +- tests/unictype/test-categ_test_withtable.c | 16 +- tests/unictype/test-combining.c | 16 +- tests/unictype/test-decdigit.c | 17 +- tests/unictype/test-digit.c | 17 +- tests/unictype/test-mirror.c | 16 +- tests/unictype/test-numeric.c | 17 +- tests/unictype/test-pr_byname.c | 14 +- tests/unictype/test-pr_test.c | 16 +- tests/unictype/test-predicate-part1.h | 18 +- tests/unictype/test-scripts.c | 16 +- tests/unictype/test-sy_c_ident.c | 16 +- tests/unictype/test-sy_java_ident.c | 16 +- tests/unilbrk/test-u16-possible-linebreaks.c | 16 +- tests/unilbrk/test-u16-width-linebreaks.c | 16 +- tests/unilbrk/test-u32-possible-linebreaks.c | 16 +- tests/unilbrk/test-u32-width-linebreaks.c | 16 +- tests/unilbrk/test-u8-possible-linebreaks.c | 16 +- tests/unilbrk/test-u8-width-linebreaks.c | 16 +- tests/unilbrk/test-ulc-possible-linebreaks.c | 16 +- tests/unilbrk/test-ulc-width-linebreaks.c | 16 +- tests/uninorm/test-canonical-decomposition.c | 15 +- tests/uninorm/test-compat-decomposition.c | 16 +- tests/uninorm/test-composition.c | 15 +- tests/uninorm/test-decomposing-form.c | 15 +- tests/uninorm/test-decomposition.c | 15 +- tests/uninorm/test-u16-nfc.c | 15 +- tests/uninorm/test-u16-nfd.c | 15 +- tests/uninorm/test-u16-nfkc.c | 15 +- tests/uninorm/test-u16-nfkd.c | 15 +- tests/uninorm/test-u16-normcmp.c | 16 +- tests/uninorm/test-u16-normcoll.c | 16 +- tests/uninorm/test-u32-nfc.c | 15 +- tests/uninorm/test-u32-nfd.c | 15 +- tests/uninorm/test-u32-nfkc.c | 15 +- tests/uninorm/test-u32-nfkd.c | 15 +- tests/uninorm/test-u32-normalize-big.c | 13 +- tests/uninorm/test-u32-normcmp.c | 16 +- tests/uninorm/test-u32-normcoll.c | 16 +- tests/uninorm/test-u8-nfc.c | 15 +- tests/uninorm/test-u8-nfd.c | 15 +- tests/uninorm/test-u8-nfkc.c | 15 +- tests/uninorm/test-u8-nfkd.c | 15 +- tests/uninorm/test-u8-normcmp.c | 16 +- tests/uninorm/test-u8-normcoll.c | 16 +- tests/uninorm/test-uninorm-filter-nfc.c | 15 +- tests/unistdio/test-u16-asnprintf1.c | 17 +- tests/unistdio/test-u16-vasnprintf1.c | 17 +- tests/unistdio/test-u16-vasnprintf2.c | 17 +- tests/unistdio/test-u16-vasnprintf3.c | 17 +- tests/unistdio/test-u16-vasprintf1.c | 17 +- tests/unistdio/test-u16-vsnprintf1.c | 15 +- tests/unistdio/test-u16-vsprintf1.c | 15 +- tests/unistdio/test-u32-asnprintf1.c | 17 +- tests/unistdio/test-u32-vasnprintf1.c | 17 +- tests/unistdio/test-u32-vasnprintf2.c | 17 +- tests/unistdio/test-u32-vasnprintf3.c | 17 +- tests/unistdio/test-u32-vasprintf1.c | 17 +- tests/unistdio/test-u32-vsnprintf1.c | 15 +- tests/unistdio/test-u32-vsprintf1.c | 15 +- tests/unistdio/test-u8-asnprintf1.c | 17 +- tests/unistdio/test-u8-vasnprintf1.c | 17 +- tests/unistdio/test-u8-vasnprintf2.c | 17 +- tests/unistdio/test-u8-vasnprintf3.c | 17 +- tests/unistdio/test-u8-vasprintf1.c | 17 +- tests/unistdio/test-u8-vsnprintf1.c | 15 +- tests/unistdio/test-u8-vsprintf1.c | 15 +- tests/unistdio/test-ulc-asnprintf1.c | 16 +- tests/unistdio/test-ulc-vasnprintf1.c | 16 +- tests/unistdio/test-ulc-vasnprintf2.c | 16 +- tests/unistdio/test-ulc-vasnprintf3.c | 16 +- tests/unistdio/test-ulc-vasprintf1.c | 16 +- tests/unistdio/test-ulc-vsnprintf1.c | 15 +- tests/unistdio/test-ulc-vsprintf1.c | 15 +- tests/uniwbrk/test-u16-wordbreaks.c | 14 +- tests/uniwbrk/test-u32-wordbreaks.c | 14 +- tests/uniwbrk/test-u8-wordbreaks.c | 14 +- tests/uniwbrk/test-ulc-wordbreaks.c | 14 +- tests/uniwidth/test-u16-strwidth.c | 17 +- tests/uniwidth/test-u16-width.c | 17 +- tests/uniwidth/test-u32-strwidth.c | 17 +- tests/uniwidth/test-u32-width.c | 17 +- tests/uniwidth/test-u8-strwidth.c | 17 +- tests/uniwidth/test-u8-width.c | 17 +- tests/uniwidth/test-uc_width.c | 17 +- tests/uniwidth/test-uc_width2.c | 15 +- 853 files changed, 2030 insertions(+), 5205 deletions(-) create mode 100644 tests/macros.h diff --git a/ChangeLog b/ChangeLog index 16e5a99989..98ea48cce9 100644 --- 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 index b0a3b73485..c9c04cdf4a 100644 --- a/modules/acl-tests +++ b/modules/acl-tests @@ -6,6 +6,7 @@ tests/test-file-has-acl.c tests/test-set-mode-acl.c tests/test-copy-acl.c tests/test-sameacls.c +tests/macros.h Depends-on: progname diff --git a/modules/areadlink-tests b/modules/areadlink-tests index 0e7796e6cb..37c26c2a20 100644 --- a/modules/areadlink-tests +++ b/modules/areadlink-tests @@ -1,6 +1,7 @@ Files: tests/test-areadlink.h tests/test-areadlink.c +tests/macros.h Depends-on: stdbool diff --git a/modules/areadlink-with-size-tests b/modules/areadlink-with-size-tests index 9752034b30..1dddea8293 100644 --- a/modules/areadlink-with-size-tests +++ b/modules/areadlink-with-size-tests @@ -1,6 +1,7 @@ Files: tests/test-areadlink.h tests/test-areadlink-with-size.c +tests/macros.h Depends-on: stdbool diff --git a/modules/areadlinkat-tests b/modules/areadlinkat-tests index ca0adc42ea..45a8d48cf9 100644 --- a/modules/areadlinkat-tests +++ b/modules/areadlinkat-tests @@ -1,6 +1,7 @@ Files: tests/test-areadlink.h tests/test-areadlinkat.c +tests/macros.h Depends-on: stdbool diff --git a/modules/areadlinkat-with-size-tests b/modules/areadlinkat-with-size-tests index f3d3878f3f..972bc3eeb1 100644 --- a/modules/areadlinkat-with-size-tests +++ b/modules/areadlinkat-with-size-tests @@ -1,6 +1,7 @@ Files: tests/test-areadlink.h tests/test-areadlinkat-with-size.c +tests/macros.h Depends-on: stdbool diff --git a/modules/argmatch-tests b/modules/argmatch-tests index 253d4d6b11..85ac3a2b56 100644 --- a/modules/argmatch-tests +++ b/modules/argmatch-tests @@ -1,5 +1,6 @@ Files: tests/test-argmatch.c +tests/macros.h Depends-on: progname diff --git a/modules/argv-iter-tests b/modules/argv-iter-tests index af0405bfb4..92c5c82bc1 100644 --- a/modules/argv-iter-tests +++ b/modules/argv-iter-tests @@ -1,5 +1,6 @@ Files: tests/test-argv-iter.c +tests/macros.h Depends-on: diff --git a/modules/array-list-tests b/modules/array-list-tests index 83dc54c43b..1e9524d264 100644 --- a/modules/array-list-tests +++ b/modules/array-list-tests @@ -1,5 +1,6 @@ Files: tests/test-array_list.c +tests/macros.h Depends-on: progname diff --git a/modules/array-mergesort-tests b/modules/array-mergesort-tests index ab1230822f..5bf9b67829 100644 --- a/modules/array-mergesort-tests +++ b/modules/array-mergesort-tests @@ -1,5 +1,6 @@ Files: tests/test-array-mergesort.c +tests/macros.h Depends-on: diff --git a/modules/array-oset-tests b/modules/array-oset-tests index 89f071d4b7..5791316312 100644 --- a/modules/array-oset-tests +++ b/modules/array-oset-tests @@ -1,5 +1,6 @@ Files: tests/test-array_oset.c +tests/macros.h Depends-on: xlist diff --git a/modules/avltree-list-tests b/modules/avltree-list-tests index c87eda30b6..cbd47c7811 100644 --- a/modules/avltree-list-tests +++ b/modules/avltree-list-tests @@ -1,5 +1,6 @@ Files: tests/test-avltree_list.c +tests/macros.h Depends-on: array-list diff --git a/modules/avltree-oset-tests b/modules/avltree-oset-tests index a33b6c6748..a29ad587d4 100644 --- a/modules/avltree-oset-tests +++ b/modules/avltree-oset-tests @@ -1,5 +1,6 @@ Files: tests/test-avltree_oset.c +tests/macros.h Depends-on: array-oset diff --git a/modules/avltreehash-list-tests b/modules/avltreehash-list-tests index dd013d2121..eae613ec14 100644 --- a/modules/avltreehash-list-tests +++ b/modules/avltreehash-list-tests @@ -1,5 +1,6 @@ Files: tests/test-avltreehash_list.c +tests/macros.h Depends-on: array-list diff --git a/modules/base64-tests b/modules/base64-tests index 6406768e31..b8659a8b3a 100644 --- a/modules/base64-tests +++ b/modules/base64-tests @@ -1,5 +1,6 @@ Files: tests/test-base64.c +tests/macros.h Depends-on: diff --git a/modules/binary-io-tests b/modules/binary-io-tests index 1cdc88a13b..e59f056715 100644 --- a/modules/binary-io-tests +++ b/modules/binary-io-tests @@ -1,6 +1,7 @@ Files: tests/test-binary-io.sh tests/test-binary-io.c +tests/macros.h Depends-on: diff --git a/modules/bitrotate-tests b/modules/bitrotate-tests index 405607a2bf..c6860197f8 100644 --- a/modules/bitrotate-tests +++ b/modules/bitrotate-tests @@ -1,5 +1,6 @@ Files: tests/test-bitrotate.c +tests/macros.h Depends-on: diff --git a/modules/btowc-tests b/modules/btowc-tests index c5e73ce7ec..371bde95ea 100644 --- a/modules/btowc-tests +++ b/modules/btowc-tests @@ -1,8 +1,9 @@ Files: -tests/signature.h tests/test-btowc1.sh tests/test-btowc2.sh tests/test-btowc.c +tests/signature.h +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/byteswap-tests b/modules/byteswap-tests index 0ac626e1b1..08ffc83d2e 100644 --- a/modules/byteswap-tests +++ b/modules/byteswap-tests @@ -1,5 +1,6 @@ Files: tests/test-byteswap.c +tests/macros.h Depends-on: diff --git a/modules/c-ctype-tests b/modules/c-ctype-tests index 35a47c1670..196f529998 100644 --- a/modules/c-ctype-tests +++ b/modules/c-ctype-tests @@ -1,5 +1,6 @@ Files: tests/test-c-ctype.c +tests/macros.h Depends-on: diff --git a/modules/c-stack-tests b/modules/c-stack-tests index dfed076060..808e59e5cd 100644 --- a/modules/c-stack-tests +++ b/modules/c-stack-tests @@ -2,6 +2,7 @@ Files: tests/test-c-stack.c tests/test-c-stack.sh tests/test-c-stack2.sh +tests/macros.h Depends-on: exitfail diff --git a/modules/c-strcase-tests b/modules/c-strcase-tests index f223ffd9d5..aec09db5bc 100644 --- a/modules/c-strcase-tests +++ b/modules/c-strcase-tests @@ -2,6 +2,7 @@ Files: tests/test-c-strcase.sh tests/test-c-strcasecmp.c tests/test-c-strncasecmp.c +tests/macros.h m4/locale-fr.m4 m4/locale-tr.m4 m4/codeset.m4 diff --git a/modules/c-strcasestr-tests b/modules/c-strcasestr-tests index 857a59205e..f67108611b 100644 --- a/modules/c-strcasestr-tests +++ b/modules/c-strcasestr-tests @@ -1,5 +1,6 @@ Files: tests/test-c-strcasestr.c +tests/macros.h Depends-on: diff --git a/modules/c-strstr-tests b/modules/c-strstr-tests index 381d7a3bd2..78565b22d3 100644 --- a/modules/c-strstr-tests +++ b/modules/c-strstr-tests @@ -1,5 +1,6 @@ Files: tests/test-c-strstr.c +tests/macros.h Depends-on: diff --git a/modules/canonicalize-lgpl-tests b/modules/canonicalize-lgpl-tests index 5ddb1998cd..bc07ea34c6 100644 --- a/modules/canonicalize-lgpl-tests +++ b/modules/canonicalize-lgpl-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-canonicalize-lgpl.c +tests/signature.h +tests/macros.h Depends-on: same-inode diff --git a/modules/canonicalize-tests b/modules/canonicalize-tests index b10b61d666..fb18d66b25 100644 --- a/modules/canonicalize-tests +++ b/modules/canonicalize-tests @@ -1,5 +1,6 @@ Files: tests/test-canonicalize.c +tests/macros.h Depends-on: progname diff --git a/modules/carray-list-tests b/modules/carray-list-tests index 82e7b7894b..4f13705ae2 100644 --- a/modules/carray-list-tests +++ b/modules/carray-list-tests @@ -1,5 +1,6 @@ Files: tests/test-carray_list.c +tests/macros.h Depends-on: array-list diff --git a/modules/ceilf-tests b/modules/ceilf-tests index 2599ab11c3..f58cbed016 100644 --- a/modules/ceilf-tests +++ b/modules/ceilf-tests @@ -1,8 +1,9 @@ Files: -tests/signature.h tests/test-ceilf1.c tests/test-ceilf2.c tests/nan.h +tests/signature.h +tests/macros.h Depends-on: float diff --git a/modules/ceill-tests b/modules/ceill-tests index 0d5f0fd1fe..6ac9b5aee8 100644 --- a/modules/ceill-tests +++ b/modules/ceill-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-ceill.c tests/nan.h +tests/signature.h +tests/macros.h Depends-on: fpucw diff --git a/modules/chown-tests b/modules/chown-tests index a320328fa8..68f74f0ae6 100644 --- a/modules/chown-tests +++ b/modules/chown-tests @@ -1,8 +1,9 @@ Files: -tests/signature.h tests/nap.h tests/test-chown.h tests/test-chown.c +tests/signature.h +tests/macros.h Depends-on: lstat diff --git a/modules/cloexec-tests b/modules/cloexec-tests index 22792dbacc..3a76b9e9a3 100644 --- a/modules/cloexec-tests +++ b/modules/cloexec-tests @@ -1,5 +1,6 @@ Files: tests/test-cloexec.c +tests/macros.h Depends-on: binary-io diff --git a/modules/copy-file-tests b/modules/copy-file-tests index a683dee251..c4fe4fd467 100644 --- a/modules/copy-file-tests +++ b/modules/copy-file-tests @@ -1,6 +1,7 @@ Files: tests/test-copy-file.sh tests/test-copy-file.c +tests/macros.h Depends-on: acl diff --git a/modules/count-one-bits-tests b/modules/count-one-bits-tests index c8241b3576..bf0a543212 100644 --- a/modules/count-one-bits-tests +++ b/modules/count-one-bits-tests @@ -1,5 +1,6 @@ Files: tests/test-count-one-bits.c +tests/macros.h Depends-on: diff --git a/modules/dprintf-posix-tests b/modules/dprintf-posix-tests index 5b865ce8bf..e4df83d601 100644 --- a/modules/dprintf-posix-tests +++ b/modules/dprintf-posix-tests @@ -1,10 +1,11 @@ Files: -tests/signature.h tests/test-dprintf-posix.sh tests/test-dprintf-posix.c tests/test-printf-posix.output tests/test-dprintf-posix2.sh tests/test-dprintf-posix2.c +tests/signature.h +tests/macros.h Depends-on: stdint diff --git a/modules/dup2-tests b/modules/dup2-tests index b24ef675f2..679f4b15e9 100644 --- a/modules/dup2-tests +++ b/modules/dup2-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-dup2.c +tests/signature.h +tests/macros.h Depends-on: binary-io diff --git a/modules/dup3-tests b/modules/dup3-tests index 2886d60fae..26dd5d89aa 100644 --- a/modules/dup3-tests +++ b/modules/dup3-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-dup3.c +tests/signature.h +tests/macros.h Depends-on: open diff --git a/modules/duplocale-tests b/modules/duplocale-tests index f0e9064ce0..af9dc9889d 100644 --- a/modules/duplocale-tests +++ b/modules/duplocale-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-duplocale.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/fbufmode-tests b/modules/fbufmode-tests index 8a9041f1ff..fa36a61b62 100644 --- a/modules/fbufmode-tests +++ b/modules/fbufmode-tests @@ -1,5 +1,6 @@ Files: tests/test-fbufmode.c +tests/macros.h Depends-on: diff --git a/modules/fchdir-tests b/modules/fchdir-tests index 2e202f3696..462e709211 100644 --- a/modules/fchdir-tests +++ b/modules/fchdir-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-fchdir.c +tests/signature.h +tests/macros.h Depends-on: getcwd diff --git a/modules/fcntl-safer-tests b/modules/fcntl-safer-tests index 3e8a2f6ba4..cb35aed252 100644 --- a/modules/fcntl-safer-tests +++ b/modules/fcntl-safer-tests @@ -1,6 +1,7 @@ Files: tests/test-open.h tests/test-fcntl-safer.c +tests/macros.h Depends-on: stdbool diff --git a/modules/fcntl-tests b/modules/fcntl-tests index e47f2d6399..44b040c251 100644 --- a/modules/fcntl-tests +++ b/modules/fcntl-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-fcntl.c +tests/signature.h +tests/macros.h Depends-on: binary-io diff --git a/modules/fdopendir-tests b/modules/fdopendir-tests index c0bafb6c13..bee2df7df5 100644 --- a/modules/fdopendir-tests +++ b/modules/fdopendir-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-fdopendir.c +tests/signature.h +tests/macros.h Depends-on: open diff --git a/modules/fdutimensat-tests b/modules/fdutimensat-tests index 16cf82c4f3..dc55c45b2d 100644 --- a/modules/fdutimensat-tests +++ b/modules/fdutimensat-tests @@ -5,6 +5,7 @@ tests/test-lutimens.h tests/test-utimens.h tests/test-utimens-common.h tests/test-fdutimensat.c +tests/macros.h Depends-on: progname diff --git a/modules/fflush-tests b/modules/fflush-tests index db5a5c0167..e439c2c78b 100644 --- a/modules/fflush-tests +++ b/modules/fflush-tests @@ -1,8 +1,9 @@ Files: -tests/signature.h tests/test-fflush.c tests/test-fflush2.sh tests/test-fflush2.c +tests/signature.h +tests/macros.h Depends-on: binary-io diff --git a/modules/filevercmp-tests b/modules/filevercmp-tests index 165ecfe1bb..46cf401821 100644 --- a/modules/filevercmp-tests +++ b/modules/filevercmp-tests @@ -1,5 +1,6 @@ Files: tests/test-filevercmp.c +tests/macros.h Depends-on: diff --git a/modules/flock-tests b/modules/flock-tests index 441e23e666..ece4b48263 100644 --- a/modules/flock-tests +++ b/modules/flock-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-flock.c +tests/signature.h +tests/macros.h Depends-on: unistd diff --git a/modules/floorf-tests b/modules/floorf-tests index d6a8185c85..988d8925cb 100644 --- a/modules/floorf-tests +++ b/modules/floorf-tests @@ -1,8 +1,9 @@ Files: -tests/signature.h tests/test-floorf1.c tests/test-floorf2.c tests/nan.h +tests/signature.h +tests/macros.h Depends-on: float diff --git a/modules/floorl-tests b/modules/floorl-tests index 10310923df..4cffee619c 100644 --- a/modules/floorl-tests +++ b/modules/floorl-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-floorl.c tests/nan.h +tests/signature.h +tests/macros.h Depends-on: fpucw diff --git a/modules/fnmatch-tests b/modules/fnmatch-tests index c83b905be7..cb16de436c 100644 --- a/modules/fnmatch-tests +++ b/modules/fnmatch-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-fnmatch.c +tests/signature.h +tests/macros.h Makefile.am: TESTS += test-fnmatch diff --git a/modules/fopen-safer-tests b/modules/fopen-safer-tests index 21116e60ec..256c54ceff 100644 --- a/modules/fopen-safer-tests +++ b/modules/fopen-safer-tests @@ -1,6 +1,7 @@ Files: tests/test-fopen.h tests/test-fopen-safer.c +tests/macros.h Depends-on: diff --git a/modules/fopen-tests b/modules/fopen-tests index 208ec3b2e1..69ff6ac4cc 100644 --- a/modules/fopen-tests +++ b/modules/fopen-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-fopen.h tests/test-fopen.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/fpending-tests b/modules/fpending-tests index c6261a59a8..bc8394c19b 100644 --- a/modules/fpending-tests +++ b/modules/fpending-tests @@ -1,6 +1,7 @@ Files: tests/test-fpending.c tests/test-fpending.sh +tests/macros.h Depends-on: diff --git a/modules/fprintf-posix-tests b/modules/fprintf-posix-tests index 4ac9a12ca7..1473544742 100644 --- a/modules/fprintf-posix-tests +++ b/modules/fprintf-posix-tests @@ -1,5 +1,4 @@ Files: -tests/signature.h tests/test-fprintf-posix.sh tests/test-fprintf-posix.c tests/test-fprintf-posix.h @@ -8,6 +7,8 @@ tests/test-fprintf-posix2.sh tests/test-fprintf-posix2.c tests/test-fprintf-posix3.sh tests/test-fprintf-posix3.c +tests/signature.h +tests/macros.h Depends-on: stdint diff --git a/modules/fpurge-tests b/modules/fpurge-tests index b5c99c9e92..74e898d1a6 100644 --- a/modules/fpurge-tests +++ b/modules/fpurge-tests @@ -1,5 +1,6 @@ Files: tests/test-fpurge.c +tests/macros.h Depends-on: fflush diff --git a/modules/freadable-tests b/modules/freadable-tests index bace5192d9..9e6f4152ae 100644 --- a/modules/freadable-tests +++ b/modules/freadable-tests @@ -1,5 +1,6 @@ Files: tests/test-freadable.c +tests/macros.h Depends-on: fflush diff --git a/modules/freadahead-tests b/modules/freadahead-tests index d8349633ec..13e95cd99e 100644 --- a/modules/freadahead-tests +++ b/modules/freadahead-tests @@ -1,6 +1,7 @@ Files: tests/test-freadahead.c tests/test-freadahead.sh +tests/macros.h Depends-on: lseek diff --git a/modules/freading-tests b/modules/freading-tests index 78cb96a79c..10c2311713 100644 --- a/modules/freading-tests +++ b/modules/freading-tests @@ -1,5 +1,6 @@ Files: tests/test-freading.c +tests/macros.h Depends-on: fflush diff --git a/modules/freadptr-tests b/modules/freadptr-tests index c9e3155e15..783aea7068 100644 --- a/modules/freadptr-tests +++ b/modules/freadptr-tests @@ -3,6 +3,7 @@ tests/test-freadptr.c tests/test-freadptr.sh tests/test-freadptr2.c tests/test-freadptr2.sh +tests/macros.h Depends-on: lseek diff --git a/modules/freadseek-tests b/modules/freadseek-tests index 6fb15489ea..e89607abaf 100644 --- a/modules/freadseek-tests +++ b/modules/freadseek-tests @@ -1,6 +1,7 @@ Files: tests/test-freadseek.c tests/test-freadseek.sh +tests/macros.h Depends-on: unistd diff --git a/modules/freopen-tests b/modules/freopen-tests index 0f9ae2142d..95b59152e5 100644 --- a/modules/freopen-tests +++ b/modules/freopen-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-freopen.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/frexp-nolibm-tests b/modules/frexp-nolibm-tests index acbfec7098..abde575805 100644 --- a/modules/frexp-nolibm-tests +++ b/modules/frexp-nolibm-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-frexp.c +tests/signature.h +tests/macros.h Depends-on: isnand-nolibm diff --git a/modules/frexp-tests b/modules/frexp-tests index e90189bbd1..a5cfeaf14f 100644 --- a/modules/frexp-tests +++ b/modules/frexp-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-frexp.c tests/nan.h +tests/signature.h +tests/macros.h Depends-on: isnand-nolibm diff --git a/modules/frexpl-nolibm-tests b/modules/frexpl-nolibm-tests index 85799561b8..90b8ee4969 100644 --- a/modules/frexpl-nolibm-tests +++ b/modules/frexpl-nolibm-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-frexpl.c +tests/signature.h +tests/macros.h Depends-on: fpucw diff --git a/modules/frexpl-tests b/modules/frexpl-tests index 5382cec73a..54fe2ae192 100644 --- a/modules/frexpl-tests +++ b/modules/frexpl-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-frexpl.c tests/nan.h +tests/signature.h +tests/macros.h Depends-on: fpucw diff --git a/modules/fseek-tests b/modules/fseek-tests index cd76a95dcd..6de889b685 100644 --- a/modules/fseek-tests +++ b/modules/fseek-tests @@ -1,8 +1,9 @@ Files: -tests/signature.h tests/test-fseek.c tests/test-fseek.sh tests/test-fseek2.sh +tests/signature.h +tests/macros.h m4/ungetc.m4 Depends-on: diff --git a/modules/fseeko-tests b/modules/fseeko-tests index e2fb27ed5e..1359970ca5 100644 --- a/modules/fseeko-tests +++ b/modules/fseeko-tests @@ -1,8 +1,9 @@ Files: -tests/signature.h tests/test-fseeko.c tests/test-fseeko.sh tests/test-fseeko2.sh +tests/signature.h +tests/macros.h m4/ungetc.m4 Depends-on: diff --git a/modules/fstrcmp-tests b/modules/fstrcmp-tests index c7dcda5e21..b82f414b00 100644 --- a/modules/fstrcmp-tests +++ b/modules/fstrcmp-tests @@ -1,5 +1,6 @@ Files: tests/test-fstrcmp.c +tests/macros.h Depends-on: stdbool diff --git a/modules/fsync-tests b/modules/fsync-tests index a3db419190..e3df22dbb1 100644 --- a/modules/fsync-tests +++ b/modules/fsync-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-fsync.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/ftell-tests b/modules/ftell-tests index 717b48edd5..c669a98f41 100644 --- a/modules/ftell-tests +++ b/modules/ftell-tests @@ -1,8 +1,9 @@ Files: -tests/signature.h tests/test-ftell.c tests/test-ftell.sh tests/test-ftell2.sh +tests/signature.h +tests/macros.h m4/ungetc.m4 Depends-on: diff --git a/modules/ftello-tests b/modules/ftello-tests index c4937d0760..73f659e084 100644 --- a/modules/ftello-tests +++ b/modules/ftello-tests @@ -1,8 +1,9 @@ Files: -tests/signature.h tests/test-ftello.c tests/test-ftello.sh tests/test-ftello2.sh +tests/signature.h +tests/macros.h m4/ungetc.m4 Depends-on: diff --git a/modules/func-tests b/modules/func-tests index 9be33248ed..cb53b6d5d9 100644 --- a/modules/func-tests +++ b/modules/func-tests @@ -1,5 +1,6 @@ Files: tests/test-func.c +tests/macros.h configure.ac: diff --git a/modules/futimens-tests b/modules/futimens-tests index 702dbc2616..330711dba9 100644 --- a/modules/futimens-tests +++ b/modules/futimens-tests @@ -1,9 +1,10 @@ Files: -tests/signature.h tests/nap.h tests/test-futimens.h tests/test-utimens-common.h tests/test-futimens.c +tests/signature.h +tests/macros.h Depends-on: timespec diff --git a/modules/fwritable-tests b/modules/fwritable-tests index 7c7cedc55c..803a331e2d 100644 --- a/modules/fwritable-tests +++ b/modules/fwritable-tests @@ -1,5 +1,6 @@ Files: tests/test-fwritable.c +tests/macros.h Depends-on: fflush diff --git a/modules/fwriting-tests b/modules/fwriting-tests index 5594223f0f..2b74b64a5d 100644 --- a/modules/fwriting-tests +++ b/modules/fwriting-tests @@ -1,5 +1,6 @@ Files: tests/test-fwriting.c +tests/macros.h Depends-on: fflush diff --git a/modules/getcwd-tests b/modules/getcwd-tests index 75897cbe19..016961fc71 100644 --- a/modules/getcwd-tests +++ b/modules/getcwd-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-getcwd.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/getdate-tests b/modules/getdate-tests index 6b7c92ba49..ff2945db05 100644 --- a/modules/getdate-tests +++ b/modules/getdate-tests @@ -1,5 +1,6 @@ Files: tests/test-getdate.c +tests/macros.h Depends-on: progname diff --git a/modules/getdelim-tests b/modules/getdelim-tests index 880c380acc..a2f2aa0bee 100644 --- a/modules/getdelim-tests +++ b/modules/getdelim-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-getdelim.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/getdtablesize-tests b/modules/getdtablesize-tests index 8bf1a2cc2e..5f78c5fc94 100644 --- a/modules/getdtablesize-tests +++ b/modules/getdtablesize-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-getdtablesize.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/getgroups-tests b/modules/getgroups-tests index 69e2647428..3db9224de0 100644 --- a/modules/getgroups-tests +++ b/modules/getgroups-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-getgroups.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/getline-tests b/modules/getline-tests index 676a04f207..33eb2b7b95 100644 --- a/modules/getline-tests +++ b/modules/getline-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-getline.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/getndelim2-tests b/modules/getndelim2-tests index 7081b3adbd..d7e4dfc57f 100644 --- a/modules/getndelim2-tests +++ b/modules/getndelim2-tests @@ -1,5 +1,6 @@ Files: tests/test-getndelim2.c +tests/macros.h Depends-on: diff --git a/modules/glob-tests b/modules/glob-tests index bedaef014a..3cf2c90105 100644 --- a/modules/glob-tests +++ b/modules/glob-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-glob.c +tests/signature.h +tests/macros.h Makefile.am: TESTS += test-glob diff --git a/modules/hash-tests b/modules/hash-tests index f67a085124..a77bfe7d68 100644 --- a/modules/hash-tests +++ b/modules/hash-tests @@ -1,5 +1,6 @@ Files: tests/test-hash.c +tests/macros.h Depends-on: hash-pjw diff --git a/modules/i-ring-tests b/modules/i-ring-tests index 3385ca585a..96361c92b7 100644 --- a/modules/i-ring-tests +++ b/modules/i-ring-tests @@ -1,5 +1,6 @@ Files: tests/test-i-ring.c +tests/macros.h Depends-on: diff --git a/modules/iconv-tests b/modules/iconv-tests index 46fcb1a128..91e17f0c42 100644 --- a/modules/iconv-tests +++ b/modules/iconv-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-iconv.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/iconv_open-utf-tests b/modules/iconv_open-utf-tests index d5eb6844e1..3e3c988397 100644 --- a/modules/iconv_open-utf-tests +++ b/modules/iconv_open-utf-tests @@ -1,5 +1,6 @@ Files: tests/test-iconv-utf.c +tests/macros.h Depends-on: diff --git a/modules/idpriv-drop-tests b/modules/idpriv-drop-tests index 2a9c99900d..5416463d9d 100644 --- a/modules/idpriv-drop-tests +++ b/modules/idpriv-drop-tests @@ -7,6 +7,7 @@ Files: tests/test-idpriv-drop.sh tests/test-idpriv-drop.su.sh tests/test-idpriv-drop.c +tests/macros.h Depends-on: stdbool diff --git a/modules/idpriv-droptemp-tests b/modules/idpriv-droptemp-tests index 26b9136ffd..d6c20973d0 100644 --- a/modules/idpriv-droptemp-tests +++ b/modules/idpriv-droptemp-tests @@ -7,6 +7,7 @@ Files: tests/test-idpriv-droptemp.sh tests/test-idpriv-droptemp.su.sh tests/test-idpriv-droptemp.c +tests/macros.h Depends-on: stdbool diff --git a/modules/inet_ntop-tests b/modules/inet_ntop-tests index e8236d6e03..cab3d51a63 100644 --- a/modules/inet_ntop-tests +++ b/modules/inet_ntop-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-inet_ntop.c +tests/signature.h +tests/macros.h Depends-on: netinet_in diff --git a/modules/inet_pton-tests b/modules/inet_pton-tests index 1404e31f29..cc7408a6db 100644 --- a/modules/inet_pton-tests +++ b/modules/inet_pton-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-inet_pton.c +tests/signature.h +tests/macros.h Depends-on: netinet_in diff --git a/modules/isblank-tests b/modules/isblank-tests index cd140ee334..43d29ade9d 100644 --- a/modules/isblank-tests +++ b/modules/isblank-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-isblank.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/isfinite-tests b/modules/isfinite-tests index 673aa1cdfc..78971d9834 100644 --- a/modules/isfinite-tests +++ b/modules/isfinite-tests @@ -1,5 +1,6 @@ Files: tests/test-isfinite.c +tests/macros.h Depends-on: float diff --git a/modules/isinf-tests b/modules/isinf-tests index 8e15f659e4..e5b6387771 100644 --- a/modules/isinf-tests +++ b/modules/isinf-tests @@ -3,6 +3,7 @@ m4/exponentf.m4 m4/exponentd.m4 m4/exponentl.m4 tests/test-isinf.c +tests/macros.h Depends-on: float diff --git a/modules/isnan-tests b/modules/isnan-tests index d5aff2a91f..a63b7cfd15 100644 --- a/modules/isnan-tests +++ b/modules/isnan-tests @@ -1,6 +1,7 @@ Files: tests/test-isnan.c tests/nan.h +tests/macros.h Depends-on: float diff --git a/modules/isnand-nolibm-tests b/modules/isnand-nolibm-tests index 63273349b4..2ce8b6c5a7 100644 --- a/modules/isnand-nolibm-tests +++ b/modules/isnand-nolibm-tests @@ -2,6 +2,7 @@ Files: tests/test-isnand-nolibm.c tests/test-isnand.h tests/nan.h +tests/macros.h Depends-on: diff --git a/modules/isnand-tests b/modules/isnand-tests index 8d406feb7f..b9964ccae7 100644 --- a/modules/isnand-tests +++ b/modules/isnand-tests @@ -2,6 +2,7 @@ Files: tests/test-isnand.c tests/test-isnand.h tests/nan.h +tests/macros.h Depends-on: diff --git a/modules/isnanf-nolibm-tests b/modules/isnanf-nolibm-tests index 0e839302e2..6aab7e0727 100644 --- a/modules/isnanf-nolibm-tests +++ b/modules/isnanf-nolibm-tests @@ -2,6 +2,7 @@ Files: tests/test-isnanf-nolibm.c tests/test-isnanf.h tests/nan.h +tests/macros.h Depends-on: diff --git a/modules/isnanf-tests b/modules/isnanf-tests index 6bd5adc593..2c09485f7f 100644 --- a/modules/isnanf-tests +++ b/modules/isnanf-tests @@ -2,6 +2,7 @@ Files: tests/test-isnanf.c tests/test-isnanf.h tests/nan.h +tests/macros.h Depends-on: diff --git a/modules/isnanl-nolibm-tests b/modules/isnanl-nolibm-tests index f9414e3cf1..6d2f08e43b 100644 --- a/modules/isnanl-nolibm-tests +++ b/modules/isnanl-nolibm-tests @@ -2,6 +2,7 @@ Files: tests/test-isnanl-nolibm.c tests/test-isnanl.h tests/nan.h +tests/macros.h Depends-on: float diff --git a/modules/isnanl-tests b/modules/isnanl-tests index 518420faf1..5cff0dd732 100644 --- a/modules/isnanl-tests +++ b/modules/isnanl-tests @@ -2,6 +2,7 @@ Files: tests/test-isnanl.c tests/test-isnanl.h tests/nan.h +tests/macros.h Depends-on: float diff --git a/modules/lchown-tests b/modules/lchown-tests index 4fc7eaf87c..f3935d6c75 100644 --- a/modules/lchown-tests +++ b/modules/lchown-tests @@ -1,8 +1,9 @@ Files: -tests/signature.h tests/nap.h tests/test-lchown.h tests/test-lchown.c +tests/signature.h +tests/macros.h Depends-on: mgetgroups diff --git a/modules/ldexpl-tests b/modules/ldexpl-tests index 7b76ff403c..7148f264be 100644 --- a/modules/ldexpl-tests +++ b/modules/ldexpl-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-ldexpl.c tests/nan.h +tests/signature.h +tests/macros.h Depends-on: fpucw diff --git a/modules/link-tests b/modules/link-tests index 2bdb3eefb4..b7fb2ffaa7 100644 --- a/modules/link-tests +++ b/modules/link-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-link.h tests/test-link.c +tests/signature.h +tests/macros.h Depends-on: errno diff --git a/modules/linkat-tests b/modules/linkat-tests index 72e8a51ff0..602d18aa48 100644 --- a/modules/linkat-tests +++ b/modules/linkat-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-link.h tests/test-linkat.c +tests/signature.h +tests/macros.h Depends-on: areadlink-with-size diff --git a/modules/linked-list-tests b/modules/linked-list-tests index fca22a6a1b..d6fd5aa252 100644 --- a/modules/linked-list-tests +++ b/modules/linked-list-tests @@ -1,5 +1,6 @@ Files: tests/test-linked_list.c +tests/macros.h Depends-on: array-list diff --git a/modules/linkedhash-list-tests b/modules/linkedhash-list-tests index 4f13d9aa7a..510914934b 100644 --- a/modules/linkedhash-list-tests +++ b/modules/linkedhash-list-tests @@ -1,5 +1,6 @@ Files: tests/test-linkedhash_list.c +tests/macros.h Depends-on: array-list diff --git a/modules/localename-tests b/modules/localename-tests index 51972e7fce..3fbca140d3 100644 --- a/modules/localename-tests +++ b/modules/localename-tests @@ -1,5 +1,6 @@ Files: tests/test-localename.c +tests/macros.h Depends-on: locale diff --git a/modules/lseek-tests b/modules/lseek-tests index 6b05a92eb8..fa9a1ab4e0 100644 --- a/modules/lseek-tests +++ b/modules/lseek-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-lseek.c tests/test-lseek.sh +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/lstat-tests b/modules/lstat-tests index 43ebd9429e..a0296a6400 100644 --- a/modules/lstat-tests +++ b/modules/lstat-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-lstat.h tests/test-lstat.c +tests/signature.h +tests/macros.h Depends-on: errno diff --git a/modules/mbmemcasecmp-tests b/modules/mbmemcasecmp-tests index 0560f2218e..e4db04d296 100644 --- a/modules/mbmemcasecmp-tests +++ b/modules/mbmemcasecmp-tests @@ -4,6 +4,7 @@ tests/test-mbmemcasecmp2.sh tests/test-mbmemcasecmp3.sh tests/test-mbmemcasecmp.c tests/test-mbmemcasecmp.h +tests/macros.h m4/locale-fr.m4 m4/locale-tr.m4 m4/codeset.m4 diff --git a/modules/mbmemcasecoll-tests b/modules/mbmemcasecoll-tests index a5e3451224..82f117fc5e 100644 --- a/modules/mbmemcasecoll-tests +++ b/modules/mbmemcasecoll-tests @@ -4,6 +4,7 @@ tests/test-mbmemcasecoll2.sh tests/test-mbmemcasecoll3.sh tests/test-mbmemcasecoll.c tests/test-mbmemcasecmp.h +tests/macros.h m4/locale-fr.m4 m4/locale-tr.m4 m4/codeset.m4 diff --git a/modules/mbrtowc-tests b/modules/mbrtowc-tests index 0237acaf7a..e97ff2f39b 100644 --- a/modules/mbrtowc-tests +++ b/modules/mbrtowc-tests @@ -1,10 +1,11 @@ Files: -tests/signature.h tests/test-mbrtowc1.sh tests/test-mbrtowc2.sh tests/test-mbrtowc3.sh tests/test-mbrtowc4.sh tests/test-mbrtowc.c +tests/signature.h +tests/macros.h m4/locale-fr.m4 m4/locale-ja.m4 m4/locale-zh.m4 diff --git a/modules/mbscasecmp-tests b/modules/mbscasecmp-tests index 19581b6ce0..572c83841d 100644 --- a/modules/mbscasecmp-tests +++ b/modules/mbscasecmp-tests @@ -1,6 +1,7 @@ Files: tests/test-mbscasecmp.sh tests/test-mbscasecmp.c +tests/macros.h m4/locale-tr.m4 m4/codeset.m4 diff --git a/modules/mbscasestr-tests b/modules/mbscasestr-tests index 0c6e9ba607..4c6b47420d 100644 --- a/modules/mbscasestr-tests +++ b/modules/mbscasestr-tests @@ -6,6 +6,7 @@ tests/test-mbscasestr3.sh tests/test-mbscasestr3.c tests/test-mbscasestr4.sh tests/test-mbscasestr4.c +tests/macros.h m4/locale-fr.m4 m4/locale-tr.m4 m4/locale-zh.m4 diff --git a/modules/mbschr-tests b/modules/mbschr-tests index 4f8d8314ec..e08442353b 100644 --- a/modules/mbschr-tests +++ b/modules/mbschr-tests @@ -1,6 +1,7 @@ Files: tests/test-mbschr.sh tests/test-mbschr.c +tests/macros.h m4/locale-zh.m4 m4/codeset.m4 diff --git a/modules/mbscspn-tests b/modules/mbscspn-tests index 66fae89809..bdb8e6a670 100644 --- a/modules/mbscspn-tests +++ b/modules/mbscspn-tests @@ -1,6 +1,7 @@ Files: tests/test-mbscspn.sh tests/test-mbscspn.c +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/mbsinit-tests b/modules/mbsinit-tests index 24777f9650..8ee370e9ae 100644 --- a/modules/mbsinit-tests +++ b/modules/mbsinit-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-mbsinit.sh tests/test-mbsinit.c +tests/signature.h +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/mbsncasecmp-tests b/modules/mbsncasecmp-tests index 570da7a66c..cdfe377518 100644 --- a/modules/mbsncasecmp-tests +++ b/modules/mbsncasecmp-tests @@ -1,6 +1,7 @@ Files: tests/test-mbsncasecmp.sh tests/test-mbsncasecmp.c +tests/macros.h m4/locale-tr.m4 m4/codeset.m4 diff --git a/modules/mbsnrtowcs-tests b/modules/mbsnrtowcs-tests index ceb54796d0..378d2a2cf6 100644 --- a/modules/mbsnrtowcs-tests +++ b/modules/mbsnrtowcs-tests @@ -1,10 +1,11 @@ Files: -tests/signature.h tests/test-mbsnrtowcs1.sh tests/test-mbsnrtowcs2.sh tests/test-mbsnrtowcs3.sh tests/test-mbsnrtowcs4.sh tests/test-mbsnrtowcs.c +tests/signature.h +tests/macros.h m4/locale-fr.m4 m4/locale-ja.m4 m4/locale-zh.m4 diff --git a/modules/mbspbrk-tests b/modules/mbspbrk-tests index 4c90352c25..5582121094 100644 --- a/modules/mbspbrk-tests +++ b/modules/mbspbrk-tests @@ -1,6 +1,7 @@ Files: tests/test-mbspbrk.sh tests/test-mbspbrk.c +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/mbspcasecmp-tests b/modules/mbspcasecmp-tests index d93a0844e8..aab12cab12 100644 --- a/modules/mbspcasecmp-tests +++ b/modules/mbspcasecmp-tests @@ -1,6 +1,7 @@ Files: tests/test-mbspcasecmp.sh tests/test-mbspcasecmp.c +tests/macros.h m4/locale-tr.m4 m4/codeset.m4 diff --git a/modules/mbsrchr-tests b/modules/mbsrchr-tests index 11e8146e90..64d360355f 100644 --- a/modules/mbsrchr-tests +++ b/modules/mbsrchr-tests @@ -1,6 +1,7 @@ Files: tests/test-mbsrchr.sh tests/test-mbsrchr.c +tests/macros.h m4/locale-zh.m4 m4/codeset.m4 diff --git a/modules/mbsrtowcs-tests b/modules/mbsrtowcs-tests index 7b65531a06..3d7ed88072 100644 --- a/modules/mbsrtowcs-tests +++ b/modules/mbsrtowcs-tests @@ -1,10 +1,11 @@ Files: -tests/signature.h tests/test-mbsrtowcs1.sh tests/test-mbsrtowcs2.sh tests/test-mbsrtowcs3.sh tests/test-mbsrtowcs4.sh tests/test-mbsrtowcs.c +tests/signature.h +tests/macros.h m4/locale-fr.m4 m4/locale-ja.m4 m4/locale-zh.m4 diff --git a/modules/mbsspn-tests b/modules/mbsspn-tests index d84e7c45cb..95da3f21ae 100644 --- a/modules/mbsspn-tests +++ b/modules/mbsspn-tests @@ -1,6 +1,7 @@ Files: tests/test-mbsspn.sh tests/test-mbsspn.c +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/mbsstr-tests b/modules/mbsstr-tests index e75d4ab523..c36c02d494 100644 --- a/modules/mbsstr-tests +++ b/modules/mbsstr-tests @@ -4,6 +4,7 @@ tests/test-mbsstr2.sh tests/test-mbsstr2.c tests/test-mbsstr3.sh tests/test-mbsstr3.c +tests/macros.h m4/locale-fr.m4 m4/locale-zh.m4 m4/codeset.m4 diff --git a/modules/memchr-tests b/modules/memchr-tests index 79d6f48b39..4fafa8dcc6 100644 --- a/modules/memchr-tests +++ b/modules/memchr-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-memchr.c tests/zerosize-ptr.h +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/memchr2-tests b/modules/memchr2-tests index 99c02b1fcc..66901aef93 100644 --- a/modules/memchr2-tests +++ b/modules/memchr2-tests @@ -1,6 +1,7 @@ Files: tests/test-memchr2.c tests/zerosize-ptr.h +tests/macros.h m4/mmap-anon.m4 Depends-on: diff --git a/modules/memcmp-tests b/modules/memcmp-tests index 33d740d5c6..15f099c032 100644 --- a/modules/memcmp-tests +++ b/modules/memcmp-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-memcmp.c tests/zerosize-ptr.h +tests/signature.h +tests/macros.h m4/mmap-anon.m4 Depends-on: diff --git a/modules/memmem-tests b/modules/memmem-tests index 88301edd26..4738d5c8dd 100644 --- a/modules/memmem-tests +++ b/modules/memmem-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-memmem.c tests/zerosize-ptr.h +tests/signature.h +tests/macros.h m4/mmap-anon.m4 Depends-on: diff --git a/modules/memrchr-tests b/modules/memrchr-tests index d5bc773297..e3af277786 100644 --- a/modules/memrchr-tests +++ b/modules/memrchr-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-memrchr.c tests/zerosize-ptr.h +tests/signature.h +tests/macros.h m4/mmap-anon.m4 Depends-on: diff --git a/modules/mkdir-tests b/modules/mkdir-tests index 5f22b238f5..5f455c71fa 100644 --- a/modules/mkdir-tests +++ b/modules/mkdir-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-mkdir.h tests/test-mkdir.c +tests/signature.h +tests/macros.h Depends-on: stdbool diff --git a/modules/mkfifo-tests b/modules/mkfifo-tests index d3d0887368..1f92a41b59 100644 --- a/modules/mkfifo-tests +++ b/modules/mkfifo-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-mkfifo.h tests/test-mkfifo.c +tests/signature.h +tests/macros.h Depends-on: stdbool diff --git a/modules/mkfifoat-tests b/modules/mkfifoat-tests index ea8c4149b6..5e72b9460b 100644 --- a/modules/mkfifoat-tests +++ b/modules/mkfifoat-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-mkfifo.h tests/test-mkfifoat.c +tests/signature.h +tests/macros.h Depends-on: symlink diff --git a/modules/mknod-tests b/modules/mknod-tests index 3f4bbab920..c273f66d0b 100644 --- a/modules/mknod-tests +++ b/modules/mknod-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-mkfifo.h tests/test-mknod.c +tests/signature.h +tests/macros.h Depends-on: stdbool diff --git a/modules/nanosleep-tests b/modules/nanosleep-tests index ddc57c158a..c3b5f2f866 100644 --- a/modules/nanosleep-tests +++ b/modules/nanosleep-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-nanosleep.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/nl_langinfo-tests b/modules/nl_langinfo-tests index 7c9ce97532..944b1d02e0 100644 --- a/modules/nl_langinfo-tests +++ b/modules/nl_langinfo-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-nl_langinfo.sh tests/test-nl_langinfo.c +tests/signature.h +tests/macros.h m4/locale-fr.m4 Depends-on: diff --git a/modules/obstack-printf-tests b/modules/obstack-printf-tests index 8bff6bdcab..f1c99ca94a 100644 --- a/modules/obstack-printf-tests +++ b/modules/obstack-printf-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-obstack-printf.c +tests/signature.h +tests/macros.h Depends-on: progname diff --git a/modules/open-tests b/modules/open-tests index cb8affba4f..5bc4e0f885 100644 --- a/modules/open-tests +++ b/modules/open-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-open.h tests/test-open.c +tests/signature.h +tests/macros.h Depends-on: stdbool diff --git a/modules/openat-tests b/modules/openat-tests index a3a08ac96b..489601c978 100644 --- a/modules/openat-tests +++ b/modules/openat-tests @@ -1,5 +1,4 @@ Files: -tests/signature.h tests/nap.h tests/test-chown.h tests/test-lchown.h @@ -13,6 +12,8 @@ tests/test-fstatat.c tests/test-mkdirat.c tests/test-openat.c tests/test-unlinkat.c +tests/signature.h +tests/macros.h Depends-on: mgetgroups diff --git a/modules/pipe-filter-gi-tests b/modules/pipe-filter-gi-tests index f0b2969f5a..263c7668e5 100644 --- a/modules/pipe-filter-gi-tests +++ b/modules/pipe-filter-gi-tests @@ -5,6 +5,7 @@ tests/test-vasnprintf-posix.c tests/test-pipe-filter-gi2.sh tests/test-pipe-filter-gi2-main.c tests/test-pipe-filter-gi2-child.c +tests/macros.h Depends-on: binary-io diff --git a/modules/pipe-filter-ii-tests b/modules/pipe-filter-ii-tests index 725d7be5c0..abb5fefc22 100644 --- a/modules/pipe-filter-ii-tests +++ b/modules/pipe-filter-ii-tests @@ -5,6 +5,7 @@ tests/test-vasnprintf-posix.c tests/test-pipe-filter-ii2.sh tests/test-pipe-filter-ii2-main.c tests/test-pipe-filter-ii2-child.c +tests/macros.h Depends-on: binary-io diff --git a/modules/pipe2-tests b/modules/pipe2-tests index 7ed4c87142..5d24bd747c 100644 --- a/modules/pipe2-tests +++ b/modules/pipe2-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-pipe2.c +tests/signature.h +tests/macros.h Depends-on: stdbool diff --git a/modules/popen-safer-tests b/modules/popen-safer-tests index 0e1b93a314..8b212aed22 100644 --- a/modules/popen-safer-tests +++ b/modules/popen-safer-tests @@ -2,6 +2,7 @@ Files: tests/test-popen.h tests/test-popen-safer.c tests/test-popen-safer2.c +tests/macros.h Depends-on: dup2 diff --git a/modules/popen-tests b/modules/popen-tests index c0d128cbd5..f3465b62a6 100644 --- a/modules/popen-tests +++ b/modules/popen-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-popen.h tests/test-popen.c +tests/signature.h +tests/macros.h Depends-on: dup2 diff --git a/modules/posixtm-tests b/modules/posixtm-tests index de4d12c5bb..216d602465 100644 --- a/modules/posixtm-tests +++ b/modules/posixtm-tests @@ -1,5 +1,6 @@ Files: tests/test-posixtm.c +tests/macros.h Depends-on: intprops diff --git a/modules/pread-tests b/modules/pread-tests index 415f9b9f7a..8a10c1815b 100644 --- a/modules/pread-tests +++ b/modules/pread-tests @@ -1,8 +1,9 @@ Files: -tests/signature.h tests/test-pread.c tests/test-pread.sh tests/init.sh +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/printf-frexp-tests b/modules/printf-frexp-tests index adfadb3188..37a40d013a 100644 --- a/modules/printf-frexp-tests +++ b/modules/printf-frexp-tests @@ -1,5 +1,6 @@ Files: tests/test-printf-frexp.c +tests/macros.h Depends-on: diff --git a/modules/printf-frexpl-tests b/modules/printf-frexpl-tests index 7eb69835a6..d70339ccf7 100644 --- a/modules/printf-frexpl-tests +++ b/modules/printf-frexpl-tests @@ -1,5 +1,6 @@ Files: tests/test-printf-frexpl.c +tests/macros.h Depends-on: fpucw diff --git a/modules/printf-posix-tests b/modules/printf-posix-tests index dfbb5e1603..08c6834e82 100644 --- a/modules/printf-posix-tests +++ b/modules/printf-posix-tests @@ -1,11 +1,12 @@ Files: -tests/signature.h tests/test-printf-posix.sh tests/test-printf-posix.c tests/test-printf-posix.h tests/test-printf-posix.output tests/test-printf-posix2.sh tests/test-printf-posix2.c +tests/signature.h +tests/macros.h Depends-on: stdint diff --git a/modules/priv-set-tests b/modules/priv-set-tests index cf87bc607e..af329dd93c 100644 --- a/modules/priv-set-tests +++ b/modules/priv-set-tests @@ -1,5 +1,6 @@ Files: tests/test-priv-set.c +tests/macros.h Depends-on: diff --git a/modules/quotearg-tests b/modules/quotearg-tests index 8c8f008841..5afb98671c 100644 --- a/modules/quotearg-tests +++ b/modules/quotearg-tests @@ -1,6 +1,7 @@ Files: tests/test-quotearg.sh tests/test-quotearg.c +tests/macros.h tests/locale/fr/LC_MESSAGES/test-quotearg.po tests/locale/fr/LC_MESSAGES/test-quotearg.mo m4/locale-fr.m4 diff --git a/modules/random_r-tests b/modules/random_r-tests index 72f54c0c37..b9dd6bf96a 100644 --- a/modules/random_r-tests +++ b/modules/random_r-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-random_r.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/rawmemchr-tests b/modules/rawmemchr-tests index a638459949..bca145e1ac 100644 --- a/modules/rawmemchr-tests +++ b/modules/rawmemchr-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-rawmemchr.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/rbtree-list-tests b/modules/rbtree-list-tests index 2cd042e102..c4262ab0cb 100644 --- a/modules/rbtree-list-tests +++ b/modules/rbtree-list-tests @@ -1,5 +1,6 @@ Files: tests/test-rbtree_list.c +tests/macros.h Depends-on: array-list diff --git a/modules/rbtree-oset-tests b/modules/rbtree-oset-tests index 0ac783d583..db690783a8 100644 --- a/modules/rbtree-oset-tests +++ b/modules/rbtree-oset-tests @@ -1,5 +1,6 @@ Files: tests/test-rbtree_oset.c +tests/macros.h Depends-on: array-oset diff --git a/modules/rbtreehash-list-tests b/modules/rbtreehash-list-tests index 2d17f01f09..446e44d1c8 100644 --- a/modules/rbtreehash-list-tests +++ b/modules/rbtreehash-list-tests @@ -1,5 +1,6 @@ Files: tests/test-rbtreehash_list.c +tests/macros.h Depends-on: array-list diff --git a/modules/readlink-tests b/modules/readlink-tests index efadd0c1b2..1aeac92676 100644 --- a/modules/readlink-tests +++ b/modules/readlink-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-readlink.h tests/test-readlink.c +tests/signature.h +tests/macros.h Depends-on: stdbool diff --git a/modules/remove-tests b/modules/remove-tests index ecdbcf30df..9e2e49c752 100644 --- a/modules/remove-tests +++ b/modules/remove-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-remove.c +tests/signature.h +tests/macros.h Depends-on: symlink diff --git a/modules/rename-tests b/modules/rename-tests index 52b69e2d02..84c4a3fbc7 100644 --- a/modules/rename-tests +++ b/modules/rename-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-rename.h tests/test-rename.c +tests/signature.h +tests/macros.h Depends-on: errno diff --git a/modules/renameat-tests b/modules/renameat-tests index 982a8efe22..53467dbdb0 100644 --- a/modules/renameat-tests +++ b/modules/renameat-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-rename.h tests/test-renameat.c +tests/signature.h +tests/macros.h Depends-on: filenamecat diff --git a/modules/rmdir-tests b/modules/rmdir-tests index 59b1211b72..5619ad5110 100644 --- a/modules/rmdir-tests +++ b/modules/rmdir-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-rmdir.h tests/test-rmdir.c +tests/signature.h +tests/macros.h Depends-on: stdbool diff --git a/modules/round-tests b/modules/round-tests index 79fe048fd2..002fc8b22c 100644 --- a/modules/round-tests +++ b/modules/round-tests @@ -1,8 +1,9 @@ Files: -tests/signature.h tests/test-round1.c tests/test-round2.c tests/nan.h +tests/signature.h +tests/macros.h Depends-on: isnand-nolibm diff --git a/modules/roundf-tests b/modules/roundf-tests index 56baa29e5d..84d5723b3c 100644 --- a/modules/roundf-tests +++ b/modules/roundf-tests @@ -1,9 +1,10 @@ Files: -tests/signature.h tests/test-roundf1.c tests/test-round2.c tests/test-roundf2.c tests/nan.h +tests/signature.h +tests/macros.h Depends-on: ceilf diff --git a/modules/roundl-tests b/modules/roundl-tests index 0375176b1a..73dcd9c3d3 100644 --- a/modules/roundl-tests +++ b/modules/roundl-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-roundl.c tests/nan.h +tests/signature.h +tests/macros.h Depends-on: fpucw diff --git a/modules/safe-alloc-tests b/modules/safe-alloc-tests index dbd9c8ffdc..06f771c47e 100644 --- a/modules/safe-alloc-tests +++ b/modules/safe-alloc-tests @@ -1,5 +1,6 @@ Files: tests/test-safe-alloc.c +tests/macros.h Depends-on: diff --git a/modules/setenv-tests b/modules/setenv-tests index 09ebf6f3e4..b7b8bad2e3 100644 --- a/modules/setenv-tests +++ b/modules/setenv-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-setenv.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/sigaction-tests b/modules/sigaction-tests index 6589ef4d70..e683614e67 100644 --- a/modules/sigaction-tests +++ b/modules/sigaction-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-sigaction.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/signbit-tests b/modules/signbit-tests index 25851c90de..10d7d7b51e 100644 --- a/modules/signbit-tests +++ b/modules/signbit-tests @@ -1,5 +1,6 @@ Files: tests/test-signbit.c +tests/macros.h m4/exponentf.m4 m4/exponentd.m4 m4/exponentl.m4 diff --git a/modules/sleep-tests b/modules/sleep-tests index 7e975b7c37..93a28f814d 100644 --- a/modules/sleep-tests +++ b/modules/sleep-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-sleep.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/snprintf-posix-tests b/modules/snprintf-posix-tests index 0658ea48b1..4448cf521c 100644 --- a/modules/snprintf-posix-tests +++ b/modules/snprintf-posix-tests @@ -1,9 +1,10 @@ Files: -tests/signature.h tests/test-snprintf-posix.c tests/test-snprintf-posix.h tests/test-snprintf.c tests/nan.h +tests/signature.h +tests/macros.h Depends-on: stdint diff --git a/modules/snprintf-tests b/modules/snprintf-tests index 4db5f4ac84..df0a316225 100644 --- a/modules/snprintf-tests +++ b/modules/snprintf-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-snprintf.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/sprintf-posix-tests b/modules/sprintf-posix-tests index 354cf738f5..f6e4ce0f56 100644 --- a/modules/sprintf-posix-tests +++ b/modules/sprintf-posix-tests @@ -1,8 +1,9 @@ Files: -tests/signature.h tests/test-sprintf-posix.c tests/test-sprintf-posix.h tests/nan.h +tests/signature.h +tests/macros.h Depends-on: stdint diff --git a/modules/stat-tests b/modules/stat-tests index 489ff64823..74d558c8db 100644 --- a/modules/stat-tests +++ b/modules/stat-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-stat.h tests/test-stat.c +tests/signature.h +tests/macros.h Depends-on: pathmax diff --git a/modules/stat-time-tests b/modules/stat-time-tests index 0c0b66a792..2e72444b29 100644 --- a/modules/stat-time-tests +++ b/modules/stat-time-tests @@ -1,5 +1,6 @@ Files: tests/test-stat-time.c +tests/macros.h Depends-on: time diff --git a/modules/strcasestr-tests b/modules/strcasestr-tests index 292c40d812..78b64cd146 100644 --- a/modules/strcasestr-tests +++ b/modules/strcasestr-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-strcasestr.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/strchrnul-tests b/modules/strchrnul-tests index 7ca1a58f24..e16518d66e 100644 --- a/modules/strchrnul-tests +++ b/modules/strchrnul-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-strchrnul.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/strerror-tests b/modules/strerror-tests index 0a6bc75cd9..14e969491d 100644 --- a/modules/strerror-tests +++ b/modules/strerror-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-strerror.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/striconv-tests b/modules/striconv-tests index 5efc9e058c..d4482f8ea1 100644 --- a/modules/striconv-tests +++ b/modules/striconv-tests @@ -1,5 +1,6 @@ Files: tests/test-striconv.c +tests/macros.h Depends-on: diff --git a/modules/striconveh-tests b/modules/striconveh-tests index 1569f2bdb7..bfb68efd70 100644 --- a/modules/striconveh-tests +++ b/modules/striconveh-tests @@ -1,5 +1,6 @@ Files: tests/test-striconveh.c +tests/macros.h Depends-on: diff --git a/modules/striconveha-tests b/modules/striconveha-tests index 1effb575d9..46ad0cf82a 100644 --- a/modules/striconveha-tests +++ b/modules/striconveha-tests @@ -1,5 +1,6 @@ Files: tests/test-striconveha.c +tests/macros.h Depends-on: diff --git a/modules/strsignal-tests b/modules/strsignal-tests index 330a8a951e..e845ba5a8e 100644 --- a/modules/strsignal-tests +++ b/modules/strsignal-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-strsignal.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/strstr-tests b/modules/strstr-tests index 231e0ebf33..4817177913 100644 --- a/modules/strstr-tests +++ b/modules/strstr-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-strstr.c tests/zerosize-ptr.h +tests/signature.h +tests/macros.h m4/mmap-anon.m4 Depends-on: diff --git a/modules/strtod-tests b/modules/strtod-tests index ad5a560dbf..8d5be7f7f7 100644 --- a/modules/strtod-tests +++ b/modules/strtod-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-strtod.c +tests/signature.h +tests/macros.h Depends-on: float diff --git a/modules/strverscmp-tests b/modules/strverscmp-tests index 89b6795b97..b34b4b0585 100644 --- a/modules/strverscmp-tests +++ b/modules/strverscmp-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-strverscmp.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/symlink-tests b/modules/symlink-tests index ef18d47fd6..3f94fd20bf 100644 --- a/modules/symlink-tests +++ b/modules/symlink-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-symlink.h tests/test-symlink.c +tests/signature.h +tests/macros.h Depends-on: stdbool diff --git a/modules/symlinkat-tests b/modules/symlinkat-tests index 4368537699..e3ee6c3d72 100644 --- a/modules/symlinkat-tests +++ b/modules/symlinkat-tests @@ -1,8 +1,9 @@ Files: -tests/signature.h tests/test-readlink.h tests/test-symlink.h tests/test-symlinkat.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/trunc-tests b/modules/trunc-tests index c3d5243e59..1f0f0de529 100644 --- a/modules/trunc-tests +++ b/modules/trunc-tests @@ -1,8 +1,9 @@ Files: -tests/signature.h tests/test-trunc1.c tests/test-trunc2.c tests/nan.h +tests/signature.h +tests/macros.h Depends-on: float diff --git a/modules/truncf-tests b/modules/truncf-tests index 70ecb1f620..175ae88c22 100644 --- a/modules/truncf-tests +++ b/modules/truncf-tests @@ -1,8 +1,9 @@ Files: -tests/signature.h tests/test-truncf1.c tests/test-truncf2.c tests/nan.h +tests/signature.h +tests/macros.h Depends-on: float diff --git a/modules/truncl-tests b/modules/truncl-tests index 3d92508fa7..82cfeb988f 100644 --- a/modules/truncl-tests +++ b/modules/truncl-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-truncl.c tests/nan.h +tests/signature.h +tests/macros.h Depends-on: fpucw diff --git a/modules/uname-tests b/modules/uname-tests index 89d256c381..daee490440 100644 --- a/modules/uname-tests +++ b/modules/uname-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-uname.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/unicase/cased-tests b/modules/unicase/cased-tests index 018a2254c5..fb8c535e1c 100644 --- a/modules/unicase/cased-tests +++ b/modules/unicase/cased-tests @@ -2,6 +2,7 @@ Files: tests/unicase/test-cased.c tests/unicase/test-predicate-part1.h tests/unicase/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unicase/ignorable-tests b/modules/unicase/ignorable-tests index 3c9135b415..ca241aaf16 100644 --- a/modules/unicase/ignorable-tests +++ b/modules/unicase/ignorable-tests @@ -2,6 +2,7 @@ Files: tests/unicase/test-ignorable.c tests/unicase/test-predicate-part1.h tests/unicase/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unicase/locale-language-tests b/modules/unicase/locale-language-tests index d4764e970f..7ea8f0e39d 100644 --- a/modules/unicase/locale-language-tests +++ b/modules/unicase/locale-language-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-locale-language.sh tests/unicase/test-locale-language.c +tests/macros.h m4/locale-fr.m4 m4/locale-ja.m4 m4/locale-tr.m4 diff --git a/modules/unicase/tolower-tests b/modules/unicase/tolower-tests index 254325ebd2..8dc87f8b57 100644 --- a/modules/unicase/tolower-tests +++ b/modules/unicase/tolower-tests @@ -2,6 +2,7 @@ Files: tests/unicase/test-uc_tolower.c tests/unicase/test-mapping-part1.h tests/unicase/test-mapping-part2.h +tests/macros.h Depends-on: diff --git a/modules/unicase/totitle-tests b/modules/unicase/totitle-tests index 40828098cc..f0856dde78 100644 --- a/modules/unicase/totitle-tests +++ b/modules/unicase/totitle-tests @@ -2,6 +2,7 @@ Files: tests/unicase/test-uc_totitle.c tests/unicase/test-mapping-part1.h tests/unicase/test-mapping-part2.h +tests/macros.h Depends-on: diff --git a/modules/unicase/toupper-tests b/modules/unicase/toupper-tests index 93adf9a988..f0c2002807 100644 --- a/modules/unicase/toupper-tests +++ b/modules/unicase/toupper-tests @@ -2,6 +2,7 @@ Files: tests/unicase/test-uc_toupper.c tests/unicase/test-mapping-part1.h tests/unicase/test-mapping-part2.h +tests/macros.h Depends-on: diff --git a/modules/unicase/u16-casecmp-tests b/modules/unicase/u16-casecmp-tests index 07b2c0edb4..f0a9845070 100644 --- a/modules/unicase/u16-casecmp-tests +++ b/modules/unicase/u16-casecmp-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u16-casecmp.c tests/unicase/test-casecmp.h +tests/macros.h Depends-on: uninorm/nfd diff --git a/modules/unicase/u16-casecoll-tests b/modules/unicase/u16-casecoll-tests index b6f1c0c436..9b643e6950 100644 --- a/modules/unicase/u16-casecoll-tests +++ b/modules/unicase/u16-casecoll-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u16-casecoll.c tests/unicase/test-casecmp.h +tests/macros.h Depends-on: uninorm/nfc diff --git a/modules/unicase/u16-casefold-tests b/modules/unicase/u16-casefold-tests index f6aa5e9f50..0c4d50c464 100644 --- a/modules/unicase/u16-casefold-tests +++ b/modules/unicase/u16-casefold-tests @@ -1,5 +1,6 @@ Files: tests/unicase/test-u16-casefold.c +tests/macros.h Depends-on: unistr/u16-cmp diff --git a/modules/unicase/u16-is-cased-tests b/modules/unicase/u16-is-cased-tests index 81f4a796ea..ebff592913 100644 --- a/modules/unicase/u16-is-cased-tests +++ b/modules/unicase/u16-is-cased-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u16-is-cased.c tests/unicase/test-is-cased.h +tests/macros.h Depends-on: diff --git a/modules/unicase/u16-is-casefolded-tests b/modules/unicase/u16-is-casefolded-tests index f9f7138f0a..6f32c37083 100644 --- a/modules/unicase/u16-is-casefolded-tests +++ b/modules/unicase/u16-is-casefolded-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u16-is-casefolded.c tests/unicase/test-is-casefolded.h +tests/macros.h Depends-on: diff --git a/modules/unicase/u16-is-lowercase-tests b/modules/unicase/u16-is-lowercase-tests index 94ef38af88..f5a0a796f0 100644 --- a/modules/unicase/u16-is-lowercase-tests +++ b/modules/unicase/u16-is-lowercase-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u16-is-lowercase.c tests/unicase/test-is-lowercase.h +tests/macros.h Depends-on: diff --git a/modules/unicase/u16-is-titlecase-tests b/modules/unicase/u16-is-titlecase-tests index ff7736e48a..701098a055 100644 --- a/modules/unicase/u16-is-titlecase-tests +++ b/modules/unicase/u16-is-titlecase-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u16-is-titlecase.c tests/unicase/test-is-titlecase.h +tests/macros.h Depends-on: diff --git a/modules/unicase/u16-is-uppercase-tests b/modules/unicase/u16-is-uppercase-tests index b97b741baa..28d3d8440e 100644 --- a/modules/unicase/u16-is-uppercase-tests +++ b/modules/unicase/u16-is-uppercase-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u16-is-uppercase.c tests/unicase/test-is-uppercase.h +tests/macros.h Depends-on: diff --git a/modules/unicase/u16-tolower-tests b/modules/unicase/u16-tolower-tests index 1e5bf1915c..d4d48106c5 100644 --- a/modules/unicase/u16-tolower-tests +++ b/modules/unicase/u16-tolower-tests @@ -1,5 +1,6 @@ Files: tests/unicase/test-u16-tolower.c +tests/macros.h Depends-on: unistr/u16-cmp diff --git a/modules/unicase/u16-totitle-tests b/modules/unicase/u16-totitle-tests index a15faaf90d..00889be61c 100644 --- a/modules/unicase/u16-totitle-tests +++ b/modules/unicase/u16-totitle-tests @@ -1,5 +1,6 @@ Files: tests/unicase/test-u16-totitle.c +tests/macros.h Depends-on: unistr/u16-cmp diff --git a/modules/unicase/u16-toupper-tests b/modules/unicase/u16-toupper-tests index a1194f5ccf..86958fe1f3 100644 --- a/modules/unicase/u16-toupper-tests +++ b/modules/unicase/u16-toupper-tests @@ -1,5 +1,6 @@ Files: tests/unicase/test-u16-toupper.c +tests/macros.h Depends-on: unistr/u16-cmp diff --git a/modules/unicase/u32-casecmp-tests b/modules/unicase/u32-casecmp-tests index 289588ad22..a62a5d11a8 100644 --- a/modules/unicase/u32-casecmp-tests +++ b/modules/unicase/u32-casecmp-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u32-casecmp.c tests/unicase/test-casecmp.h +tests/macros.h Depends-on: uninorm/nfd diff --git a/modules/unicase/u32-casecoll-tests b/modules/unicase/u32-casecoll-tests index c059b05a01..1f96a0dcb2 100644 --- a/modules/unicase/u32-casecoll-tests +++ b/modules/unicase/u32-casecoll-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u32-casecoll.c tests/unicase/test-casecmp.h +tests/macros.h Depends-on: uninorm/nfc diff --git a/modules/unicase/u32-casefold-tests b/modules/unicase/u32-casefold-tests index 767044bbe4..fb3f4e6e4a 100644 --- a/modules/unicase/u32-casefold-tests +++ b/modules/unicase/u32-casefold-tests @@ -1,5 +1,6 @@ Files: tests/unicase/test-u32-casefold.c +tests/macros.h Depends-on: unistr/u32-cmp diff --git a/modules/unicase/u32-is-cased-tests b/modules/unicase/u32-is-cased-tests index e81d647c80..48342c5565 100644 --- a/modules/unicase/u32-is-cased-tests +++ b/modules/unicase/u32-is-cased-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u32-is-cased.c tests/unicase/test-is-cased.h +tests/macros.h Depends-on: diff --git a/modules/unicase/u32-is-casefolded-tests b/modules/unicase/u32-is-casefolded-tests index 8e3434bd91..78f274755d 100644 --- a/modules/unicase/u32-is-casefolded-tests +++ b/modules/unicase/u32-is-casefolded-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u32-is-casefolded.c tests/unicase/test-is-casefolded.h +tests/macros.h Depends-on: diff --git a/modules/unicase/u32-is-lowercase-tests b/modules/unicase/u32-is-lowercase-tests index 5e458d1e0b..63765667a9 100644 --- a/modules/unicase/u32-is-lowercase-tests +++ b/modules/unicase/u32-is-lowercase-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u32-is-lowercase.c tests/unicase/test-is-lowercase.h +tests/macros.h Depends-on: diff --git a/modules/unicase/u32-is-titlecase-tests b/modules/unicase/u32-is-titlecase-tests index 1083ebd1d9..955542e3a4 100644 --- a/modules/unicase/u32-is-titlecase-tests +++ b/modules/unicase/u32-is-titlecase-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u32-is-titlecase.c tests/unicase/test-is-titlecase.h +tests/macros.h Depends-on: diff --git a/modules/unicase/u32-is-uppercase-tests b/modules/unicase/u32-is-uppercase-tests index 47b8fef3b4..a0689bcb1d 100644 --- a/modules/unicase/u32-is-uppercase-tests +++ b/modules/unicase/u32-is-uppercase-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u32-is-uppercase.c tests/unicase/test-is-uppercase.h +tests/macros.h Depends-on: diff --git a/modules/unicase/u32-tolower-tests b/modules/unicase/u32-tolower-tests index 2a286d2341..b481a09755 100644 --- a/modules/unicase/u32-tolower-tests +++ b/modules/unicase/u32-tolower-tests @@ -1,5 +1,6 @@ Files: tests/unicase/test-u32-tolower.c +tests/macros.h Depends-on: unistr/u32-cmp diff --git a/modules/unicase/u32-totitle-tests b/modules/unicase/u32-totitle-tests index 1d1f089d8b..32202e2b41 100644 --- a/modules/unicase/u32-totitle-tests +++ b/modules/unicase/u32-totitle-tests @@ -1,5 +1,6 @@ Files: tests/unicase/test-u32-totitle.c +tests/macros.h Depends-on: unistr/u32-cmp diff --git a/modules/unicase/u32-toupper-tests b/modules/unicase/u32-toupper-tests index 805018675a..177caed07d 100644 --- a/modules/unicase/u32-toupper-tests +++ b/modules/unicase/u32-toupper-tests @@ -1,5 +1,6 @@ Files: tests/unicase/test-u32-toupper.c +tests/macros.h Depends-on: unistr/u32-cmp diff --git a/modules/unicase/u8-casecmp-tests b/modules/unicase/u8-casecmp-tests index 8db4b27931..799a82ecb0 100644 --- a/modules/unicase/u8-casecmp-tests +++ b/modules/unicase/u8-casecmp-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u8-casecmp.c tests/unicase/test-casecmp.h +tests/macros.h Depends-on: uninorm/nfd diff --git a/modules/unicase/u8-casecoll-tests b/modules/unicase/u8-casecoll-tests index f87af8b4bf..c58020a5ea 100644 --- a/modules/unicase/u8-casecoll-tests +++ b/modules/unicase/u8-casecoll-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u8-casecoll.c tests/unicase/test-casecmp.h +tests/macros.h Depends-on: uninorm/nfc diff --git a/modules/unicase/u8-casefold-tests b/modules/unicase/u8-casefold-tests index 8b7654412b..db22f394e2 100644 --- a/modules/unicase/u8-casefold-tests +++ b/modules/unicase/u8-casefold-tests @@ -1,5 +1,6 @@ Files: tests/unicase/test-u8-casefold.c +tests/macros.h Depends-on: unistr/u8-cmp diff --git a/modules/unicase/u8-is-cased-tests b/modules/unicase/u8-is-cased-tests index 032c98afbb..cfc65276e4 100644 --- a/modules/unicase/u8-is-cased-tests +++ b/modules/unicase/u8-is-cased-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u8-is-cased.c tests/unicase/test-is-cased.h +tests/macros.h Depends-on: diff --git a/modules/unicase/u8-is-casefolded-tests b/modules/unicase/u8-is-casefolded-tests index e7af3f37eb..7a4b048254 100644 --- a/modules/unicase/u8-is-casefolded-tests +++ b/modules/unicase/u8-is-casefolded-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u8-is-casefolded.c tests/unicase/test-is-casefolded.h +tests/macros.h Depends-on: diff --git a/modules/unicase/u8-is-lowercase-tests b/modules/unicase/u8-is-lowercase-tests index 929e38800f..c1ef0b57a7 100644 --- a/modules/unicase/u8-is-lowercase-tests +++ b/modules/unicase/u8-is-lowercase-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u8-is-lowercase.c tests/unicase/test-is-lowercase.h +tests/macros.h Depends-on: diff --git a/modules/unicase/u8-is-titlecase-tests b/modules/unicase/u8-is-titlecase-tests index dc2c5021ee..c35c2ac146 100644 --- a/modules/unicase/u8-is-titlecase-tests +++ b/modules/unicase/u8-is-titlecase-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u8-is-titlecase.c tests/unicase/test-is-titlecase.h +tests/macros.h Depends-on: diff --git a/modules/unicase/u8-is-uppercase-tests b/modules/unicase/u8-is-uppercase-tests index 9efc93dd19..9bf0811ea0 100644 --- a/modules/unicase/u8-is-uppercase-tests +++ b/modules/unicase/u8-is-uppercase-tests @@ -1,6 +1,7 @@ Files: tests/unicase/test-u8-is-uppercase.c tests/unicase/test-is-uppercase.h +tests/macros.h Depends-on: diff --git a/modules/unicase/u8-tolower-tests b/modules/unicase/u8-tolower-tests index 3133e13a5f..f07483d3de 100644 --- a/modules/unicase/u8-tolower-tests +++ b/modules/unicase/u8-tolower-tests @@ -1,5 +1,6 @@ Files: tests/unicase/test-u8-tolower.c +tests/macros.h Depends-on: unistr/u8-cmp diff --git a/modules/unicase/u8-totitle-tests b/modules/unicase/u8-totitle-tests index 0df5825f34..bccf5a3fa7 100644 --- a/modules/unicase/u8-totitle-tests +++ b/modules/unicase/u8-totitle-tests @@ -1,5 +1,6 @@ Files: tests/unicase/test-u8-totitle.c +tests/macros.h Depends-on: unistr/u8-cmp diff --git a/modules/unicase/u8-toupper-tests b/modules/unicase/u8-toupper-tests index a6676c9a31..d6ffa17833 100644 --- a/modules/unicase/u8-toupper-tests +++ b/modules/unicase/u8-toupper-tests @@ -1,5 +1,6 @@ Files: tests/unicase/test-u8-toupper.c +tests/macros.h Depends-on: unistr/u8-cmp diff --git a/modules/unicase/ulc-casecmp-tests b/modules/unicase/ulc-casecmp-tests index c7816b4133..60dfe87af2 100644 --- a/modules/unicase/ulc-casecmp-tests +++ b/modules/unicase/ulc-casecmp-tests @@ -3,6 +3,7 @@ tests/unicase/test-ulc-casecmp1.sh tests/unicase/test-ulc-casecmp2.sh tests/unicase/test-ulc-casecmp.c tests/unicase/test-casecmp.h +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/unicase/ulc-casecoll-tests b/modules/unicase/ulc-casecoll-tests index da66cd127b..879156d5cd 100644 --- a/modules/unicase/ulc-casecoll-tests +++ b/modules/unicase/ulc-casecoll-tests @@ -3,6 +3,7 @@ tests/unicase/test-ulc-casecoll1.sh tests/unicase/test-ulc-casecoll2.sh tests/unicase/test-ulc-casecoll.c tests/unicase/test-casecmp.h +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/uniconv/u16-conv-from-enc-tests b/modules/uniconv/u16-conv-from-enc-tests index 5539ccb25f..df46e17819 100644 --- a/modules/uniconv/u16-conv-from-enc-tests +++ b/modules/uniconv/u16-conv-from-enc-tests @@ -1,5 +1,6 @@ Files: tests/uniconv/test-u16-conv-from-enc.c +tests/macros.h Depends-on: unistr/u16-cmp diff --git a/modules/uniconv/u16-conv-to-enc-tests b/modules/uniconv/u16-conv-to-enc-tests index 399537ac7d..cb0dd0137a 100644 --- a/modules/uniconv/u16-conv-to-enc-tests +++ b/modules/uniconv/u16-conv-to-enc-tests @@ -1,5 +1,6 @@ Files: tests/uniconv/test-u16-conv-to-enc.c +tests/macros.h Depends-on: diff --git a/modules/uniconv/u16-strconv-from-enc-tests b/modules/uniconv/u16-strconv-from-enc-tests index b9c162a925..67f96def7a 100644 --- a/modules/uniconv/u16-strconv-from-enc-tests +++ b/modules/uniconv/u16-strconv-from-enc-tests @@ -1,5 +1,6 @@ Files: tests/uniconv/test-u16-strconv-from-enc.c +tests/macros.h Depends-on: unistr/u16-strcmp diff --git a/modules/uniconv/u16-strconv-to-enc-tests b/modules/uniconv/u16-strconv-to-enc-tests index 0548b0159e..c1865bf6b5 100644 --- a/modules/uniconv/u16-strconv-to-enc-tests +++ b/modules/uniconv/u16-strconv-to-enc-tests @@ -1,5 +1,6 @@ Files: tests/uniconv/test-u16-strconv-to-enc.c +tests/macros.h Depends-on: unistr/u16-strcmp diff --git a/modules/uniconv/u32-conv-from-enc-tests b/modules/uniconv/u32-conv-from-enc-tests index e35a75a03b..94a3b8c0e6 100644 --- a/modules/uniconv/u32-conv-from-enc-tests +++ b/modules/uniconv/u32-conv-from-enc-tests @@ -1,5 +1,6 @@ Files: tests/uniconv/test-u32-conv-from-enc.c +tests/macros.h Depends-on: unistr/u32-cmp diff --git a/modules/uniconv/u32-conv-to-enc-tests b/modules/uniconv/u32-conv-to-enc-tests index a46e9b5c19..934d7e4984 100644 --- a/modules/uniconv/u32-conv-to-enc-tests +++ b/modules/uniconv/u32-conv-to-enc-tests @@ -1,5 +1,6 @@ Files: tests/uniconv/test-u32-conv-to-enc.c +tests/macros.h Depends-on: diff --git a/modules/uniconv/u32-strconv-from-enc-tests b/modules/uniconv/u32-strconv-from-enc-tests index 2370b5801a..a01fbf2e36 100644 --- a/modules/uniconv/u32-strconv-from-enc-tests +++ b/modules/uniconv/u32-strconv-from-enc-tests @@ -1,5 +1,6 @@ Files: tests/uniconv/test-u32-strconv-from-enc.c +tests/macros.h Depends-on: unistr/u32-strcmp diff --git a/modules/uniconv/u32-strconv-to-enc-tests b/modules/uniconv/u32-strconv-to-enc-tests index 19f5eca8f5..7188c32177 100644 --- a/modules/uniconv/u32-strconv-to-enc-tests +++ b/modules/uniconv/u32-strconv-to-enc-tests @@ -1,5 +1,6 @@ Files: tests/uniconv/test-u32-strconv-to-enc.c +tests/macros.h Depends-on: unistr/u32-strcmp diff --git a/modules/uniconv/u8-conv-from-enc-tests b/modules/uniconv/u8-conv-from-enc-tests index 4dc02cb0bf..d11cd52def 100644 --- a/modules/uniconv/u8-conv-from-enc-tests +++ b/modules/uniconv/u8-conv-from-enc-tests @@ -1,5 +1,6 @@ Files: tests/uniconv/test-u8-conv-from-enc.c +tests/macros.h Depends-on: unistr/u8-strlen diff --git a/modules/uniconv/u8-conv-to-enc-tests b/modules/uniconv/u8-conv-to-enc-tests index 00aa37f0ca..9fe4134da9 100644 --- a/modules/uniconv/u8-conv-to-enc-tests +++ b/modules/uniconv/u8-conv-to-enc-tests @@ -1,5 +1,6 @@ Files: tests/uniconv/test-u8-conv-to-enc.c +tests/macros.h Depends-on: unistr/u8-strlen diff --git a/modules/uniconv/u8-strconv-from-enc-tests b/modules/uniconv/u8-strconv-from-enc-tests index 971786e1e4..90119d591d 100644 --- a/modules/uniconv/u8-strconv-from-enc-tests +++ b/modules/uniconv/u8-strconv-from-enc-tests @@ -1,5 +1,6 @@ Files: tests/uniconv/test-u8-strconv-from-enc.c +tests/macros.h Depends-on: unistr/u8-strcmp diff --git a/modules/uniconv/u8-strconv-to-enc-tests b/modules/uniconv/u8-strconv-to-enc-tests index b5724430e2..12409eda89 100644 --- a/modules/uniconv/u8-strconv-to-enc-tests +++ b/modules/uniconv/u8-strconv-to-enc-tests @@ -1,5 +1,6 @@ Files: tests/uniconv/test-u8-strconv-to-enc.c +tests/macros.h Depends-on: unistr/u8-strcmp diff --git a/modules/unictype/bidicategory-byname-tests b/modules/unictype/bidicategory-byname-tests index f516e71256..cfb67cd49b 100644 --- a/modules/unictype/bidicategory-byname-tests +++ b/modules/unictype/bidicategory-byname-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-bidi_byname.c +tests/macros.h Depends-on: diff --git a/modules/unictype/bidicategory-name-tests b/modules/unictype/bidicategory-name-tests index f216c38a50..a34a01615d 100644 --- a/modules/unictype/bidicategory-name-tests +++ b/modules/unictype/bidicategory-name-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-bidi_name.c +tests/macros.h Depends-on: diff --git a/modules/unictype/bidicategory-of-tests b/modules/unictype/bidicategory-of-tests index b1a04bed6b..e58190342f 100644 --- a/modules/unictype/bidicategory-of-tests +++ b/modules/unictype/bidicategory-of-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-bidi_of.c +tests/macros.h Depends-on: diff --git a/modules/unictype/bidicategory-test-tests b/modules/unictype/bidicategory-test-tests index 038621fa3c..3410d6589b 100644 --- a/modules/unictype/bidicategory-test-tests +++ b/modules/unictype/bidicategory-test-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-bidi_test.c +tests/macros.h Depends-on: unictype/bidicategory-of diff --git a/modules/unictype/block-list-tests b/modules/unictype/block-list-tests index b75e7c799a..8f11c39db1 100644 --- a/modules/unictype/block-list-tests +++ b/modules/unictype/block-list-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-block_list.c +tests/macros.h Depends-on: diff --git a/modules/unictype/block-of-tests b/modules/unictype/block-of-tests index bbe2a681b4..4e71260fef 100644 --- a/modules/unictype/block-of-tests +++ b/modules/unictype/block-of-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-block_of.c +tests/macros.h Depends-on: unictype/block-list diff --git a/modules/unictype/block-test-tests b/modules/unictype/block-test-tests index 2fb5fbe318..33367f0a17 100644 --- a/modules/unictype/block-test-tests +++ b/modules/unictype/block-test-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-block_test.c +tests/macros.h Depends-on: diff --git a/modules/unictype/category-C-tests b/modules/unictype/category-C-tests index 69e5a373d7..9b4a18e0c8 100644 --- a/modules/unictype/category-C-tests +++ b/modules/unictype/category-C-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_C.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Cc-tests b/modules/unictype/category-Cc-tests index bc33c32fe3..da8c0f8fb8 100644 --- a/modules/unictype/category-Cc-tests +++ b/modules/unictype/category-Cc-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Cc.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Cf-tests b/modules/unictype/category-Cf-tests index aad039ac63..a1d8138250 100644 --- a/modules/unictype/category-Cf-tests +++ b/modules/unictype/category-Cf-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Cf.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Cn-tests b/modules/unictype/category-Cn-tests index df97a0c37e..ca0a82432b 100644 --- a/modules/unictype/category-Cn-tests +++ b/modules/unictype/category-Cn-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Cn.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Co-tests b/modules/unictype/category-Co-tests index 19a905ee67..93ef8a39da 100644 --- a/modules/unictype/category-Co-tests +++ b/modules/unictype/category-Co-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Co.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Cs-tests b/modules/unictype/category-Cs-tests index a74647291a..17c1c22b4e 100644 --- a/modules/unictype/category-Cs-tests +++ b/modules/unictype/category-Cs-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Cs.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-L-tests b/modules/unictype/category-L-tests index 2b7e4c5515..12725343a4 100644 --- a/modules/unictype/category-L-tests +++ b/modules/unictype/category-L-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_L.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Ll-tests b/modules/unictype/category-Ll-tests index 7d23af1a1d..756d26caf5 100644 --- a/modules/unictype/category-Ll-tests +++ b/modules/unictype/category-Ll-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Ll.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Lm-tests b/modules/unictype/category-Lm-tests index 8d98e687bd..362e88c988 100644 --- a/modules/unictype/category-Lm-tests +++ b/modules/unictype/category-Lm-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Lm.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Lo-tests b/modules/unictype/category-Lo-tests index 49e1678006..12b76963a6 100644 --- a/modules/unictype/category-Lo-tests +++ b/modules/unictype/category-Lo-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Lo.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Lt-tests b/modules/unictype/category-Lt-tests index bb2ff63092..c284256b28 100644 --- a/modules/unictype/category-Lt-tests +++ b/modules/unictype/category-Lt-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Lt.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Lu-tests b/modules/unictype/category-Lu-tests index b9999360cf..a8e94a6aee 100644 --- a/modules/unictype/category-Lu-tests +++ b/modules/unictype/category-Lu-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Lu.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-M-tests b/modules/unictype/category-M-tests index 85a21de324..c883a865d5 100644 --- a/modules/unictype/category-M-tests +++ b/modules/unictype/category-M-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_M.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Mc-tests b/modules/unictype/category-Mc-tests index bc3aa9ef98..dbbee20a62 100644 --- a/modules/unictype/category-Mc-tests +++ b/modules/unictype/category-Mc-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Mc.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Me-tests b/modules/unictype/category-Me-tests index 1c31ec55c2..1025c7ef6f 100644 --- a/modules/unictype/category-Me-tests +++ b/modules/unictype/category-Me-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Me.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Mn-tests b/modules/unictype/category-Mn-tests index 47168671e7..a201a8c4a7 100644 --- a/modules/unictype/category-Mn-tests +++ b/modules/unictype/category-Mn-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Mn.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-N-tests b/modules/unictype/category-N-tests index 43fc849ce7..55500032c4 100644 --- a/modules/unictype/category-N-tests +++ b/modules/unictype/category-N-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_N.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Nd-tests b/modules/unictype/category-Nd-tests index f32771c471..463ff8fa40 100644 --- a/modules/unictype/category-Nd-tests +++ b/modules/unictype/category-Nd-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Nd.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Nl-tests b/modules/unictype/category-Nl-tests index 8c42f3b932..340aa24aa5 100644 --- a/modules/unictype/category-Nl-tests +++ b/modules/unictype/category-Nl-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Nl.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-No-tests b/modules/unictype/category-No-tests index 004c323571..0aa828acbd 100644 --- a/modules/unictype/category-No-tests +++ b/modules/unictype/category-No-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_No.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-P-tests b/modules/unictype/category-P-tests index 9eae4384c9..57f591e937 100644 --- a/modules/unictype/category-P-tests +++ b/modules/unictype/category-P-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_P.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Pc-tests b/modules/unictype/category-Pc-tests index 9a8376eabd..c6e1e90937 100644 --- a/modules/unictype/category-Pc-tests +++ b/modules/unictype/category-Pc-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Pc.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Pd-tests b/modules/unictype/category-Pd-tests index 2092061012..238ae1c149 100644 --- a/modules/unictype/category-Pd-tests +++ b/modules/unictype/category-Pd-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Pd.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Pe-tests b/modules/unictype/category-Pe-tests index 182d131c7c..f9c3145808 100644 --- a/modules/unictype/category-Pe-tests +++ b/modules/unictype/category-Pe-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Pe.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Pf-tests b/modules/unictype/category-Pf-tests index 466727929c..2e1a035317 100644 --- a/modules/unictype/category-Pf-tests +++ b/modules/unictype/category-Pf-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Pf.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Pi-tests b/modules/unictype/category-Pi-tests index 272be1bf86..d210ad2966 100644 --- a/modules/unictype/category-Pi-tests +++ b/modules/unictype/category-Pi-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Pi.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Po-tests b/modules/unictype/category-Po-tests index 936afd4b30..f652bd6ba1 100644 --- a/modules/unictype/category-Po-tests +++ b/modules/unictype/category-Po-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Po.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Ps-tests b/modules/unictype/category-Ps-tests index 85bfe9a775..ce9da4976f 100644 --- a/modules/unictype/category-Ps-tests +++ b/modules/unictype/category-Ps-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Ps.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-S-tests b/modules/unictype/category-S-tests index e1a3f840a7..4eb24e2398 100644 --- a/modules/unictype/category-S-tests +++ b/modules/unictype/category-S-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_S.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Sc-tests b/modules/unictype/category-Sc-tests index 792db1b7bc..20fc989f55 100644 --- a/modules/unictype/category-Sc-tests +++ b/modules/unictype/category-Sc-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Sc.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Sk-tests b/modules/unictype/category-Sk-tests index d1ee54667f..ff30f24de1 100644 --- a/modules/unictype/category-Sk-tests +++ b/modules/unictype/category-Sk-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Sk.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Sm-tests b/modules/unictype/category-Sm-tests index db542867c8..0d75ece1c0 100644 --- a/modules/unictype/category-Sm-tests +++ b/modules/unictype/category-Sm-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Sm.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-So-tests b/modules/unictype/category-So-tests index 0492d97837..a0c28a4dc3 100644 --- a/modules/unictype/category-So-tests +++ b/modules/unictype/category-So-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_So.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Z-tests b/modules/unictype/category-Z-tests index bf8405e440..a85eed1b3a 100644 --- a/modules/unictype/category-Z-tests +++ b/modules/unictype/category-Z-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Z.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Zl-tests b/modules/unictype/category-Zl-tests index 8c46a5cdc1..75be72a6b3 100644 --- a/modules/unictype/category-Zl-tests +++ b/modules/unictype/category-Zl-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Zl.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Zp-tests b/modules/unictype/category-Zp-tests index 472d34c2c5..8b5d3b9d56 100644 --- a/modules/unictype/category-Zp-tests +++ b/modules/unictype/category-Zp-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Zp.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-Zs-tests b/modules/unictype/category-Zs-tests index c9fe89f412..a72f5e6145 100644 --- a/modules/unictype/category-Zs-tests +++ b/modules/unictype/category-Zs-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-categ_Zs.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-and-not-tests b/modules/unictype/category-and-not-tests index 41145a6eea..b2a988be50 100644 --- a/modules/unictype/category-and-not-tests +++ b/modules/unictype/category-and-not-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-categ_and_not.c +tests/macros.h Depends-on: unictype/category-or diff --git a/modules/unictype/category-and-tests b/modules/unictype/category-and-tests index 2bcdf725e3..99de11ae2a 100644 --- a/modules/unictype/category-and-tests +++ b/modules/unictype/category-and-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-categ_and.c +tests/macros.h Depends-on: unictype/category-or diff --git a/modules/unictype/category-byname-tests b/modules/unictype/category-byname-tests index fdafaee5c3..3d477952a7 100644 --- a/modules/unictype/category-byname-tests +++ b/modules/unictype/category-byname-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-categ_byname.c +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-name-tests b/modules/unictype/category-name-tests index 414797a178..bc0c82a397 100644 --- a/modules/unictype/category-name-tests +++ b/modules/unictype/category-name-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-categ_name.c +tests/macros.h Depends-on: unictype/category-or diff --git a/modules/unictype/category-none-tests b/modules/unictype/category-none-tests index a8911575a8..c78e416546 100644 --- a/modules/unictype/category-none-tests +++ b/modules/unictype/category-none-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-categ_none.c +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-of-tests b/modules/unictype/category-of-tests index 0a9a63d18f..fe1aa6b6ed 100644 --- a/modules/unictype/category-of-tests +++ b/modules/unictype/category-of-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-categ_of.c +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-or-tests b/modules/unictype/category-or-tests index b3a5f638ce..a6b740dd26 100644 --- a/modules/unictype/category-or-tests +++ b/modules/unictype/category-or-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-categ_or.c +tests/macros.h Depends-on: unictype/category-test diff --git a/modules/unictype/category-test-withtable-tests b/modules/unictype/category-test-withtable-tests index d5ff63fe2b..c74027e4fe 100644 --- a/modules/unictype/category-test-withtable-tests +++ b/modules/unictype/category-test-withtable-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-categ_test_withtable.c +tests/macros.h Depends-on: diff --git a/modules/unictype/combining-class-tests b/modules/unictype/combining-class-tests index ea4706b46d..eafbdd0991 100644 --- a/modules/unictype/combining-class-tests +++ b/modules/unictype/combining-class-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-combining.c +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-alnum-tests b/modules/unictype/ctype-alnum-tests index f90d700712..db33ed4a1c 100644 --- a/modules/unictype/ctype-alnum-tests +++ b/modules/unictype/ctype-alnum-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-ctype_alnum.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-alpha-tests b/modules/unictype/ctype-alpha-tests index 2bd16dbf40..abdfc509ca 100644 --- a/modules/unictype/ctype-alpha-tests +++ b/modules/unictype/ctype-alpha-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-ctype_alpha.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-blank-tests b/modules/unictype/ctype-blank-tests index 94a83318c0..d1daa91177 100644 --- a/modules/unictype/ctype-blank-tests +++ b/modules/unictype/ctype-blank-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-ctype_blank.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-cntrl-tests b/modules/unictype/ctype-cntrl-tests index d46076f954..4c195c4ef9 100644 --- a/modules/unictype/ctype-cntrl-tests +++ b/modules/unictype/ctype-cntrl-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-ctype_cntrl.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-digit-tests b/modules/unictype/ctype-digit-tests index e3ec97f74f..2f7833e269 100644 --- a/modules/unictype/ctype-digit-tests +++ b/modules/unictype/ctype-digit-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-ctype_digit.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-graph-tests b/modules/unictype/ctype-graph-tests index 91bcc89a0c..646a00ba1f 100644 --- a/modules/unictype/ctype-graph-tests +++ b/modules/unictype/ctype-graph-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-ctype_graph.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-lower-tests b/modules/unictype/ctype-lower-tests index 310053c2cb..707cec6295 100644 --- a/modules/unictype/ctype-lower-tests +++ b/modules/unictype/ctype-lower-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-ctype_lower.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-print-tests b/modules/unictype/ctype-print-tests index eb10d66d0e..a590a4db8d 100644 --- a/modules/unictype/ctype-print-tests +++ b/modules/unictype/ctype-print-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-ctype_print.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-punct-tests b/modules/unictype/ctype-punct-tests index 667a0b8e53..7f39283f03 100644 --- a/modules/unictype/ctype-punct-tests +++ b/modules/unictype/ctype-punct-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-ctype_punct.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-space-tests b/modules/unictype/ctype-space-tests index b721648e07..124b107e17 100644 --- a/modules/unictype/ctype-space-tests +++ b/modules/unictype/ctype-space-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-ctype_space.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-upper-tests b/modules/unictype/ctype-upper-tests index 180655c925..b32e1b6faa 100644 --- a/modules/unictype/ctype-upper-tests +++ b/modules/unictype/ctype-upper-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-ctype_upper.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/ctype-xdigit-tests b/modules/unictype/ctype-xdigit-tests index 0ba075b635..4cc5678852 100644 --- a/modules/unictype/ctype-xdigit-tests +++ b/modules/unictype/ctype-xdigit-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-ctype_xdigit.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/decimal-digit-tests b/modules/unictype/decimal-digit-tests index 8fbbf0d328..f0451d90a9 100644 --- a/modules/unictype/decimal-digit-tests +++ b/modules/unictype/decimal-digit-tests @@ -1,6 +1,7 @@ Files: tests/unictype/test-decdigit.c tests/unictype/test-decdigit.h +tests/macros.h Depends-on: diff --git a/modules/unictype/digit-tests b/modules/unictype/digit-tests index 9ee1f5195e..58b6c000af 100644 --- a/modules/unictype/digit-tests +++ b/modules/unictype/digit-tests @@ -1,6 +1,7 @@ Files: tests/unictype/test-digit.c tests/unictype/test-digit.h +tests/macros.h Depends-on: diff --git a/modules/unictype/mirror-tests b/modules/unictype/mirror-tests index 3766ace3d1..dc2ad1eed3 100644 --- a/modules/unictype/mirror-tests +++ b/modules/unictype/mirror-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-mirror.c +tests/macros.h Depends-on: diff --git a/modules/unictype/numeric-tests b/modules/unictype/numeric-tests index 291f0ae097..759ae2e9b4 100644 --- a/modules/unictype/numeric-tests +++ b/modules/unictype/numeric-tests @@ -1,6 +1,7 @@ Files: tests/unictype/test-numeric.c tests/unictype/test-numeric.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-alphabetic-tests b/modules/unictype/property-alphabetic-tests index f3e3a85231..a4a757dc07 100644 --- a/modules/unictype/property-alphabetic-tests +++ b/modules/unictype/property-alphabetic-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_alphabetic.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-ascii-hex-digit-tests b/modules/unictype/property-ascii-hex-digit-tests index f679c68695..edf2cad1ef 100644 --- a/modules/unictype/property-ascii-hex-digit-tests +++ b/modules/unictype/property-ascii-hex-digit-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_ascii_hex_digit.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-arabic-digit-tests b/modules/unictype/property-bidi-arabic-digit-tests index 2ad1d1cff8..f6fa5ec57a 100644 --- a/modules/unictype/property-bidi-arabic-digit-tests +++ b/modules/unictype/property-bidi-arabic-digit-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_bidi_arabic_digit.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-arabic-right-to-left-tests b/modules/unictype/property-bidi-arabic-right-to-left-tests index c27389ad02..2efe831984 100644 --- a/modules/unictype/property-bidi-arabic-right-to-left-tests +++ b/modules/unictype/property-bidi-arabic-right-to-left-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_bidi_arabic_right_to_left.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-block-separator-tests b/modules/unictype/property-bidi-block-separator-tests index 220db90426..3377c1769d 100644 --- a/modules/unictype/property-bidi-block-separator-tests +++ b/modules/unictype/property-bidi-block-separator-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_bidi_block_separator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-boundary-neutral-tests b/modules/unictype/property-bidi-boundary-neutral-tests index f9c5f18af0..dedc4ab687 100644 --- a/modules/unictype/property-bidi-boundary-neutral-tests +++ b/modules/unictype/property-bidi-boundary-neutral-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_bidi_boundary_neutral.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-common-separator-tests b/modules/unictype/property-bidi-common-separator-tests index d11d8dd414..6964ed6df4 100644 --- a/modules/unictype/property-bidi-common-separator-tests +++ b/modules/unictype/property-bidi-common-separator-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_bidi_common_separator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-control-tests b/modules/unictype/property-bidi-control-tests index 5c6609fc40..52a11020c4 100644 --- a/modules/unictype/property-bidi-control-tests +++ b/modules/unictype/property-bidi-control-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_bidi_control.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-embedding-or-override-tests b/modules/unictype/property-bidi-embedding-or-override-tests index eb59179d98..c64e232fb2 100644 --- a/modules/unictype/property-bidi-embedding-or-override-tests +++ b/modules/unictype/property-bidi-embedding-or-override-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_bidi_embedding_or_override.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-eur-num-separator-tests b/modules/unictype/property-bidi-eur-num-separator-tests index 9c3c76d099..3442fcf8ed 100644 --- a/modules/unictype/property-bidi-eur-num-separator-tests +++ b/modules/unictype/property-bidi-eur-num-separator-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_bidi_eur_num_separator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-eur-num-terminator-tests b/modules/unictype/property-bidi-eur-num-terminator-tests index 7289a98554..fda0c48bbb 100644 --- a/modules/unictype/property-bidi-eur-num-terminator-tests +++ b/modules/unictype/property-bidi-eur-num-terminator-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_bidi_eur_num_terminator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-european-digit-tests b/modules/unictype/property-bidi-european-digit-tests index 1461e02a89..c7196f9bf8 100644 --- a/modules/unictype/property-bidi-european-digit-tests +++ b/modules/unictype/property-bidi-european-digit-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_bidi_european_digit.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-hebrew-right-to-left-tests b/modules/unictype/property-bidi-hebrew-right-to-left-tests index 0498552ca1..3d3985a864 100644 --- a/modules/unictype/property-bidi-hebrew-right-to-left-tests +++ b/modules/unictype/property-bidi-hebrew-right-to-left-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_bidi_hebrew_right_to_left.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-left-to-right-tests b/modules/unictype/property-bidi-left-to-right-tests index fc32cd6e2a..4097553f0d 100644 --- a/modules/unictype/property-bidi-left-to-right-tests +++ b/modules/unictype/property-bidi-left-to-right-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_bidi_left_to_right.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-non-spacing-mark-tests b/modules/unictype/property-bidi-non-spacing-mark-tests index cf4bfa9385..ce4ac00b61 100644 --- a/modules/unictype/property-bidi-non-spacing-mark-tests +++ b/modules/unictype/property-bidi-non-spacing-mark-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_bidi_non_spacing_mark.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-other-neutral-tests b/modules/unictype/property-bidi-other-neutral-tests index 0d6b1d7709..4a54080486 100644 --- a/modules/unictype/property-bidi-other-neutral-tests +++ b/modules/unictype/property-bidi-other-neutral-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_bidi_other_neutral.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-pdf-tests b/modules/unictype/property-bidi-pdf-tests index df765eb660..9096a566ba 100644 --- a/modules/unictype/property-bidi-pdf-tests +++ b/modules/unictype/property-bidi-pdf-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_bidi_pdf.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-segment-separator-tests b/modules/unictype/property-bidi-segment-separator-tests index c21ef539f2..081050cb55 100644 --- a/modules/unictype/property-bidi-segment-separator-tests +++ b/modules/unictype/property-bidi-segment-separator-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_bidi_segment_separator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-bidi-whitespace-tests b/modules/unictype/property-bidi-whitespace-tests index 1077776bd0..0bcde48a92 100644 --- a/modules/unictype/property-bidi-whitespace-tests +++ b/modules/unictype/property-bidi-whitespace-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_bidi_whitespace.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-byname-tests b/modules/unictype/property-byname-tests index 9678ff8e3c..ff6a60d3ab 100644 --- a/modules/unictype/property-byname-tests +++ b/modules/unictype/property-byname-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-pr_byname.c +tests/macros.h Depends-on: unictype/property-test diff --git a/modules/unictype/property-combining-tests b/modules/unictype/property-combining-tests index e2f5930a5f..bafe54eab1 100644 --- a/modules/unictype/property-combining-tests +++ b/modules/unictype/property-combining-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_combining.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-composite-tests b/modules/unictype/property-composite-tests index b528ab1b9f..2d5652faab 100644 --- a/modules/unictype/property-composite-tests +++ b/modules/unictype/property-composite-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_composite.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-currency-symbol-tests b/modules/unictype/property-currency-symbol-tests index 8d4e2341df..034db16f14 100644 --- a/modules/unictype/property-currency-symbol-tests +++ b/modules/unictype/property-currency-symbol-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_currency_symbol.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-dash-tests b/modules/unictype/property-dash-tests index 06a403e1f0..9ca620f80b 100644 --- a/modules/unictype/property-dash-tests +++ b/modules/unictype/property-dash-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_dash.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-decimal-digit-tests b/modules/unictype/property-decimal-digit-tests index 536e547428..9dc5dabbf0 100644 --- a/modules/unictype/property-decimal-digit-tests +++ b/modules/unictype/property-decimal-digit-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_decimal_digit.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-default-ignorable-code-point-tests b/modules/unictype/property-default-ignorable-code-point-tests index 881108d94d..f8992b6947 100644 --- a/modules/unictype/property-default-ignorable-code-point-tests +++ b/modules/unictype/property-default-ignorable-code-point-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_default_ignorable_code_point.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-deprecated-tests b/modules/unictype/property-deprecated-tests index 891fe65a8c..40fc7ed876 100644 --- a/modules/unictype/property-deprecated-tests +++ b/modules/unictype/property-deprecated-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_deprecated.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-diacritic-tests b/modules/unictype/property-diacritic-tests index 63e65c03c3..f1e77ca642 100644 --- a/modules/unictype/property-diacritic-tests +++ b/modules/unictype/property-diacritic-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_diacritic.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-extender-tests b/modules/unictype/property-extender-tests index 2737dcdb53..9e1d6fac82 100644 --- a/modules/unictype/property-extender-tests +++ b/modules/unictype/property-extender-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_extender.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-format-control-tests b/modules/unictype/property-format-control-tests index b1c55dfad4..bfda08e864 100644 --- a/modules/unictype/property-format-control-tests +++ b/modules/unictype/property-format-control-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_format_control.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-grapheme-base-tests b/modules/unictype/property-grapheme-base-tests index 5dca86e8c6..b534c39371 100644 --- a/modules/unictype/property-grapheme-base-tests +++ b/modules/unictype/property-grapheme-base-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_grapheme_base.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-grapheme-extend-tests b/modules/unictype/property-grapheme-extend-tests index a13e6cfb40..b5bc724465 100644 --- a/modules/unictype/property-grapheme-extend-tests +++ b/modules/unictype/property-grapheme-extend-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_grapheme_extend.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-grapheme-link-tests b/modules/unictype/property-grapheme-link-tests index 5a65dc174d..5168325ffe 100644 --- a/modules/unictype/property-grapheme-link-tests +++ b/modules/unictype/property-grapheme-link-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_grapheme_link.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-hex-digit-tests b/modules/unictype/property-hex-digit-tests index 67d9f09fa7..043b0cda9c 100644 --- a/modules/unictype/property-hex-digit-tests +++ b/modules/unictype/property-hex-digit-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_hex_digit.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-hyphen-tests b/modules/unictype/property-hyphen-tests index a3be868ad7..b4a4e7e9e3 100644 --- a/modules/unictype/property-hyphen-tests +++ b/modules/unictype/property-hyphen-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_hyphen.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-id-continue-tests b/modules/unictype/property-id-continue-tests index 09f6593b72..33362eda14 100644 --- a/modules/unictype/property-id-continue-tests +++ b/modules/unictype/property-id-continue-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_id_continue.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-id-start-tests b/modules/unictype/property-id-start-tests index 4ad9c53737..d0e82569e1 100644 --- a/modules/unictype/property-id-start-tests +++ b/modules/unictype/property-id-start-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_id_start.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-ideographic-tests b/modules/unictype/property-ideographic-tests index 691e5fdba2..1b6a725696 100644 --- a/modules/unictype/property-ideographic-tests +++ b/modules/unictype/property-ideographic-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_ideographic.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-ids-binary-operator-tests b/modules/unictype/property-ids-binary-operator-tests index 00c4d1b9f9..195c854fbe 100644 --- a/modules/unictype/property-ids-binary-operator-tests +++ b/modules/unictype/property-ids-binary-operator-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_ids_binary_operator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-ids-trinary-operator-tests b/modules/unictype/property-ids-trinary-operator-tests index 31fb90256f..e9e448ee22 100644 --- a/modules/unictype/property-ids-trinary-operator-tests +++ b/modules/unictype/property-ids-trinary-operator-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_ids_trinary_operator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-ignorable-control-tests b/modules/unictype/property-ignorable-control-tests index 1dedc29668..1e72a68ac2 100644 --- a/modules/unictype/property-ignorable-control-tests +++ b/modules/unictype/property-ignorable-control-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_ignorable_control.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-iso-control-tests b/modules/unictype/property-iso-control-tests index 57742da98c..8923607c4e 100644 --- a/modules/unictype/property-iso-control-tests +++ b/modules/unictype/property-iso-control-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_iso_control.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-join-control-tests b/modules/unictype/property-join-control-tests index eefebd1f14..17deabb74e 100644 --- a/modules/unictype/property-join-control-tests +++ b/modules/unictype/property-join-control-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_join_control.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-left-of-pair-tests b/modules/unictype/property-left-of-pair-tests index 764622f17c..ea9bd6e517 100644 --- a/modules/unictype/property-left-of-pair-tests +++ b/modules/unictype/property-left-of-pair-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_left_of_pair.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-line-separator-tests b/modules/unictype/property-line-separator-tests index 31a25d9ce9..15a519de25 100644 --- a/modules/unictype/property-line-separator-tests +++ b/modules/unictype/property-line-separator-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_line_separator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-logical-order-exception-tests b/modules/unictype/property-logical-order-exception-tests index 5935e83617..4441183293 100644 --- a/modules/unictype/property-logical-order-exception-tests +++ b/modules/unictype/property-logical-order-exception-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_logical_order_exception.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-lowercase-tests b/modules/unictype/property-lowercase-tests index 8f3ec2ff7b..302110a333 100644 --- a/modules/unictype/property-lowercase-tests +++ b/modules/unictype/property-lowercase-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_lowercase.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-math-tests b/modules/unictype/property-math-tests index cb80e54d4a..04010a081d 100644 --- a/modules/unictype/property-math-tests +++ b/modules/unictype/property-math-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_math.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-non-break-tests b/modules/unictype/property-non-break-tests index 61941fca17..0ba6b8f74b 100644 --- a/modules/unictype/property-non-break-tests +++ b/modules/unictype/property-non-break-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_non_break.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-not-a-character-tests b/modules/unictype/property-not-a-character-tests index c46d00367d..5c96ba5fc9 100644 --- a/modules/unictype/property-not-a-character-tests +++ b/modules/unictype/property-not-a-character-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_not_a_character.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-numeric-tests b/modules/unictype/property-numeric-tests index c07a0d7153..ac4c4b88dc 100644 --- a/modules/unictype/property-numeric-tests +++ b/modules/unictype/property-numeric-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_numeric.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-other-alphabetic-tests b/modules/unictype/property-other-alphabetic-tests index 107e0ac243..1c5a83c39a 100644 --- a/modules/unictype/property-other-alphabetic-tests +++ b/modules/unictype/property-other-alphabetic-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_other_alphabetic.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-other-default-ignorable-code-point-tests b/modules/unictype/property-other-default-ignorable-code-point-tests index 55afbdf65f..213aea77d2 100644 --- a/modules/unictype/property-other-default-ignorable-code-point-tests +++ b/modules/unictype/property-other-default-ignorable-code-point-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_other_default_ignorable_code_point.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-other-grapheme-extend-tests b/modules/unictype/property-other-grapheme-extend-tests index 57dd4e0543..7a5fce5d90 100644 --- a/modules/unictype/property-other-grapheme-extend-tests +++ b/modules/unictype/property-other-grapheme-extend-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_other_grapheme_extend.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-other-id-continue-tests b/modules/unictype/property-other-id-continue-tests index 7ec421e189..f40de9ee36 100644 --- a/modules/unictype/property-other-id-continue-tests +++ b/modules/unictype/property-other-id-continue-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_other_id_continue.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-other-id-start-tests b/modules/unictype/property-other-id-start-tests index 4a121bd49e..cf1b2e4106 100644 --- a/modules/unictype/property-other-id-start-tests +++ b/modules/unictype/property-other-id-start-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_other_id_start.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-other-lowercase-tests b/modules/unictype/property-other-lowercase-tests index 01bcf11a18..ba13d39a27 100644 --- a/modules/unictype/property-other-lowercase-tests +++ b/modules/unictype/property-other-lowercase-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_other_lowercase.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-other-math-tests b/modules/unictype/property-other-math-tests index c9d415b250..1cbcc5a003 100644 --- a/modules/unictype/property-other-math-tests +++ b/modules/unictype/property-other-math-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_other_math.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-other-uppercase-tests b/modules/unictype/property-other-uppercase-tests index de9e32e116..d8c60317b7 100644 --- a/modules/unictype/property-other-uppercase-tests +++ b/modules/unictype/property-other-uppercase-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_other_uppercase.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-paired-punctuation-tests b/modules/unictype/property-paired-punctuation-tests index 6c4ac4f777..941190da46 100644 --- a/modules/unictype/property-paired-punctuation-tests +++ b/modules/unictype/property-paired-punctuation-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_paired_punctuation.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-paragraph-separator-tests b/modules/unictype/property-paragraph-separator-tests index ca2e578bd0..8146851307 100644 --- a/modules/unictype/property-paragraph-separator-tests +++ b/modules/unictype/property-paragraph-separator-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_paragraph_separator.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-pattern-syntax-tests b/modules/unictype/property-pattern-syntax-tests index df25dd2339..43fb342b3b 100644 --- a/modules/unictype/property-pattern-syntax-tests +++ b/modules/unictype/property-pattern-syntax-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_pattern_syntax.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-pattern-white-space-tests b/modules/unictype/property-pattern-white-space-tests index 8f200320b6..6edae420ec 100644 --- a/modules/unictype/property-pattern-white-space-tests +++ b/modules/unictype/property-pattern-white-space-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_pattern_white_space.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-private-use-tests b/modules/unictype/property-private-use-tests index 1d6e0a72e9..f9b4d24b48 100644 --- a/modules/unictype/property-private-use-tests +++ b/modules/unictype/property-private-use-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_private_use.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-punctuation-tests b/modules/unictype/property-punctuation-tests index a988dad953..afee3258b7 100644 --- a/modules/unictype/property-punctuation-tests +++ b/modules/unictype/property-punctuation-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_punctuation.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-quotation-mark-tests b/modules/unictype/property-quotation-mark-tests index 5de67499a1..21862e9675 100644 --- a/modules/unictype/property-quotation-mark-tests +++ b/modules/unictype/property-quotation-mark-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_quotation_mark.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-radical-tests b/modules/unictype/property-radical-tests index 38bf0952cd..ffa8d615e3 100644 --- a/modules/unictype/property-radical-tests +++ b/modules/unictype/property-radical-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_radical.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-sentence-terminal-tests b/modules/unictype/property-sentence-terminal-tests index 5536f3574d..6ae3e90b66 100644 --- a/modules/unictype/property-sentence-terminal-tests +++ b/modules/unictype/property-sentence-terminal-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_sentence_terminal.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-soft-dotted-tests b/modules/unictype/property-soft-dotted-tests index e5e04d7405..6b9c6e5593 100644 --- a/modules/unictype/property-soft-dotted-tests +++ b/modules/unictype/property-soft-dotted-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_soft_dotted.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-space-tests b/modules/unictype/property-space-tests index c39c8343b1..9ad1edd7e9 100644 --- a/modules/unictype/property-space-tests +++ b/modules/unictype/property-space-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_space.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-terminal-punctuation-tests b/modules/unictype/property-terminal-punctuation-tests index 56e96b5d93..4c36eddcbc 100644 --- a/modules/unictype/property-terminal-punctuation-tests +++ b/modules/unictype/property-terminal-punctuation-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_terminal_punctuation.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-test-tests b/modules/unictype/property-test-tests index d2dfb0e2b0..34597a830f 100644 --- a/modules/unictype/property-test-tests +++ b/modules/unictype/property-test-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-pr_test.c +tests/macros.h Depends-on: unictype/property-composite diff --git a/modules/unictype/property-titlecase-tests b/modules/unictype/property-titlecase-tests index c4249fedfe..16cbecfb12 100644 --- a/modules/unictype/property-titlecase-tests +++ b/modules/unictype/property-titlecase-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_titlecase.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-unassigned-code-value-tests b/modules/unictype/property-unassigned-code-value-tests index 42554f7b32..1d92aee75d 100644 --- a/modules/unictype/property-unassigned-code-value-tests +++ b/modules/unictype/property-unassigned-code-value-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_unassigned_code_value.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-unified-ideograph-tests b/modules/unictype/property-unified-ideograph-tests index 221dff811b..b6ef03410c 100644 --- a/modules/unictype/property-unified-ideograph-tests +++ b/modules/unictype/property-unified-ideograph-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_unified_ideograph.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-uppercase-tests b/modules/unictype/property-uppercase-tests index 755da864dc..e0e8a4479e 100644 --- a/modules/unictype/property-uppercase-tests +++ b/modules/unictype/property-uppercase-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_uppercase.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-variation-selector-tests b/modules/unictype/property-variation-selector-tests index 65fb9173bc..8150e1797f 100644 --- a/modules/unictype/property-variation-selector-tests +++ b/modules/unictype/property-variation-selector-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_variation_selector.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-white-space-tests b/modules/unictype/property-white-space-tests index 24fc272ef3..64cf093036 100644 --- a/modules/unictype/property-white-space-tests +++ b/modules/unictype/property-white-space-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_white_space.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-xid-continue-tests b/modules/unictype/property-xid-continue-tests index be749e7e72..ee71a023c5 100644 --- a/modules/unictype/property-xid-continue-tests +++ b/modules/unictype/property-xid-continue-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_xid_continue.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-xid-start-tests b/modules/unictype/property-xid-start-tests index ce09a17f5b..a1a2a09781 100644 --- a/modules/unictype/property-xid-start-tests +++ b/modules/unictype/property-xid-start-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_xid_start.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/property-zero-width-tests b/modules/unictype/property-zero-width-tests index f5b72d13b6..20163ddf1b 100644 --- a/modules/unictype/property-zero-width-tests +++ b/modules/unictype/property-zero-width-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-pr_zero_width.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/scripts-tests b/modules/unictype/scripts-tests index 54a6e1a3c5..cd6a6eb564 100644 --- a/modules/unictype/scripts-tests +++ b/modules/unictype/scripts-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-scripts.c +tests/macros.h Depends-on: diff --git a/modules/unictype/syntax-c-ident-tests b/modules/unictype/syntax-c-ident-tests index 6e0b700ae7..5bd69aa7c5 100644 --- a/modules/unictype/syntax-c-ident-tests +++ b/modules/unictype/syntax-c-ident-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-sy_c_ident.c +tests/macros.h Depends-on: diff --git a/modules/unictype/syntax-c-whitespace-tests b/modules/unictype/syntax-c-whitespace-tests index d1770b790f..b19dd64bfc 100644 --- a/modules/unictype/syntax-c-whitespace-tests +++ b/modules/unictype/syntax-c-whitespace-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-sy_c_whitespace.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unictype/syntax-java-ident-tests b/modules/unictype/syntax-java-ident-tests index 2c6dc12ac8..2753d637fc 100644 --- a/modules/unictype/syntax-java-ident-tests +++ b/modules/unictype/syntax-java-ident-tests @@ -1,5 +1,6 @@ Files: tests/unictype/test-sy_java_ident.c +tests/macros.h Depends-on: diff --git a/modules/unictype/syntax-java-whitespace-tests b/modules/unictype/syntax-java-whitespace-tests index bb9f57c02c..6fcd4a1580 100644 --- a/modules/unictype/syntax-java-whitespace-tests +++ b/modules/unictype/syntax-java-whitespace-tests @@ -2,6 +2,7 @@ Files: tests/unictype/test-sy_java_whitespace.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h +tests/macros.h Depends-on: diff --git a/modules/unilbrk/u16-possible-linebreaks-tests b/modules/unilbrk/u16-possible-linebreaks-tests index 8dc73481e1..0ccca8c01a 100644 --- a/modules/unilbrk/u16-possible-linebreaks-tests +++ b/modules/unilbrk/u16-possible-linebreaks-tests @@ -1,5 +1,6 @@ Files: tests/unilbrk/test-u16-possible-linebreaks.c +tests/macros.h Depends-on: diff --git a/modules/unilbrk/u16-width-linebreaks-tests b/modules/unilbrk/u16-width-linebreaks-tests index cdc2fbe14d..1f2eb540ee 100644 --- a/modules/unilbrk/u16-width-linebreaks-tests +++ b/modules/unilbrk/u16-width-linebreaks-tests @@ -1,5 +1,6 @@ Files: tests/unilbrk/test-u16-width-linebreaks.c +tests/macros.h Depends-on: diff --git a/modules/unilbrk/u32-possible-linebreaks-tests b/modules/unilbrk/u32-possible-linebreaks-tests index 487a9a20dd..12ff96e976 100644 --- a/modules/unilbrk/u32-possible-linebreaks-tests +++ b/modules/unilbrk/u32-possible-linebreaks-tests @@ -1,5 +1,6 @@ Files: tests/unilbrk/test-u32-possible-linebreaks.c +tests/macros.h Depends-on: diff --git a/modules/unilbrk/u32-width-linebreaks-tests b/modules/unilbrk/u32-width-linebreaks-tests index 27644fdc6d..e6daa5a972 100644 --- a/modules/unilbrk/u32-width-linebreaks-tests +++ b/modules/unilbrk/u32-width-linebreaks-tests @@ -1,5 +1,6 @@ Files: tests/unilbrk/test-u32-width-linebreaks.c +tests/macros.h Depends-on: diff --git a/modules/unilbrk/u8-possible-linebreaks-tests b/modules/unilbrk/u8-possible-linebreaks-tests index 9b9dcd3e0b..3b1ac382c0 100644 --- a/modules/unilbrk/u8-possible-linebreaks-tests +++ b/modules/unilbrk/u8-possible-linebreaks-tests @@ -1,5 +1,6 @@ Files: tests/unilbrk/test-u8-possible-linebreaks.c +tests/macros.h Depends-on: diff --git a/modules/unilbrk/u8-width-linebreaks-tests b/modules/unilbrk/u8-width-linebreaks-tests index 8608f1e7e9..00fe85fef6 100644 --- a/modules/unilbrk/u8-width-linebreaks-tests +++ b/modules/unilbrk/u8-width-linebreaks-tests @@ -1,5 +1,6 @@ Files: tests/unilbrk/test-u8-width-linebreaks.c +tests/macros.h Depends-on: diff --git a/modules/unilbrk/ulc-possible-linebreaks-tests b/modules/unilbrk/ulc-possible-linebreaks-tests index f631d15f48..33c1e04144 100644 --- a/modules/unilbrk/ulc-possible-linebreaks-tests +++ b/modules/unilbrk/ulc-possible-linebreaks-tests @@ -1,5 +1,6 @@ Files: tests/unilbrk/test-ulc-possible-linebreaks.c +tests/macros.h Depends-on: diff --git a/modules/unilbrk/ulc-width-linebreaks-tests b/modules/unilbrk/ulc-width-linebreaks-tests index c068eb5f5b..7c05b5ab5c 100644 --- a/modules/unilbrk/ulc-width-linebreaks-tests +++ b/modules/unilbrk/ulc-width-linebreaks-tests @@ -1,5 +1,6 @@ Files: tests/unilbrk/test-ulc-width-linebreaks.c +tests/macros.h Depends-on: diff --git a/modules/uninorm/canonical-decomposition-tests b/modules/uninorm/canonical-decomposition-tests index 5ec587e21c..189a46d4a1 100644 --- a/modules/uninorm/canonical-decomposition-tests +++ b/modules/uninorm/canonical-decomposition-tests @@ -1,5 +1,6 @@ Files: tests/uninorm/test-canonical-decomposition.c +tests/macros.h Depends-on: diff --git a/modules/uninorm/compat-decomposition-tests b/modules/uninorm/compat-decomposition-tests index a13beba80b..75cff7feb3 100644 --- a/modules/uninorm/compat-decomposition-tests +++ b/modules/uninorm/compat-decomposition-tests @@ -1,5 +1,6 @@ Files: tests/uninorm/test-compat-decomposition.c +tests/macros.h Depends-on: diff --git a/modules/uninorm/composition-tests b/modules/uninorm/composition-tests index 1493498cb1..d8d87dfef5 100644 --- a/modules/uninorm/composition-tests +++ b/modules/uninorm/composition-tests @@ -1,5 +1,6 @@ Files: tests/uninorm/test-composition.c +tests/macros.h Depends-on: diff --git a/modules/uninorm/decomposing-form-tests b/modules/uninorm/decomposing-form-tests index 5c8536d5fd..f3113cb463 100644 --- a/modules/uninorm/decomposing-form-tests +++ b/modules/uninorm/decomposing-form-tests @@ -1,5 +1,6 @@ Files: tests/uninorm/test-decomposing-form.c +tests/macros.h Depends-on: uninorm/nfc diff --git a/modules/uninorm/decomposition-tests b/modules/uninorm/decomposition-tests index 69103dbcca..ce70d17533 100644 --- a/modules/uninorm/decomposition-tests +++ b/modules/uninorm/decomposition-tests @@ -1,5 +1,6 @@ Files: tests/uninorm/test-decomposition.c +tests/macros.h Depends-on: diff --git a/modules/uninorm/filter-tests b/modules/uninorm/filter-tests index a857015352..ae95a72f50 100644 --- a/modules/uninorm/filter-tests +++ b/modules/uninorm/filter-tests @@ -1,5 +1,6 @@ Files: tests/uninorm/test-uninorm-filter-nfc.c +tests/macros.h Depends-on: unistr/u32-cmp diff --git a/modules/uninorm/nfc-tests b/modules/uninorm/nfc-tests index 4eec831f29..0c6b187afa 100644 --- a/modules/uninorm/nfc-tests +++ b/modules/uninorm/nfc-tests @@ -8,6 +8,7 @@ tests/uninorm/test-u32-nfc-big.c tests/uninorm/test-u32-normalize-big.h tests/uninorm/test-u32-normalize-big.c tests/uninorm/NormalizationTest.txt +tests/macros.h Depends-on: unistr/u8-cmp diff --git a/modules/uninorm/nfd-tests b/modules/uninorm/nfd-tests index a30c61a70f..0ec240560b 100644 --- a/modules/uninorm/nfd-tests +++ b/modules/uninorm/nfd-tests @@ -8,6 +8,7 @@ tests/uninorm/test-u32-nfd-big.c tests/uninorm/test-u32-normalize-big.h tests/uninorm/test-u32-normalize-big.c tests/uninorm/NormalizationTest.txt +tests/macros.h Depends-on: unistr/u8-cmp diff --git a/modules/uninorm/nfkc-tests b/modules/uninorm/nfkc-tests index a7e4bde75b..12f3a43dad 100644 --- a/modules/uninorm/nfkc-tests +++ b/modules/uninorm/nfkc-tests @@ -8,6 +8,7 @@ tests/uninorm/test-u32-nfkc-big.c tests/uninorm/test-u32-normalize-big.h tests/uninorm/test-u32-normalize-big.c tests/uninorm/NormalizationTest.txt +tests/macros.h Depends-on: unistr/u8-cmp diff --git a/modules/uninorm/nfkd-tests b/modules/uninorm/nfkd-tests index 7e3173dad7..9b5ec6e354 100644 --- a/modules/uninorm/nfkd-tests +++ b/modules/uninorm/nfkd-tests @@ -8,6 +8,7 @@ tests/uninorm/test-u32-nfkd-big.c tests/uninorm/test-u32-normalize-big.h tests/uninorm/test-u32-normalize-big.c tests/uninorm/NormalizationTest.txt +tests/macros.h Depends-on: unistr/u8-cmp diff --git a/modules/uninorm/u16-normcmp-tests b/modules/uninorm/u16-normcmp-tests index 6d95ed75e5..217e6f08f5 100644 --- a/modules/uninorm/u16-normcmp-tests +++ b/modules/uninorm/u16-normcmp-tests @@ -1,6 +1,7 @@ Files: tests/uninorm/test-u16-normcmp.c tests/uninorm/test-u16-normcmp.h +tests/macros.h Depends-on: uninorm/nfd diff --git a/modules/uninorm/u16-normcoll-tests b/modules/uninorm/u16-normcoll-tests index 43f8ad997c..bb29553446 100644 --- a/modules/uninorm/u16-normcoll-tests +++ b/modules/uninorm/u16-normcoll-tests @@ -1,6 +1,7 @@ Files: tests/uninorm/test-u16-normcoll.c tests/uninorm/test-u16-normcmp.h +tests/macros.h Depends-on: uninorm/nfc diff --git a/modules/uninorm/u32-normcmp-tests b/modules/uninorm/u32-normcmp-tests index 1f7c8244b4..887ccb2e70 100644 --- a/modules/uninorm/u32-normcmp-tests +++ b/modules/uninorm/u32-normcmp-tests @@ -1,6 +1,7 @@ Files: tests/uninorm/test-u32-normcmp.c tests/uninorm/test-u32-normcmp.h +tests/macros.h Depends-on: uninorm/nfd diff --git a/modules/uninorm/u32-normcoll-tests b/modules/uninorm/u32-normcoll-tests index 029fe873a6..41ce656db5 100644 --- a/modules/uninorm/u32-normcoll-tests +++ b/modules/uninorm/u32-normcoll-tests @@ -1,6 +1,7 @@ Files: tests/uninorm/test-u32-normcoll.c tests/uninorm/test-u32-normcmp.h +tests/macros.h Depends-on: uninorm/nfc diff --git a/modules/uninorm/u8-normcmp-tests b/modules/uninorm/u8-normcmp-tests index eb83bcb2f2..b1abc02baf 100644 --- a/modules/uninorm/u8-normcmp-tests +++ b/modules/uninorm/u8-normcmp-tests @@ -1,6 +1,7 @@ Files: tests/uninorm/test-u8-normcmp.c tests/uninorm/test-u8-normcmp.h +tests/macros.h Depends-on: uninorm/nfd diff --git a/modules/uninorm/u8-normcoll-tests b/modules/uninorm/u8-normcoll-tests index 31e33a42d2..54995f0e6d 100644 --- a/modules/uninorm/u8-normcoll-tests +++ b/modules/uninorm/u8-normcoll-tests @@ -1,6 +1,7 @@ Files: tests/uninorm/test-u8-normcoll.c tests/uninorm/test-u8-normcmp.h +tests/macros.h Depends-on: uninorm/nfc diff --git a/modules/unistdio/u16-asnprintf-tests b/modules/unistdio/u16-asnprintf-tests index e0d0ae47f4..9023b33c71 100644 --- a/modules/unistdio/u16-asnprintf-tests +++ b/modules/unistdio/u16-asnprintf-tests @@ -2,6 +2,7 @@ Files: tests/unistdio/test-u16-asnprintf1.c tests/unistdio/test-u16-asnprintf1.h tests/unistdio/test-u16-printf1.h +tests/macros.h Depends-on: diff --git a/modules/unistdio/u16-vasnprintf-tests b/modules/unistdio/u16-vasnprintf-tests index 82f14ba167..81a563b3f0 100644 --- a/modules/unistdio/u16-vasnprintf-tests +++ b/modules/unistdio/u16-vasnprintf-tests @@ -6,6 +6,7 @@ tests/unistdio/test-u16-vasnprintf2.sh tests/unistdio/test-u16-vasnprintf2.c tests/unistdio/test-u16-vasnprintf3.sh tests/unistdio/test-u16-vasnprintf3.c +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/unistdio/u16-vasprintf-tests b/modules/unistdio/u16-vasprintf-tests index f50bb4f199..b4163a4d48 100644 --- a/modules/unistdio/u16-vasprintf-tests +++ b/modules/unistdio/u16-vasprintf-tests @@ -1,6 +1,7 @@ Files: tests/unistdio/test-u16-vasprintf1.c tests/unistdio/test-u16-printf1.h +tests/macros.h Depends-on: diff --git a/modules/unistdio/u16-vsnprintf-tests b/modules/unistdio/u16-vsnprintf-tests index 815c852533..0a4c70a931 100644 --- a/modules/unistdio/u16-vsnprintf-tests +++ b/modules/unistdio/u16-vsnprintf-tests @@ -1,6 +1,7 @@ Files: tests/unistdio/test-u16-vsnprintf1.c tests/unistdio/test-u16-printf1.h +tests/macros.h Depends-on: xalloc diff --git a/modules/unistdio/u16-vsprintf-tests b/modules/unistdio/u16-vsprintf-tests index 2a0f98a8fb..715249dbae 100644 --- a/modules/unistdio/u16-vsprintf-tests +++ b/modules/unistdio/u16-vsprintf-tests @@ -1,6 +1,7 @@ Files: tests/unistdio/test-u16-vsprintf1.c tests/unistdio/test-u16-printf1.h +tests/macros.h Depends-on: xalloc diff --git a/modules/unistdio/u32-asnprintf-tests b/modules/unistdio/u32-asnprintf-tests index f827976848..8a285f3065 100644 --- a/modules/unistdio/u32-asnprintf-tests +++ b/modules/unistdio/u32-asnprintf-tests @@ -2,6 +2,7 @@ Files: tests/unistdio/test-u32-asnprintf1.c tests/unistdio/test-u32-asnprintf1.h tests/unistdio/test-u32-printf1.h +tests/macros.h Depends-on: diff --git a/modules/unistdio/u32-vasnprintf-tests b/modules/unistdio/u32-vasnprintf-tests index 29a8893484..ae0bf1a0db 100644 --- a/modules/unistdio/u32-vasnprintf-tests +++ b/modules/unistdio/u32-vasnprintf-tests @@ -6,6 +6,7 @@ tests/unistdio/test-u32-vasnprintf2.sh tests/unistdio/test-u32-vasnprintf2.c tests/unistdio/test-u32-vasnprintf3.sh tests/unistdio/test-u32-vasnprintf3.c +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/unistdio/u32-vasprintf-tests b/modules/unistdio/u32-vasprintf-tests index 6d85b0f1ff..e7b4c02f39 100644 --- a/modules/unistdio/u32-vasprintf-tests +++ b/modules/unistdio/u32-vasprintf-tests @@ -1,6 +1,7 @@ Files: tests/unistdio/test-u32-vasprintf1.c tests/unistdio/test-u32-printf1.h +tests/macros.h Depends-on: diff --git a/modules/unistdio/u32-vsnprintf-tests b/modules/unistdio/u32-vsnprintf-tests index 0692e9685f..65fd947756 100644 --- a/modules/unistdio/u32-vsnprintf-tests +++ b/modules/unistdio/u32-vsnprintf-tests @@ -1,6 +1,7 @@ Files: tests/unistdio/test-u32-vsnprintf1.c tests/unistdio/test-u32-printf1.h +tests/macros.h Depends-on: xalloc diff --git a/modules/unistdio/u32-vsprintf-tests b/modules/unistdio/u32-vsprintf-tests index b7dd115ced..04c515cb70 100644 --- a/modules/unistdio/u32-vsprintf-tests +++ b/modules/unistdio/u32-vsprintf-tests @@ -1,6 +1,7 @@ Files: tests/unistdio/test-u32-vsprintf1.c tests/unistdio/test-u32-printf1.h +tests/macros.h Depends-on: xalloc diff --git a/modules/unistdio/u8-asnprintf-tests b/modules/unistdio/u8-asnprintf-tests index 10afe9dde2..2e6ed15084 100644 --- a/modules/unistdio/u8-asnprintf-tests +++ b/modules/unistdio/u8-asnprintf-tests @@ -2,6 +2,7 @@ Files: tests/unistdio/test-u8-asnprintf1.c tests/unistdio/test-u8-asnprintf1.h tests/unistdio/test-u8-printf1.h +tests/macros.h Depends-on: diff --git a/modules/unistdio/u8-vasnprintf-tests b/modules/unistdio/u8-vasnprintf-tests index 15251f7f28..221b942ccd 100644 --- a/modules/unistdio/u8-vasnprintf-tests +++ b/modules/unistdio/u8-vasnprintf-tests @@ -6,6 +6,7 @@ tests/unistdio/test-u8-vasnprintf2.sh tests/unistdio/test-u8-vasnprintf2.c tests/unistdio/test-u8-vasnprintf3.sh tests/unistdio/test-u8-vasnprintf3.c +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/unistdio/u8-vasprintf-tests b/modules/unistdio/u8-vasprintf-tests index a9490b4a41..ec85b60e0d 100644 --- a/modules/unistdio/u8-vasprintf-tests +++ b/modules/unistdio/u8-vasprintf-tests @@ -1,6 +1,7 @@ Files: tests/unistdio/test-u8-vasprintf1.c tests/unistdio/test-u8-printf1.h +tests/macros.h Depends-on: diff --git a/modules/unistdio/u8-vsnprintf-tests b/modules/unistdio/u8-vsnprintf-tests index 55f61fce92..7f12e45b0a 100644 --- a/modules/unistdio/u8-vsnprintf-tests +++ b/modules/unistdio/u8-vsnprintf-tests @@ -1,6 +1,7 @@ Files: tests/unistdio/test-u8-vsnprintf1.c tests/unistdio/test-u8-printf1.h +tests/macros.h Depends-on: xalloc diff --git a/modules/unistdio/u8-vsprintf-tests b/modules/unistdio/u8-vsprintf-tests index 4b262cef49..b20e7040a8 100644 --- a/modules/unistdio/u8-vsprintf-tests +++ b/modules/unistdio/u8-vsprintf-tests @@ -1,6 +1,7 @@ Files: tests/unistdio/test-u8-vsprintf1.c tests/unistdio/test-u8-printf1.h +tests/macros.h Depends-on: xalloc diff --git a/modules/unistdio/ulc-asnprintf-tests b/modules/unistdio/ulc-asnprintf-tests index 2588a7ffc5..2eaddaf4e6 100644 --- a/modules/unistdio/ulc-asnprintf-tests +++ b/modules/unistdio/ulc-asnprintf-tests @@ -2,6 +2,7 @@ Files: tests/unistdio/test-ulc-asnprintf1.c tests/unistdio/test-ulc-asnprintf1.h tests/unistdio/test-ulc-printf1.h +tests/macros.h Depends-on: diff --git a/modules/unistdio/ulc-vasnprintf-tests b/modules/unistdio/ulc-vasnprintf-tests index 6afb238a8b..8ee22687bc 100644 --- a/modules/unistdio/ulc-vasnprintf-tests +++ b/modules/unistdio/ulc-vasnprintf-tests @@ -6,6 +6,7 @@ tests/unistdio/test-ulc-vasnprintf2.sh tests/unistdio/test-ulc-vasnprintf2.c tests/unistdio/test-ulc-vasnprintf3.sh tests/unistdio/test-ulc-vasnprintf3.c +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/unistdio/ulc-vasprintf-tests b/modules/unistdio/ulc-vasprintf-tests index d006624de9..1acae46efc 100644 --- a/modules/unistdio/ulc-vasprintf-tests +++ b/modules/unistdio/ulc-vasprintf-tests @@ -1,6 +1,7 @@ Files: tests/unistdio/test-ulc-vasprintf1.c tests/unistdio/test-ulc-printf1.h +tests/macros.h Depends-on: diff --git a/modules/unistdio/ulc-vsnprintf-tests b/modules/unistdio/ulc-vsnprintf-tests index 5f397f5783..fb7eb6cd9b 100644 --- a/modules/unistdio/ulc-vsnprintf-tests +++ b/modules/unistdio/ulc-vsnprintf-tests @@ -1,6 +1,7 @@ Files: tests/unistdio/test-ulc-vsnprintf1.c tests/unistdio/test-ulc-printf1.h +tests/macros.h Depends-on: xalloc diff --git a/modules/unistdio/ulc-vsprintf-tests b/modules/unistdio/ulc-vsprintf-tests index a588379f59..7660984ef0 100644 --- a/modules/unistdio/ulc-vsprintf-tests +++ b/modules/unistdio/ulc-vsprintf-tests @@ -1,6 +1,7 @@ Files: tests/unistdio/test-ulc-vsprintf1.c tests/unistdio/test-ulc-printf1.h +tests/macros.h Depends-on: xalloc diff --git a/modules/uniwbrk/u16-wordbreaks-tests b/modules/uniwbrk/u16-wordbreaks-tests index ae77ff98e2..8a923f3a76 100644 --- a/modules/uniwbrk/u16-wordbreaks-tests +++ b/modules/uniwbrk/u16-wordbreaks-tests @@ -1,5 +1,6 @@ Files: tests/uniwbrk/test-u16-wordbreaks.c +tests/macros.h Depends-on: diff --git a/modules/uniwbrk/u32-wordbreaks-tests b/modules/uniwbrk/u32-wordbreaks-tests index d57c04a632..33145c07bd 100644 --- a/modules/uniwbrk/u32-wordbreaks-tests +++ b/modules/uniwbrk/u32-wordbreaks-tests @@ -1,5 +1,6 @@ Files: tests/uniwbrk/test-u32-wordbreaks.c +tests/macros.h Depends-on: diff --git a/modules/uniwbrk/u8-wordbreaks-tests b/modules/uniwbrk/u8-wordbreaks-tests index 8d14157b75..8248f2f9a8 100644 --- a/modules/uniwbrk/u8-wordbreaks-tests +++ b/modules/uniwbrk/u8-wordbreaks-tests @@ -1,5 +1,6 @@ Files: tests/uniwbrk/test-u8-wordbreaks.c +tests/macros.h Depends-on: diff --git a/modules/uniwbrk/ulc-wordbreaks-tests b/modules/uniwbrk/ulc-wordbreaks-tests index afdd4f55ad..ad612ffd17 100644 --- a/modules/uniwbrk/ulc-wordbreaks-tests +++ b/modules/uniwbrk/ulc-wordbreaks-tests @@ -1,6 +1,7 @@ Files: tests/uniwbrk/test-ulc-wordbreaks.sh tests/uniwbrk/test-ulc-wordbreaks.c +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/uniwidth/u16-strwidth-tests b/modules/uniwidth/u16-strwidth-tests index 0405a9f51b..84d0c7e798 100644 --- a/modules/uniwidth/u16-strwidth-tests +++ b/modules/uniwidth/u16-strwidth-tests @@ -1,5 +1,6 @@ Files: tests/uniwidth/test-u16-strwidth.c +tests/macros.h Depends-on: diff --git a/modules/uniwidth/u16-width-tests b/modules/uniwidth/u16-width-tests index 8b24bf009c..3a872035ad 100644 --- a/modules/uniwidth/u16-width-tests +++ b/modules/uniwidth/u16-width-tests @@ -1,5 +1,6 @@ Files: tests/uniwidth/test-u16-width.c +tests/macros.h Depends-on: diff --git a/modules/uniwidth/u32-strwidth-tests b/modules/uniwidth/u32-strwidth-tests index 20e16d0575..a8e34da4b7 100644 --- a/modules/uniwidth/u32-strwidth-tests +++ b/modules/uniwidth/u32-strwidth-tests @@ -1,5 +1,6 @@ Files: tests/uniwidth/test-u32-strwidth.c +tests/macros.h Depends-on: diff --git a/modules/uniwidth/u32-width-tests b/modules/uniwidth/u32-width-tests index b8bf99508d..934402fd95 100644 --- a/modules/uniwidth/u32-width-tests +++ b/modules/uniwidth/u32-width-tests @@ -1,5 +1,6 @@ Files: tests/uniwidth/test-u32-width.c +tests/macros.h Depends-on: diff --git a/modules/uniwidth/u8-strwidth-tests b/modules/uniwidth/u8-strwidth-tests index 6e18d05a5a..1898c9064b 100644 --- a/modules/uniwidth/u8-strwidth-tests +++ b/modules/uniwidth/u8-strwidth-tests @@ -1,5 +1,6 @@ Files: tests/uniwidth/test-u8-strwidth.c +tests/macros.h Depends-on: diff --git a/modules/uniwidth/u8-width-tests b/modules/uniwidth/u8-width-tests index f66aa52bfc..a0112a76c2 100644 --- a/modules/uniwidth/u8-width-tests +++ b/modules/uniwidth/u8-width-tests @@ -1,5 +1,6 @@ Files: tests/uniwidth/test-u8-width.c +tests/macros.h Depends-on: diff --git a/modules/uniwidth/width-tests b/modules/uniwidth/width-tests index 05753a15b0..523d0ba6e0 100644 --- a/modules/uniwidth/width-tests +++ b/modules/uniwidth/width-tests @@ -2,6 +2,7 @@ Files: tests/uniwidth/test-uc_width.c tests/uniwidth/test-uc_width2.c tests/uniwidth/test-uc_width2.sh +tests/macros.h Depends-on: diff --git a/modules/unlink-tests b/modules/unlink-tests index d9c82ebc97..f49fe4de66 100644 --- a/modules/unlink-tests +++ b/modules/unlink-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-unlink.h tests/test-unlink.c +tests/signature.h +tests/macros.h Depends-on: stdbool diff --git a/modules/unsetenv-tests b/modules/unsetenv-tests index fddee906ac..e3a62f4133 100644 --- a/modules/unsetenv-tests +++ b/modules/unsetenv-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-unsetenv.c +tests/signature.h +tests/macros.h Depends-on: putenv diff --git a/modules/usleep-tests b/modules/usleep-tests index 59d9c17cb5..43241f4b86 100644 --- a/modules/usleep-tests +++ b/modules/usleep-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-usleep.c +tests/signature.h +tests/macros.h Depends-on: time diff --git a/modules/utimens-tests b/modules/utimens-tests index 5bf14c22a5..a9ddd27b09 100644 --- a/modules/utimens-tests +++ b/modules/utimens-tests @@ -5,6 +5,7 @@ tests/test-lutimens.h tests/test-utimens.h tests/test-utimens-common.h tests/test-utimens.c +tests/macros.h Depends-on: symlink diff --git a/modules/utimensat-tests b/modules/utimensat-tests index 46ae133554..75516d85db 100644 --- a/modules/utimensat-tests +++ b/modules/utimensat-tests @@ -1,10 +1,11 @@ Files: -tests/signature.h tests/nap.h tests/test-lutimens.h tests/test-utimens.h tests/test-utimens-common.h tests/test-utimensat.c +tests/signature.h +tests/macros.h Depends-on: progname diff --git a/modules/vasnprintf-posix-tests b/modules/vasnprintf-posix-tests index 26c437c73c..d3dc16889c 100644 --- a/modules/vasnprintf-posix-tests +++ b/modules/vasnprintf-posix-tests @@ -3,6 +3,7 @@ tests/test-vasnprintf-posix.c tests/test-vasnprintf-posix2.sh tests/test-vasnprintf-posix2.c tests/nan.h +tests/macros.h m4/locale-fr.m4 m4/codeset.m4 diff --git a/modules/vasnprintf-tests b/modules/vasnprintf-tests index 12ac4a6fc6..7ae88c6b4c 100644 --- a/modules/vasnprintf-tests +++ b/modules/vasnprintf-tests @@ -1,5 +1,6 @@ Files: tests/test-vasnprintf.c +tests/macros.h Depends-on: diff --git a/modules/vasprintf-posix-tests b/modules/vasprintf-posix-tests index bf4bd342a5..4be9c2b3ad 100644 --- a/modules/vasprintf-posix-tests +++ b/modules/vasprintf-posix-tests @@ -1,6 +1,7 @@ Files: tests/test-vasprintf-posix.c tests/nan.h +tests/macros.h Depends-on: stdint diff --git a/modules/vasprintf-tests b/modules/vasprintf-tests index 0fd058a1b9..f6a7d80647 100644 --- a/modules/vasprintf-tests +++ b/modules/vasprintf-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-vasprintf.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/vdprintf-posix-tests b/modules/vdprintf-posix-tests index aa1c015ead..ffa29176b8 100644 --- a/modules/vdprintf-posix-tests +++ b/modules/vdprintf-posix-tests @@ -1,9 +1,10 @@ Files: -tests/signature.h tests/test-vdprintf-posix.sh tests/test-vdprintf-posix.c tests/test-fprintf-posix.h tests/test-printf-posix.output +tests/signature.h +tests/macros.h Depends-on: stdint diff --git a/modules/vfprintf-posix-tests b/modules/vfprintf-posix-tests index 5423720106..8062cd2e8b 100644 --- a/modules/vfprintf-posix-tests +++ b/modules/vfprintf-posix-tests @@ -1,9 +1,10 @@ Files: -tests/signature.h tests/test-vfprintf-posix.sh tests/test-vfprintf-posix.c tests/test-fprintf-posix.h tests/test-printf-posix.output +tests/signature.h +tests/macros.h Depends-on: stdint diff --git a/modules/vprintf-posix-tests b/modules/vprintf-posix-tests index 408948fc43..66c01bdb6f 100644 --- a/modules/vprintf-posix-tests +++ b/modules/vprintf-posix-tests @@ -1,9 +1,10 @@ Files: -tests/signature.h tests/test-vprintf-posix.sh tests/test-vprintf-posix.c tests/test-printf-posix.h tests/test-printf-posix.output +tests/signature.h +tests/macros.h Depends-on: stdint diff --git a/modules/vsnprintf-posix-tests b/modules/vsnprintf-posix-tests index 816b2a984a..530e57ca66 100644 --- a/modules/vsnprintf-posix-tests +++ b/modules/vsnprintf-posix-tests @@ -1,9 +1,10 @@ Files: -tests/signature.h tests/test-vsnprintf-posix.c tests/test-snprintf-posix.h tests/test-vsnprintf.c tests/nan.h +tests/signature.h +tests/macros.h Depends-on: stdint diff --git a/modules/vsnprintf-tests b/modules/vsnprintf-tests index 4322d7b359..9c520cefd8 100644 --- a/modules/vsnprintf-tests +++ b/modules/vsnprintf-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-vsnprintf.c +tests/signature.h +tests/macros.h Depends-on: diff --git a/modules/vsprintf-posix-tests b/modules/vsprintf-posix-tests index 54a6cd5be8..7b5412ff85 100644 --- a/modules/vsprintf-posix-tests +++ b/modules/vsprintf-posix-tests @@ -1,8 +1,9 @@ Files: -tests/signature.h tests/test-vsprintf-posix.c tests/test-sprintf-posix.h tests/nan.h +tests/signature.h +tests/macros.h Depends-on: stdint diff --git a/modules/wcrtomb-tests b/modules/wcrtomb-tests index 885c6c1912..47ba6774ca 100644 --- a/modules/wcrtomb-tests +++ b/modules/wcrtomb-tests @@ -1,7 +1,8 @@ Files: -tests/signature.h tests/test-wcrtomb.sh tests/test-wcrtomb.c +tests/signature.h +tests/macros.h m4/locale-fr.m4 m4/locale-ja.m4 m4/locale-zh.m4 diff --git a/modules/wcsnrtombs-tests b/modules/wcsnrtombs-tests index f18bda9187..dc362b9524 100644 --- a/modules/wcsnrtombs-tests +++ b/modules/wcsnrtombs-tests @@ -1,10 +1,11 @@ Files: -tests/signature.h tests/test-wcsnrtombs1.sh tests/test-wcsnrtombs2.sh tests/test-wcsnrtombs3.sh tests/test-wcsnrtombs4.sh tests/test-wcsnrtombs.c +tests/signature.h +tests/macros.h m4/locale-fr.m4 m4/locale-ja.m4 m4/locale-zh.m4 diff --git a/modules/wcsrtombs-tests b/modules/wcsrtombs-tests index 68ab421e04..757ce42f71 100644 --- a/modules/wcsrtombs-tests +++ b/modules/wcsrtombs-tests @@ -1,10 +1,11 @@ Files: -tests/signature.h tests/test-wcsrtombs1.sh tests/test-wcsrtombs2.sh tests/test-wcsrtombs3.sh tests/test-wcsrtombs4.sh tests/test-wcsrtombs.c +tests/signature.h +tests/macros.h m4/locale-fr.m4 m4/locale-ja.m4 m4/locale-zh.m4 diff --git a/modules/wctype-tests b/modules/wctype-tests index bd478d93d9..e7c7b2b0de 100644 --- a/modules/wctype-tests +++ b/modules/wctype-tests @@ -1,5 +1,6 @@ Files: tests/test-wctype.c +tests/macros.h Depends-on: diff --git a/modules/wcwidth-tests b/modules/wcwidth-tests index f12cc6ecdf..0938a8846b 100644 --- a/modules/wcwidth-tests +++ b/modules/wcwidth-tests @@ -1,6 +1,7 @@ Files: -tests/signature.h tests/test-wcwidth.c +tests/signature.h +tests/macros.h Depends-on: localcharset diff --git a/modules/xmemdup0-tests b/modules/xmemdup0-tests index bcbc7ab8b8..13311f0fd5 100644 --- a/modules/xmemdup0-tests +++ b/modules/xmemdup0-tests @@ -1,5 +1,6 @@ Files: tests/test-xmemdup0.c +tests/macros.h Depends-on: progname diff --git a/modules/xprintf-posix-tests b/modules/xprintf-posix-tests index 92397b23b1..22e01ca88e 100644 --- a/modules/xprintf-posix-tests +++ b/modules/xprintf-posix-tests @@ -5,6 +5,7 @@ tests/test-xprintf-posix.c tests/test-fprintf-posix.h tests/test-printf-posix.h tests/test-printf-posix.output +tests/macros.h Depends-on: stdint diff --git a/modules/xvasprintf-tests b/modules/xvasprintf-tests index a920e6cb10..77d536ebda 100644 --- 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 index 0000000000..dc55fbe02e --- /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 index ff50f89d68..8b7ff63ec5 100644 --- 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 index 9a3692714a..2e8aaa5fb7 100644 --- 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 index 55ab78e6e9..67252a7fc0 100644 --- 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 index f5deb7073d..54e0745c78 100644 --- 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 index c7f157fdb4..5851842a5a 100644 --- 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 index fffa425c7f..10159ac6b4 100644 --- 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 index 684231d238..fccd8f1c66 100644 --- a/tests/test-array-mergesort.c +++ b/tests/test-array-mergesort.c @@ -24,20 +24,9 @@ struct foo { double x; double index; }; #define STATIC static #include "array-mergesort.h" -#include #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 index 2f33d4c573..3a8fad0d14 100644 --- 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 index f79d1620bb..15cec4182e 100644 --- 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 @@ static const char *objects[30] = "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "<", ">", "[", "]" }; -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] diff --git a/tests/test-avltree_list.c b/tests/test-avltree_list.c index 4047ff64ac..6cd78f147c 100644 --- 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 @@ static const char *objects[15] = "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o" }; -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] diff --git a/tests/test-avltree_oset.c b/tests/test-avltree_oset.c index c07281ae4a..a37b3329e7 100644 --- 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 @@ static const char *objects[30] = "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "<", ">", "[", "]" }; -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] diff --git a/tests/test-avltreehash_list.c b/tests/test-avltreehash_list.c index 12a716ade6..4306040a26 100644 --- 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 @@ string_hash (const void *x) return h; } -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] diff --git a/tests/test-base64.c b/tests/test-base64.c index 2a2a4f522f..251b042de0 100644 --- 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 index 335989fc03..5410b41f7f 100644 --- 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 index db26ef827c..0838a38436 100644 --- 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 index 4a19553310..eb959ae46b 100644 --- a/tests/test-btowc.c +++ b/tests/test-btowc.c @@ -25,19 +25,8 @@ SIGNATURE_CHECK (btowc, wint_t, (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 (int argc, char *argv[]) diff --git a/tests/test-byteswap.c b/tests/test-byteswap.c index 55de36bf0d..6f93b6d7d7 100644 --- 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 index e04de2ef9c..9580966192 100644 --- 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 index b5ff6be650..56b2c16c18 100644 --- 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 index e0c23685d4..cfa5e127bd 100644 --- 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 index 0c8a40db5e..905d546e95 100644 --- 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 index fb5f220035..b993cf9831 100644 --- 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 index 2b2ebf91cc..b5dbb55a26 100644 --- 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 index 4f4fca18b4..e35d921bbd 100644 --- a/tests/test-canonicalize-lgpl.c +++ b/tests/test-canonicalize-lgpl.c @@ -32,18 +32,7 @@ SIGNATURE_CHECK (canonicalize_file_name, char *, (const char *)); #include #include "same-inode.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define BASE "t-can-lgpl.tmp" diff --git a/tests/test-canonicalize.c b/tests/test-canonicalize.c index 70b6341de9..583026744f 100644 --- 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 index def7c5539d..e75bc1801b 100644 --- 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 index e180e95f8a..e37c14e618 100644 --- 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 index ec0f608493..a7c4b5e318 100644 --- 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 index 2ed0053311..a7dfe20c6e 100644 --- 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 index e7660707ea..39749039ed 100644 --- a/tests/test-chown.c +++ b/tests/test-chown.c @@ -32,18 +32,7 @@ SIGNATURE_CHECK (chown, int, (char const *, uid_t, gid_t)); #include "mgetgroups.h" #include "stat-time.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define BASE "test-chown.t" diff --git a/tests/test-cloexec.c b/tests/test-cloexec.c index 1f43014972..56e26d1860 100644 --- 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 index 198d59d808..5da63bc065 100644 --- 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 index a2bb421f1b..e845e11d99 100644 --- 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 index 5757bbd22e..aec49e1586 100644 --- 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 index 9cedc1c62a..341ece2f58 100644 --- a/tests/test-dprintf-posix.c +++ b/tests/test-dprintf-posix.c @@ -25,20 +25,9 @@ SIGNATURE_CHECK (dprintf, int, (int, const char *, ...)); #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 index a4aca82dfb..d3751f5c44 100644 --- a/tests/test-dup2.c +++ b/tests/test-dup2.c @@ -25,8 +25,6 @@ SIGNATURE_CHECK (dup2, int, (int, int)); #include #include -#include -#include #include "binary-io.h" #include "cloexec.h" @@ -37,17 +35,7 @@ SIGNATURE_CHECK (dup2, int, (int, int)); # 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 index 9133b7bf4b..184d780922 100644 --- a/tests/test-dup3.c +++ b/tests/test-dup3.c @@ -27,8 +27,6 @@ SIGNATURE_CHECK (dup3, int, (int, int, int)); #include #include #include -#include -#include #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ /* Get declarations of the Win32 API functions. */ @@ -37,18 +35,7 @@ SIGNATURE_CHECK (dup3, int, (int, int, int)); #endif #include "binary-io.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" /* Return true if FD is open. */ static bool diff --git a/tests/test-duplocale.c b/tests/test-duplocale.c index a368c07428..e0930d61db 100644 --- a/tests/test-duplocale.c +++ b/tests/test-duplocale.c @@ -28,20 +28,9 @@ SIGNATURE_CHECK (duplocale, locale_t, (locale_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" struct locale_dependent_values { diff --git a/tests/test-fbufmode.c b/tests/test-fbufmode.c index 3f83864a1b..5675e44fe0 100644 --- 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 index 7ec675e7da..f5cce49d6c 100644 --- a/tests/test-fchdir.c +++ b/tests/test-fchdir.c @@ -25,23 +25,11 @@ SIGNATURE_CHECK (fchdir, int, (int)); #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 index c084ddf83c..a6d177d36a 100644 --- a/tests/test-fchownat.c +++ b/tests/test-fchownat.c @@ -33,18 +33,7 @@ SIGNATURE_CHECK (fchownat, int, (int, char const *, uid_t, gid_t, int)); #include "mgetgroups.h" #include "openat.h" #include "stat-time.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define BASE "test-fchownat.t" diff --git a/tests/test-fcntl-safer.c b/tests/test-fcntl-safer.c index 15f6e2ca6c..c3e77fa825 100644 --- 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 index 77ac87006e..b14e00a032 100644 --- a/tests/test-fcntl.c +++ b/tests/test-fcntl.c @@ -28,8 +28,6 @@ SIGNATURE_CHECK (fcntl, int, (int, int, ...)); #include #include #include -#include -#include #include #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ @@ -39,6 +37,7 @@ SIGNATURE_CHECK (fcntl, int, (int, int, ...)); #endif #include "binary-io.h" +#include "macros.h" /* Use O_CLOEXEC if available, but test works without it. */ #ifndef O_CLOEXEC @@ -50,18 +49,6 @@ SIGNATURE_CHECK (fcntl, int, (int, int, ...)); static int zero (void) { return 0; } #endif -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) - /* Return true if FD is open. */ static bool is_open (int fd) diff --git a/tests/test-fdopendir.c b/tests/test-fdopendir.c index f6006d0b8e..943b8d1206 100644 --- a/tests/test-fdopendir.c +++ b/tests/test-fdopendir.c @@ -25,21 +25,9 @@ SIGNATURE_CHECK (fdopendir, DIR *, (int)); #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 index 00729d8e68..ad0eca94b8 100644 --- 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 index da0a760c22..e2e82b0594 100644 --- 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 index 3e069ee411..4727ed174b 100644 --- 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 index 4c29d0c8d9..624794b5a8 100644 --- 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 index a8a615e9a6..beae8c8175 100644 --- 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 index e156732392..025ea9bd4e 100644 --- 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 index d668487e52..d6a22ee25a 100644 --- 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 index a8080e58b0..cbef77a00b 100644 --- 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 index f9485afcf1..6cd2d8a577 100644 --- 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 index 6ba923b3ba..106f4910d1 100644 --- 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 index 44b6f66dd0..09b7bfab9e 100644 --- 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 index 21c626ee09..46e5fd61a9 100644 --- a/tests/test-fprintf-posix.c +++ b/tests/test-fprintf-posix.c @@ -26,20 +26,9 @@ SIGNATURE_CHECK (fprintf, int, (FILE *, char const *, ...)); #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 index 9bf2378868..ad77fa9cb5 100644 --- 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 index becad342ca..0582ffd245 100644 --- 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 index c216231aa4..bea6eeda22 100644 --- 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 index eb5699d35c..1f9af7fbdf 100644 --- 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 index 65334b8bc5..df1259cf1b 100644 --- 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 index e6f534834e..0a570ec617 100644 --- 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 index 2bd9ab6ffd..ca7aaa460e 100644 --- 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 index bdb5de0fe9..48487088a5 100644 --- 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 index 6b285c9a94..9b6f464921 100644 --- 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 index 7b7ec53941..f67319426c 100644 --- 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 index 4447a9b6f7..00ded3e12e 100644 --- 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 index 0d2f32199f..6a8a1c0a08 100644 --- 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 index 552bf45f31..e6abe38e26 100644 --- a/tests/test-fstatat.c +++ b/tests/test-fstatat.c @@ -33,18 +33,7 @@ SIGNATURE_CHECK (fstatat, int, (int, char const *, struct stat *, int)); #include "openat.h" #include "pathmax.h" #include "same-inode.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define BASE "test-fstatat.t" diff --git a/tests/test-fstrcmp.c b/tests/test-fstrcmp.c index a2d250527c..e72fef052e 100644 --- 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 index bf789a2aa6..12a56b2ce9 100644 --- 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 index d9723f593b..0f35da44fc 100644 --- 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 @@ SIGNATURE_CHECK (ftell, long, (FILE *)); # undef fseek #endif -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) - #ifndef FUNC_UNGETC_BROKEN # define FUNC_UNGETC_BROKEN 0 #endif diff --git a/tests/test-ftello.c b/tests/test-ftello.c index 2af43f2bc9..bde4e067e2 100644 --- 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 @@ SIGNATURE_CHECK (ftello, off_t, (FILE *)); # undef fseek #endif -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) - #ifndef FUNC_UNGETC_BROKEN # define FUNC_UNGETC_BROKEN 0 #endif diff --git a/tests/test-func.c b/tests/test-func.c index 7679ef0474..88d5f2c9ac 100644 --- 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 index 5753c6b209..0ee1fe05ed 100644 --- a/tests/test-futimens.c +++ b/tests/test-futimens.c @@ -34,18 +34,7 @@ SIGNATURE_CHECK (futimens, int, (int, struct timespec const[2])); #include "stat-time.h" #include "timespec.h" #include "utimecmp.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define BASE "test-futimens.t" diff --git a/tests/test-fwritable.c b/tests/test-fwritable.c index 34f2427089..f4c40824b3 100644 --- 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 index ee23eecf88..61c4f80bec 100644 --- 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 index 7570180859..1f6306d0a2 100644 --- a/tests/test-getcwd.c +++ b/tests/test-getcwd.c @@ -25,17 +25,7 @@ SIGNATURE_CHECK (getcwd, char *, (char *, size_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 (int argc, char **argv) diff --git a/tests/test-getdate.c b/tests/test-getdate.c index b30ef82c48..09b1b54abb 100644 --- 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 index dc40bddebd..dbb44a6b6c 100644 --- a/tests/test-getdelim.c +++ b/tests/test-getdelim.c @@ -27,17 +27,7 @@ SIGNATURE_CHECK (getdelim, ssize_t, (char **, size_t *, int, FILE *)); #include #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 index e587aa13de..a86ba4ba0b 100644 --- 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 index 1d3ca98e3a..14f49f7ee7 100644 --- a/tests/test-getgroups.c +++ b/tests/test-getgroups.c @@ -28,17 +28,7 @@ SIGNATURE_CHECK (getgroups, int, (int, gid_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 (int argc, char **argv _GL_UNUSED) diff --git a/tests/test-getline.c b/tests/test-getline.c index 7564ece159..bab99b370c 100644 --- a/tests/test-getline.c +++ b/tests/test-getline.c @@ -27,17 +27,7 @@ SIGNATURE_CHECK (getline, ssize_t, (char **, size_t *, FILE *)); #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 index ff641bd518..e276adb02e 100644 --- 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 index d7a17dc035..f8d132e728 100644 --- a/tests/test-glob.c +++ b/tests/test-glob.c @@ -25,22 +25,9 @@ SIGNATURE_CHECK (glob, int, (char const *, int, int (*) (char const *, int), glob_t *)); SIGNATURE_CHECK (globfree, void, (glob_t *)); -#include -#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 index 2e7c550af1..0ee24ec8b1 100644 --- 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 index d53123efd0..56c480ce54 100644 --- 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 index 116477435a..7f57d91dd3 100644 --- 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 index 566ddee62f..66db9182c5 100644 --- a/tests/test-iconv.c +++ b/tests/test-iconv.c @@ -34,21 +34,9 @@ SIGNATURE_CHECK (iconv_open, iconv_t, (char const *, char const *)); #endif #include -#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 index 5dbc8e2888..7157ef3c1f 100644 --- 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 index 3dc36c9a65..53c9ac003d 100644 --- 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 index 8495620344..d424b72bd1 100644 --- a/tests/test-inet_ntop.c +++ b/tests/test-inet_ntop.c @@ -26,21 +26,9 @@ SIGNATURE_CHECK (inet_ntop, char const *, (int, void const *, char *, #include #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 index b1dbb052bb..deaf30a183 100644 --- a/tests/test-inet_pton.c +++ b/tests/test-inet_pton.c @@ -25,20 +25,8 @@ SIGNATURE_CHECK (inet_pton, int, (int, const char *, void *)); #include #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 index d29fc63338..be370cb12d 100644 --- a/tests/test-isblank.c +++ b/tests/test-isblank.c @@ -25,19 +25,8 @@ SIGNATURE_CHECK (isblank, 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 (int argc, char *argv[]) diff --git a/tests/test-isfinite.c b/tests/test-isfinite.c index fc2f23c0d9..de08e30e88 100644 --- 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 index d81ee7afc6..678b0fe352 100644 --- 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 index 74bb9d981f..a5787c2664 100644 --- 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 index 215e18a6d2..c5dc549afe 100644 --- 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 index 2444c6d233..b0d99fdd1a 100644 --- 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 index 8638f064b6..13a92efb7e 100644 --- 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 index b9091028d3..24b7ece95a 100644 --- a/tests/test-lchown.c +++ b/tests/test-lchown.c @@ -32,18 +32,7 @@ SIGNATURE_CHECK (lchown, int, (char const *, uid_t, gid_t)); #include "mgetgroups.h" #include "stat-time.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define BASE "test-lchown.t" diff --git a/tests/test-ldexpl.c b/tests/test-ldexpl.c index 0fe4f8619c..510841cf40 100644 --- 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 index d2ff679d22..817c464b7a 100644 --- a/tests/test-link.c +++ b/tests/test-link.c @@ -30,17 +30,7 @@ SIGNATURE_CHECK (link, int, (char const *, 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" #define BASE "test-link.t" diff --git a/tests/test-linkat.c b/tests/test-linkat.c index c827a27d96..98165c0153 100644 --- a/tests/test-linkat.c +++ b/tests/test-linkat.c @@ -34,18 +34,7 @@ SIGNATURE_CHECK (linkat, int, (int, char const *, int, char const *, int)); #include "filenamecat.h" #include "same-inode.h" #include "xgetcwd.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define BASE "test-linkat.t" diff --git a/tests/test-linked_list.c b/tests/test-linked_list.c index 5511c89cbb..45b3ae8f74 100644 --- 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 index 98913c5742..1abd65b469 100644 --- 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 @@ string_hash (const void *x) return h; } -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] diff --git a/tests/test-localename.c b/tests/test-localename.c index c7e0673c16..553cafc4d8 100644 --- 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 index a57443db22..fa0505daf8 100644 --- 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 index 74a4fd2acf..1940a2158b 100644 --- a/tests/test-lstat.c +++ b/tests/test-lstat.c @@ -35,18 +35,7 @@ SIGNATURE_CHECK (lstat, int, (char const *, struct stat *)); #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 index 3fb7e0a8fb..0adf80c654 100644 --- 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 index b127296042..fd30df733f 100644 --- 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 index 916427308f..d84bafe434 100644 --- a/tests/test-mbrtowc.c +++ b/tests/test-mbrtowc.c @@ -26,20 +26,9 @@ SIGNATURE_CHECK (mbrtowc, size_t, (wchar_t *, char const *, size_t, #include #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 index 6e4757c7f0..17b278eb61 100644 --- 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 index b174f15133..94b6ade02b 100644 --- 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 index c9b4f98582..42f2bfc83c 100644 --- 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 index a636eba98d..a1b5d5b413 100644 --- 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 index 9763f151b3..f6337634ed 100644 --- 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 index 2028decf75..f087150d4d 100644 --- 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 index f2dae51c86..d65db4ebc7 100644 --- 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 index 2732693bc2..e72086d57e 100644 --- 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 index 2db03bab52..3f0d689d02 100644 --- 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 index 471c17b8b6..315b3fabe3 100644 --- a/tests/test-mbsnrtowcs.c +++ b/tests/test-mbsnrtowcs.c @@ -26,20 +26,9 @@ SIGNATURE_CHECK (mbsnrtowcs, size_t, (wchar_t *, char const **, size_t, size_t, #include #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 index c5b386f81b..521456784a 100644 --- 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 index 912eb85772..c337c23ce8 100644 --- 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 index 160148ac3c..0c435aeead 100644 --- 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 index 4a01d4a59a..4447f2c5da 100644 --- a/tests/test-mbsrtowcs.c +++ b/tests/test-mbsrtowcs.c @@ -26,20 +26,9 @@ SIGNATURE_CHECK (mbsrtowcs, size_t, (wchar_t *, char const **, size_t, #include #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 index f8798dbfb6..5e27dfc9e9 100644 --- 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 index 23e1dbec09..97ef60d0ea 100644 --- 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 index 667390f4c4..2e4c538e25 100644 --- 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 index a948a03785..6d0b5d627d 100644 --- 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 index 2ec37b65af..5d31e76f27 100644 --- 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 index ef0a713303..a992fb5c08 100644 --- 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 index 463ca0c988..48cf40df5b 100644 --- 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 index 3c71a2e269..babf6810cb 100644 --- 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 index d9128e76e4..e768daf2cf 100644 --- 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 index 1531e25c50..379e90c5a3 100644 --- a/tests/test-mkdir.c +++ b/tests/test-mkdir.c @@ -30,17 +30,7 @@ SIGNATURE_CHECK (mkdir, int, (char const *, mode_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" #define BASE "test-mkdir.t" diff --git a/tests/test-mkdirat.c b/tests/test-mkdirat.c index c11b1654df..d3180e6d56 100644 --- a/tests/test-mkdirat.c +++ b/tests/test-mkdirat.c @@ -30,17 +30,7 @@ SIGNATURE_CHECK (mkdirat, int, (int, char const *, mode_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" #define BASE "test-mkdirat.t" diff --git a/tests/test-mkfifo.c b/tests/test-mkfifo.c index df002ed74c..4b4c93b53d 100644 --- a/tests/test-mkfifo.c +++ b/tests/test-mkfifo.c @@ -30,17 +30,7 @@ SIGNATURE_CHECK (mkfifo, int, (char const *, mode_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" #define BASE "test-mkfifo.t" diff --git a/tests/test-mkfifoat.c b/tests/test-mkfifoat.c index 1c6656e147..ef3e817c8d 100644 --- a/tests/test-mkfifoat.c +++ b/tests/test-mkfifoat.c @@ -32,17 +32,7 @@ SIGNATURE_CHECK (mknodat, int, (int, char const *, mode_t, dev_t)); #include #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 index b00cd28425..a62df6d112 100644 --- a/tests/test-mknod.c +++ b/tests/test-mknod.c @@ -30,17 +30,7 @@ SIGNATURE_CHECK (mknod, int, (char const *, mode_t, dev_t)); #include #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 index 797c8beb7e..09aff7a815 100644 --- a/tests/test-nanosleep.c +++ b/tests/test-nanosleep.c @@ -25,23 +25,10 @@ SIGNATURE_CHECK (nanosleep, int, (struct timespec const *, struct timespec *)); #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 index a2f5f68257..4a79b50219 100644 --- 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 index ca07f47524..fe2689c1c0 100644 --- a/tests/test-obstack-printf.c +++ b/tests/test-obstack-printf.c @@ -33,18 +33,7 @@ SIGNATURE_CHECK (obstack_vprintf, int, (struct obstack *, char const *, #include #include "progname.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define obstack_chunk_alloc xmalloc #define obstack_chunk_free free diff --git a/tests/test-open.c b/tests/test-open.c index 4bdf31431f..a5fb46181d 100644 --- a/tests/test-open.c +++ b/tests/test-open.c @@ -26,20 +26,9 @@ SIGNATURE_CHECK (open, int, (char const *, int, ...)); #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 index 5eb9deb276..36bbdb562c 100644 --- a/tests/test-openat.c +++ b/tests/test-openat.c @@ -27,20 +27,9 @@ SIGNATURE_CHECK (openat, int, (int, char const *, int, ...)); #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 index 228419874d..1d5aff09ad 100644 --- 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 index 5cf8984aa7..5732445770 100644 --- a/tests/test-pipe-filter-gi2-main.c +++ b/tests/test-pipe-filter-gi2-main.c @@ -28,18 +28,7 @@ #include "full-write.h" #include "progname.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" /* 0.1 sec pause */ static void diff --git a/tests/test-pipe-filter-ii1.c b/tests/test-pipe-filter-ii1.c index 310a7bba7d..eb196860b9 100644 --- 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 index 909634f399..96d70db969 100644 --- a/tests/test-pipe-filter-ii2-main.c +++ b/tests/test-pipe-filter-ii2-main.c @@ -28,18 +28,7 @@ #include "full-write.h" #include "progname.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" struct locals { diff --git a/tests/test-pipe2.c b/tests/test-pipe2.c index 5eb5ec3287..e1fbe29b12 100644 --- a/tests/test-pipe2.c +++ b/tests/test-pipe2.c @@ -32,18 +32,7 @@ SIGNATURE_CHECK (pipe2, int, (int[2], int)); #endif #include "binary-io.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" /* Return true if FD is open. */ static bool diff --git a/tests/test-popen.h b/tests/test-popen.h index b0d2e6fefa..d7011827d0 100644 --- 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 index e1a87a0a83..9c94262b38 100644 --- 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 index d5a86ad2a7..b8b133bba7 100644 --- 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 index a194132bde..38cfd2f564 100644 --- 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 index 50f8aaf6b0..7ec690918a 100644 --- 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 index c09b1883fd..cfa502f79b 100644 --- a/tests/test-printf-posix.c +++ b/tests/test-printf-posix.c @@ -25,20 +25,9 @@ SIGNATURE_CHECK (printf, 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" #include "test-printf-posix.h" diff --git a/tests/test-priv-set.c b/tests/test-priv-set.c index 8b50a7e143..9a650ad447 100644 --- 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 index cb5a73b097..10269934be 100644 --- 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 index 391d98c6cd..4c1e2428dc 100644 --- a/tests/test-random_r.c +++ b/tests/test-random_r.c @@ -25,20 +25,9 @@ SIGNATURE_CHECK (initstate_r, int, (unsigned int, char *, size_t, SIGNATURE_CHECK (setstate_r, int, (char *, struct random_data *)); SIGNATURE_CHECK (random_r, int, (struct random_data *, int32_t *)); -#include #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 index f1eef2c278..180c2b08ae 100644 --- 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 index 1f91492eb5..ecb647dbdf 100644 --- 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 @@ static const char *objects[15] = "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o" }; -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] diff --git a/tests/test-rbtree_oset.c b/tests/test-rbtree_oset.c index 79bcc89a02..72f350903c 100644 --- 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 @@ static const char *objects[30] = "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "<", ">", "[", "]" }; -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] diff --git a/tests/test-rbtreehash_list.c b/tests/test-rbtreehash_list.c index 7ec8f1ef1a..ec67550141 100644 --- 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 @@ string_hash (const void *x) return h; } -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] diff --git a/tests/test-readlink.c b/tests/test-readlink.c index 61f8f6bb78..4ec0fcdf73 100644 --- a/tests/test-readlink.c +++ b/tests/test-readlink.c @@ -31,17 +31,7 @@ SIGNATURE_CHECK (readlink, ssize_t, (char const *, char *, size_t)); #include #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 index 1a92f6c0d1..4bcc2ec2dd 100644 --- a/tests/test-remove.c +++ b/tests/test-remove.c @@ -30,17 +30,7 @@ SIGNATURE_CHECK (remove, int, (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" #define BASE "test-remove.t" diff --git a/tests/test-rename.c b/tests/test-rename.c index 1cd2e8fc0c..797cc940df 100644 --- a/tests/test-rename.c +++ b/tests/test-rename.c @@ -29,17 +29,7 @@ SIGNATURE_CHECK (rename, int, (char const *, 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" #define BASE "test-rename.t" diff --git a/tests/test-renameat.c b/tests/test-renameat.c index 3293d52c34..de84fa6764 100644 --- a/tests/test-renameat.c +++ b/tests/test-renameat.c @@ -32,18 +32,7 @@ SIGNATURE_CHECK (renameat, int, (int, char const *, int, char const *)); #include "filenamecat.h" #include "xgetcwd.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define BASE "test-renameat.t" diff --git a/tests/test-rmdir.c b/tests/test-rmdir.c index 44f5d7204f..9ca88e2abd 100644 --- a/tests/test-rmdir.c +++ b/tests/test-rmdir.c @@ -30,17 +30,7 @@ SIGNATURE_CHECK (rmdir, int, (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" #define BASE "test-rmdir.t" diff --git a/tests/test-round1.c b/tests/test-round1.c index 6f2795ecd2..c20059b14b 100644 --- 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 index 98edc4a7e1..ce603bb7e1 100644 --- 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 index 048aa8b9f3..7b3e2002a2 100644 --- 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 index fc68ae7700..96a1285d3f 100644 --- 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 index 939b9c17c0..27df564e3f 100644 --- a/tests/test-sameacls.c +++ b/tests/test-sameacls.c @@ -1,5 +1,5 @@ /* Test whether two files have the same ACLs. - Copyright (C) 2008 Free Software Foundation, Inc. + Copyright (C) 2008-2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,18 +32,7 @@ #include "progname.h" #include "read-file.h" #include "xalloc.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" int main (int argc, char *argv[]) diff --git a/tests/test-set-mode-acl.c b/tests/test-set-mode-acl.c index 1cc1503e7b..78e837ab0f 100644 --- 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 index b23d296e39..e565851bd4 100644 --- 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 index 63dfd7ad41..d219f02f2a 100644 --- 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 - -#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 + +#include "macros.h" #ifndef SA_NOCLDSTOP # define SA_NOCLDSTOP 0 diff --git a/tests/test-signbit.c b/tests/test-signbit.c index 4acb045460..9add258c85 100644 --- 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 index 4abca334ce..3bb2de6c94 100644 --- 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 index dbbef8cb10..01662a6d7f 100644 --- 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 index 6f1e34ceca..3780786876 100644 --- 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 index 47bbaa08cc..854d1545d3 100644 --- a/tests/test-sprintf-posix.c +++ b/tests/test-sprintf-posix.c @@ -29,18 +29,7 @@ SIGNATURE_CHECK (sprintf, int, (char *, char const *, ...)); #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 index 85ada87737..6e329c8fbc 100644 --- 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 index 9e52a4a7ad..c9fd32785c 100644 --- a/tests/test-stat.c +++ b/tests/test-stat.c @@ -31,23 +31,11 @@ SIGNATURE_CHECK (stat, int, (char const *, struct stat *)); #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 index 7c2832abe4..ac68507309 100644 --- 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 index f2f341f6bd..329394f6ed 100644 --- 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 index 986f75aa62..99c3c5f5f4 100644 --- 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 index 0dc044955f..884737bfb4 100644 --- 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 index bd2579ee1e..6ab021846d 100644 --- 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 index 96660b2607..b2fd823c99 100644 --- 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 index bf97dc683c..e3690d8472 100644 --- 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 index 6bffc13242..b20d6446bc 100644 --- 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 index affd52cd5e..e0f2eebd6c 100644 --- a/tests/test-strtod.c +++ b/tests/test-strtod.c @@ -25,22 +25,10 @@ SIGNATURE_CHECK (strtod, double, (char const *, char **)); #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 index 72b574d0fc..8e9cc035aa 100644 --- 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 index c84e0064b2..c84b2bc7f1 100644 --- a/tests/test-symlink.c +++ b/tests/test-symlink.c @@ -30,17 +30,7 @@ SIGNATURE_CHECK (symlink, int, (char const *, 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" #define BASE "test-symlink.t" diff --git a/tests/test-symlinkat.c b/tests/test-symlinkat.c index 67f0adf668..714dd98932 100644 --- a/tests/test-symlinkat.c +++ b/tests/test-symlinkat.c @@ -32,22 +32,12 @@ SIGNATURE_CHECK (readlinkat, ssize_t, (int, char const *, char *, size_t)); #include #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 index 0c92cc6e2c..cd5a57ee1d 100644 --- 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 index f704bcb1ee..d0da5519cc 100644 --- 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 index 44fd8c11fa..dc49645f9f 100644 --- 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 index 91ebb74aff..8d02e21986 100644 --- 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 index 3b36ea7c46..4b76cc8c88 100644 --- 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 index b37ae9b4d7..2a4fe1313b 100644 --- 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 index ffc360da04..15258028a5 100644 --- a/tests/test-unlink.c +++ b/tests/test-unlink.c @@ -32,18 +32,7 @@ SIGNATURE_CHECK (unlink, int, (char const *)); #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 index 313cf1ebf2..3d7f118410 100644 --- a/tests/test-unlinkat.c +++ b/tests/test-unlinkat.c @@ -31,18 +31,7 @@ SIGNATURE_CHECK (unlinkat, int, (int, char const *, int)); #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 index 6f80751788..a8346be677 100644 --- 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 index a792188333..c7b6f75563 100644 --- 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 index a36f0428f5..618d941b0a 100644 --- 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 index b1dc940125..ba4c22d6ed 100644 --- a/tests/test-utimensat.c +++ b/tests/test-utimensat.c @@ -35,18 +35,7 @@ SIGNATURE_CHECK (utimensat, int, (int, char const *, struct timespec const[2], #include "stat-time.h" #include "timespec.h" #include "utimecmp.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define BASE "test-utimensat.t" diff --git a/tests/test-vasnprintf-posix.c b/tests/test-vasnprintf-posix.c index 0c20a60443..df4f377315 100644 --- 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 index c2b5f437fd..06c356988b 100644 --- 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 index 280e1f47f2..2f7f0dbed4 100644 --- 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 index 9f3c4b5683..f8341782dd 100644 --- 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 index 46483e4586..654ddfb51a 100644 --- a/tests/test-vasprintf.c +++ b/tests/test-vasprintf.c @@ -28,17 +28,7 @@ SIGNATURE_CHECK (vasprintf, int, (char **, char const *, va_list)); #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 index 932d289bb7..387a7f45da 100644 --- a/tests/test-vdprintf-posix.c +++ b/tests/test-vdprintf-posix.c @@ -26,20 +26,9 @@ SIGNATURE_CHECK (vdprintf, int, (int, char const *, va_list)); #include #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 index 94c8ceab78..bac6aad4ce 100644 --- a/tests/test-vfprintf-posix.c +++ b/tests/test-vfprintf-posix.c @@ -26,20 +26,9 @@ SIGNATURE_CHECK (vfprintf, int, (FILE *, char const *, va_list)); #include #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 index ec6368481e..d08a0e588a 100644 --- a/tests/test-vprintf-posix.c +++ b/tests/test-vprintf-posix.c @@ -26,20 +26,9 @@ SIGNATURE_CHECK (vprintf, int, (char const *, va_list)); #include #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 index 7e152c2e88..a409b12429 100644 --- 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 index baaae6f287..717c3e2c37 100644 --- 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 index 49a134781b..d716cb1fd8 100644 --- a/tests/test-vsprintf-posix.c +++ b/tests/test-vsprintf-posix.c @@ -30,18 +30,7 @@ SIGNATURE_CHECK (vsprintf, int, (char *, char const *, va_list)); #include #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 index 3ac33e0f4b..198e09b3be 100644 --- 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 index f16dafe407..f108c12e14 100644 --- a/tests/test-wcsnrtombs.c +++ b/tests/test-wcsnrtombs.c @@ -25,21 +25,10 @@ SIGNATURE_CHECK (wcsnrtombs, size_t, (char *, wchar_t const **, size_t, size_t, mbstate_t *)); #include -#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 index 4fad01fa17..3139d63022 100644 --- a/tests/test-wcsrtombs.c +++ b/tests/test-wcsrtombs.c @@ -25,21 +25,10 @@ SIGNATURE_CHECK (wcsrtombs, size_t, (char *, wchar_t const **, size_t, mbstate_t *)); #include -#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 index bc28b157f0..fd801d11b7 100644 --- 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 index f1a89d1440..f95c2c785c 100644 --- 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 index b7adf76a4c..1db113c211 100644 --- 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 index 2c2e9d27cb..f78203dea6 100644 --- 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 index 501f04ad50..c8ec895903 100644 --- 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 index eb230dbb26..9aff3692e4 100644 --- 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 index d6a820d8be..bf6b16d6c6 100644 --- 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 index ce546e0f6c..eb5e1bc4ce 100644 --- 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 index 1be7960b0f..c47dea09c9 100644 --- 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 index e758b99206..804b518c1e 100644 --- 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 index d5691c6cae..4384c22768 100644 --- 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 index d378b56964..39a1c85d17 100644 --- 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 index 722765b046..8c05033aa4 100644 --- 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 index 77920e956e..3380d1b036 100644 --- 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 index 7d36094b6f..9d7ba40837 100644 --- 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 index 1612954137..69732a8081 100644 --- 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 index 76dcf6c365..d0df07440a 100644 --- 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 index 97dba74ca2..200cf72090 100644 --- 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 index ae03d3b60a..628dcd4f66 100644 --- 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 index 0831365784..a4dc1fa20d 100644 --- 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 index 4f7204b6f8..941b7bd53b 100644 --- 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 index 97a4e0565b..23e4e2fc1b 100644 --- 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 index a1ff4a204c..47905794be 100644 --- 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 index 020a7a2df8..0a55d612b7 100644 --- 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 index acfaf255ff..7544eedf02 100644 --- 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 index ee41ac0054..71959ae032 100644 --- 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 index b564182455..3cae1470ce 100644 --- 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 index b67703b741..f7f9e54f07 100644 --- 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 index cbe1a2b13f..4db01bbf40 100644 --- 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 index ea7ab9a811..6f9bf1b14c 100644 --- 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 index c431b3d52f..631d4dbe6e 100644 --- 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 index c1f3746156..af15fddfb3 100644 --- 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 index 5e4d69eae9..9be6ee60e4 100644 --- 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 index 5bf87bc84a..2bffde4247 100644 --- 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 index 202eeea1c4..ae454fd4de 100644 --- 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 index a17626ca96..31006ae38f 100644 --- 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 index 7c3491db67..b778d652c4 100644 --- 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 index 05bb644f0d..47467a1707 100644 --- 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 index 77d37032f0..094fce7b2b 100644 --- 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 index bd07aceb62..21acdaeade 100644 --- 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 index ddf1bea184..927897cb56 100644 --- 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 index 605fd737c5..edf863ccfd 100644 --- 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 index f1400ef384..89427d3e90 100644 --- 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 index d669fde2c6..d247fef4dc 100644 --- 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 index e4ec6a639f..2791f1c604 100644 --- 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 index 2bdf1b1e37..03f40e639f 100644 --- 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 index da2bc87ad7..323f633a93 100644 --- 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 index 512b16cedd..2bc35c0889 100644 --- 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 index 1b62159361..c88789b7b9 100644 --- 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 index 603d920151..ec442255b7 100644 --- 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 index 3203c4f147..beb9f8234f 100644 --- 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 index ce4537af30..a92679e434 100644 --- 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 index 29722a185d..73ac275cc2 100644 --- 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 index 080896fbfc..3fee61b9cf 100644 --- 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 index 89c48d33fb..e733f73eba 100644 --- 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 index f19aa4f0f6..0ee4ff28b6 100644 --- 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 index c3a72d6b02..9032794906 100644 --- 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 index 300e98405c..1a4ef0bab4 100644 --- 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 index e06af1938a..91fda1533a 100644 --- 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 index 468a4021f5..c9e7b39f89 100644 --- 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 index 3b37ae6e9e..d475546494 100644 --- 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 index 93206bdf7f..230fa87d44 100644 --- 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 index d901ef1ce7..8971a39953 100644 --- 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 index 301daafd67..70d28cc0af 100644 --- 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 index 4c4990f18d..72afe83f27 100644 --- 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 index 9eceeea0ba..a639f6ee17 100644 --- 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 index df088c47b9..bef6600718 100644 --- 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 index 606b10eccd..bc0a9a7b4e 100644 --- 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 index dc17c52661..26d04634b7 100644 --- 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 index 5865eb04c2..7973eb003d 100644 --- 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 index a1ee7d5e26..8e52a370c9 100644 --- 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 index fec2a13ad3..d890f1d4c5 100644 --- 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 index 04064ef9de..f94605ef2e 100644 --- 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 index fbcf502096..e87f3f7570 100644 --- 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 index 443ee3e5e4..457c502b45 100644 --- 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 index dfd90be0a9..d602383170 100644 --- 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 index 056f3e8892..aa2676f09f 100644 --- 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 index 424dc1c60c..6bacc078a1 100644 --- 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 index 6278d50458..1031856d64 100644 --- 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 index 5c16cc5a0f..610b47331a 100644 --- 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 index 2182b26ed4..026db18198 100644 --- 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 index 214e3120de..ed9ddeb9a3 100644 --- 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 index a374d55121..5cdee3fe95 100644 --- 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 index e55c46a1ae..6deab7030e 100644 --- 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 index b9696bb81c..fb27f0847a 100644 --- 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 index 5a103cca36..57c96967ab 100644 --- 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 index c8450f7825..7e9daa686f 100644 --- 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 index 3502d8c707..5ba5effd74 100644 --- 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 index 2179a34d82..52e8da645d 100644 --- 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 index 4661978811..9ff7147db6 100644 --- 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 index 5d3db60bf3..af01740fa4 100644 --- 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 index 766cd40c09..21bbb68189 100644 --- 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 index 5519050240..c499f6557a 100644 --- 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 index c9444b7342..707462c0cd 100644 --- 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 index c7fa6c23ce..1afc852efd 100644 --- 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 index 73523e0f7a..b2a6e772e4 100644 --- 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 index 8d35bac3f6..cfb0dac925 100644 --- 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 index 362bc5b353..37a7cd740c 100644 --- 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 index 8e38f08ef8..1373e2b42a 100644 --- 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 index 6fa42c39b1..42a040d445 100644 --- 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 index 550e31de0b..311a0949bd 100644 --- 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 index eda22023bf..19b86fd2eb 100644 --- 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 index 21776ece2f..187eac1a2c 100644 --- 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 index 6aa68fa9ce..50c634c56b 100644 --- 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 index b932ae24b5..2150a4ecc4 100644 --- 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 index 5cf60a6e4c..831066b3f9 100644 --- a/tests/uninorm/test-u32-normalize-big.c +++ b/tests/uninorm/test-u32-normalize-big.c @@ -28,18 +28,7 @@ #include "xalloc.h" #include "unistr.h" - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "macros.h" #define ASSERT_WITH_LINE(expr, file, line) \ do \ diff --git a/tests/uninorm/test-u32-normcmp.c b/tests/uninorm/test-u32-normcmp.c index 3edeffd61a..40253d8246 100644 --- 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 index 0019770b59..2efee6cf83 100644 --- 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 index 3eb71a47dd..675730fbac 100644 --- 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 index 93bf297bcd..1ccd668c41 100644 --- 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 index fcc50a34c3..b93ba7a69e 100644 --- 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 index f1246d80c2..34c31ea8bb 100644 --- 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 index 643dd3e071..487442ff1a 100644 --- 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 index 4f907308f5..c86458a9fb 100644 --- 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 index 1dd040301c..7e6851917e 100644 --- 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 index f2d2f706b6..e4ead6eb0b 100644 --- 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 index 7907168c05..7d729e8d60 100644 --- 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 index 8f1d48cab1..397adbec92 100644 --- 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 index b758f73942..26f425032f 100644 --- 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 index b534dfe047..69917ac562 100644 --- 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 index 37420f7511..cc0b7e17ba 100644 --- 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 index 179c4a36e0..fd9e088745 100644 --- 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 index a470cbf5bc..957ba19f88 100644 --- 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 index d068c27130..2bca986fc6 100644 --- 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 index ec5b46dad2..33535a6919 100644 --- 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 index 78608ffa9c..dce3d6ef2d 100644 --- 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 index 901424c30c..a33617c824 100644 --- 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 index af52a7b34b..8a25e0ed18 100644 --- 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 index 6f23d83bf7..0e3188c00d 100644 --- 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 index 820e5e1aff..e85dd67b99 100644 --- 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 index 9e597b8f3b..0a121c67be 100644 --- 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 index df59f40e37..22ae15f832 100644 --- 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 index d35d64787c..8f5d943015 100644 --- 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 index dc9afb4389..c8aa2f78d9 100644 --- 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 index c494c6d61a..1f4f196ec5 100644 --- 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 index a607a7f9c8..7f89366d1b 100644 --- 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 index 8ad1906b1d..d700641de3 100644 --- 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 index a9af5637b6..a7f1454e2d 100644 --- 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 index d1c035ede6..bc8ccad006 100644 --- 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 index b1268c9c66..a4c1843e9f 100644 --- 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 index cd18758698..4e8d3d34da 100644 --- 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 index 0a2b43fe97..f3d98be5b2 100644 --- 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 index 2b1586b910..662ca0f8e3 100644 --- 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 index e3a66c7e6d..d4a9066018 100644 --- 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 index 1dbdea50e0..5f4ce9e39b 100644 --- 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 index e7d15d1fad..fd7398133f 100644 --- 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 index 1727432396..0322b66a0b 100644 --- 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 index 9794c3ff9c..749ae0ab3f 100644 --- 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 index 440a4fbdbd..62e7bc2b33 100644 --- 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 index 77ca68e8ff..2035f4ccc8 100644 --- 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 index a55c6a8f58..7d0695b5a7 100644 --- 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 index b6254418c1..f4dccf9e87 100644 --- 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 index b421e45685..0d971e8800 100644 --- 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 index 8303c08efa..f8237629e1 100644 --- 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 index 78f71e0eb1..dc080f0df1 100644 --- 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; -- 2.30.2