From: Bruno Haible Date: Sat, 18 May 2024 19:32:01 +0000 (+0200) Subject: tests: Support showing all assertion failures, not just the first one. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=3a5f51783baeba88b684727b00ee1d3a4a3896f8;p=gnulib.git tests: Support showing all assertion failures, not just the first one. * tests/macros.h (CONTINUE_AFTER_ASSERT): New macro. (test_exit_status): New variable. (ASSERT, ASSERT_NO_STDIO): If CONTINUE_AFTER_ASSERT is 1, set test_exit_status instead of aborting. * tests/**/test-*.{c,h,cc} (main): Instead of exiting with exit code 0, exit with exit code test_exit_status. * tests/test-spawn-pipe-child.c: Undefine CONTINUE_AFTER_ASSERT. * tests/uninorm/test-nf*.c: Include macros.h. * tests/uninorm/test-u32-nf*-big.c: Likewise. * tests/random*.c: Define NO_MAIN_HERE. --- diff --git a/ChangeLog b/ChangeLog index 79f813e1b2..c119e32014 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2024-05-18 Bruno Haible + + tests: Support showing all assertion failures, not just the first one. + * tests/macros.h (CONTINUE_AFTER_ASSERT): New macro. + (test_exit_status): New variable. + (ASSERT, ASSERT_NO_STDIO): If CONTINUE_AFTER_ASSERT is 1, set + test_exit_status instead of aborting. + * tests/**/test-*.{c,h,cc} (main): Instead of exiting with exit code 0, + exit with exit code test_exit_status. + * tests/test-spawn-pipe-child.c: Undefine CONTINUE_AFTER_ASSERT. + * tests/uninorm/test-nf*.c: Include macros.h. + * tests/uninorm/test-u32-nf*-big.c: Likewise. + * tests/random*.c: Define NO_MAIN_HERE. + 2024-05-18 Paul Eggert byteswap: pacify GCC 4.4.7 and older diff --git a/tests/jit/test-cache.c b/tests/jit/test-cache.c index d19c720eb9..d4c395858c 100644 --- a/tests/jit/test-cache.c +++ b/tests/jit/test-cache.c @@ -351,5 +351,5 @@ main () clear_cache (start, end); ASSERT (f () == 2); - return 0; + return test_exit_status; } diff --git a/tests/macros.h b/tests/macros.h index d182cd6f07..d60de6fd3e 100644 --- a/tests/macros.h +++ b/tests/macros.h @@ -29,12 +29,33 @@ # endif #endif +/* Define NO_MAIN_HERE before including this file, if this compilation unit + does not contain a main() function. */ + +/* Optionally define CONTINUE_AFTER_ASSERT to 1 before including this file, + if you wish execution to continue after an ASSERT or ASSERT_NO_STDIO + failure. */ +#ifndef CONTINUE_AFTER_ASSERT +# define CONTINUE_AFTER_ASSERT 0 +#endif + /* Define ASSERT_STREAM before including this file if ASSERT must target a stream other than stderr. */ #ifndef ASSERT_STREAM # define ASSERT_STREAM stderr #endif +/* Exit status of the test. + Initialized to EXIT_SUCCESS. + Set to EXIT_FAILURE when an ASSERT or ASSERT_NO_STDIO fails. */ +/* To satisfy the "one definition rule", we define the variable in the + compilation unit that contains the main() function. */ +#ifdef NO_MAIN_HERE +extern int volatile test_exit_status; +#else +int volatile test_exit_status = EXIT_SUCCESS; +#endif + /* ASSERT (condition); verifies that the specified condition is fulfilled. If not, a message is printed to ASSERT_STREAM if defined (defaulting to stderr if @@ -59,7 +80,10 @@ fprintf (ASSERT_STREAM, "%s:%d: assertion '%s' failed\n", \ __FILE__, __LINE__, #expr); \ fflush (ASSERT_STREAM); \ - abort (); \ + if (CONTINUE_AFTER_ASSERT) \ + test_exit_status = EXIT_FAILURE; \ + else \ + abort (); \ } \ } \ while (0) @@ -77,7 +101,10 @@ WRITE_TO_STDERR (": assertion '"); \ WRITE_TO_STDERR (#expr); \ WRITE_TO_STDERR ("' failed\n"); \ - abort (); \ + if (CONTINUE_AFTER_ASSERT) \ + test_exit_status = EXIT_FAILURE; \ + else \ + abort (); \ } \ } \ while (0) diff --git a/tests/randomd.c b/tests/randomd.c index df2edbf3f1..863121624c 100644 --- a/tests/randomd.c +++ b/tests/randomd.c @@ -17,6 +17,7 @@ #include /* Specification. */ +#define NO_MAIN_HERE #include "macros.h" /* Some numbers in the interval [0,1). */ diff --git a/tests/randomf.c b/tests/randomf.c index f6c3c1c821..3c28cf76d9 100644 --- a/tests/randomf.c +++ b/tests/randomf.c @@ -17,6 +17,7 @@ #include /* Specification. */ +#define NO_MAIN_HERE #include "macros.h" /* Some numbers in the interval [0,1). */ diff --git a/tests/randoml.c b/tests/randoml.c index 7a52f8a2ca..cf1ce9396b 100644 --- a/tests/randoml.c +++ b/tests/randoml.c @@ -17,6 +17,7 @@ #include /* Specification. */ +#define NO_MAIN_HERE #include "macros.h" /* Some numbers in the interval [0,1). */ diff --git a/tests/test-accept.c b/tests/test-accept.c index ed02450bee..0252b3805b 100644 --- a/tests/test-accept.c +++ b/tests/test-accept.c @@ -52,5 +52,5 @@ main (void) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-accept4.c b/tests/test-accept4.c index eb1ddbacbb..ac50201c33 100644 --- a/tests/test-accept4.c +++ b/tests/test-accept4.c @@ -63,5 +63,5 @@ main (void) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-access.c b/tests/test-access.c index a9bf19efb4..77953cbbda 100644 --- a/tests/test-access.c +++ b/tests/test-access.c @@ -36,5 +36,5 @@ main () { test_access (access); - return 0; + return test_exit_status; } diff --git a/tests/test-acos.c b/tests/test-acos.c index 5cd95d9e58..e973aa2486 100644 --- a/tests/test-acos.c +++ b/tests/test-acos.c @@ -36,5 +36,5 @@ main () y = acos (x); ASSERT (y >= 0.9272952180 && y <= 0.9272952181); - return 0; + return test_exit_status; } diff --git a/tests/test-acosf.c b/tests/test-acosf.c index 861b5345d7..6cb6b46a2b 100644 --- a/tests/test-acosf.c +++ b/tests/test-acosf.c @@ -36,5 +36,5 @@ main () y = acosf (x); ASSERT (y >= 0.9272951f && y <= 0.9272953f); - return 0; + return test_exit_status; } diff --git a/tests/test-acosl.c b/tests/test-acosl.c index 07325e4cd0..8411d5e131 100644 --- a/tests/test-acosl.c +++ b/tests/test-acosl.c @@ -41,5 +41,5 @@ main () y = acosl (x); ASSERT (y >= 0.9272952180L && y <= 0.9272952181L); - return 0; + return test_exit_status; } diff --git a/tests/test-alignalloc.c b/tests/test-alignalloc.c index 18b287859c..5a2aaa8206 100644 --- a/tests/test-alignalloc.c +++ b/tests/test-alignalloc.c @@ -59,5 +59,5 @@ main () /* Check that alignfree is a no-op on null pointers. */ alignfree (NULL); - return 0; + return test_exit_status; } diff --git a/tests/test-alignasof.c b/tests/test-alignasof.c index 1cc75b0f3d..12f6956664 100644 --- a/tests/test-alignasof.c +++ b/tests/test-alignasof.c @@ -95,6 +95,6 @@ main () CHECK_ALIGNED (static_struct2_alignas); CHECK_ALIGNED (static_struct3_alignas); CHECK_ALIGNED (static_struct4_alignas); - return 0; + return test_exit_status; #endif } diff --git a/tests/test-aligned-malloc.c b/tests/test-aligned-malloc.c index 75cb5f9480..573304bf10 100644 --- a/tests/test-aligned-malloc.c +++ b/tests/test-aligned-malloc.c @@ -98,5 +98,5 @@ main (int argc, char *argv[]) aligned32_free (aligned32_blocks[i]); } - return 0; + return test_exit_status; } diff --git a/tests/test-aligned_alloc.c b/tests/test-aligned_alloc.c index 7c3e3c6dc2..caad2c7442 100644 --- a/tests/test-aligned_alloc.c +++ b/tests/test-aligned_alloc.c @@ -89,7 +89,7 @@ main (int argc, char *argv[]) free (aligned64_blocks[i]); } - return 0; + return test_exit_status; #else fputs ("Skipping test: function 'aligned_alloc' does not exist\n", stderr); return 77; diff --git a/tests/test-areadlink-with-size.c b/tests/test-areadlink-with-size.c index 521fa88407..79fbcf4012 100644 --- a/tests/test-areadlink-with-size.c +++ b/tests/test-areadlink-with-size.c @@ -41,5 +41,6 @@ main (void) /* Remove any leftovers from a previous partial run. */ ignore_value (system ("rm -rf " BASE "*")); - return test_areadlink (areadlink_with_size, true); + int result = test_areadlink (areadlink_with_size, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-areadlink.c b/tests/test-areadlink.c index 4b49f6f348..1c24904b2b 100644 --- a/tests/test-areadlink.c +++ b/tests/test-areadlink.c @@ -48,5 +48,6 @@ main (void) /* Remove any leftovers from a previous partial run. */ ignore_value (system ("rm -rf " BASE "*")); - return test_areadlink (do_areadlink, true); + int result = test_areadlink (do_areadlink, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-areadlinkat-with-size.c b/tests/test-areadlinkat-with-size.c index e7a02b6116..99e2477315 100644 --- a/tests/test-areadlinkat-with-size.c +++ b/tests/test-areadlinkat-with-size.c @@ -84,5 +84,5 @@ main (void) } ASSERT (close (dfd) == 0); - return result; + return (result ? result : test_exit_status); } diff --git a/tests/test-areadlinkat.c b/tests/test-areadlinkat.c index f2f9948390..d0c19daeca 100644 --- a/tests/test-areadlinkat.c +++ b/tests/test-areadlinkat.c @@ -84,5 +84,5 @@ main (void) } ASSERT (close (dfd) == 0); - return result; + return (result ? result : test_exit_status); } diff --git a/tests/test-argmatch.c b/tests/test-argmatch.c index 2c18077fc3..d8f6d09733 100644 --- a/tests/test-argmatch.c +++ b/tests/test-argmatch.c @@ -185,5 +185,5 @@ main (int argc, char *argv[]) argmatch_backup_usage (stdout); - return 0; + return test_exit_status; } diff --git a/tests/test-argp.c b/tests/test-argp.c index f74d753765..fe68fc63d4 100644 --- a/tests/test-argp.c +++ b/tests/test-argp.c @@ -486,5 +486,5 @@ main (int argc, char **argv) if (failure_count) return 1; - return 0; + return test_exit_status; } diff --git a/tests/test-argv-iter.c b/tests/test-argv-iter.c index 1d06e03e92..01c25a0971 100644 --- a/tests/test-argv-iter.c +++ b/tests/test-argv-iter.c @@ -102,5 +102,5 @@ main (void) } } - return 0; + return test_exit_status; } diff --git a/tests/test-array-mergesort.c b/tests/test-array-mergesort.c index 71639d12e6..fb039f9914 100644 --- a/tests/test-array-mergesort.c +++ b/tests/test-array-mergesort.c @@ -380,5 +380,5 @@ main () free (src); } - return 0; + return test_exit_status; } diff --git a/tests/test-array_list.c b/tests/test-array_list.c index b945b096d1..40656581ac 100644 --- a/tests/test-array_list.c +++ b/tests/test-array_list.c @@ -377,5 +377,5 @@ main (int argc, char *argv[]) free (contents); } - return 0; + return test_exit_status; } diff --git a/tests/test-array_map.c b/tests/test-array_map.c index 88b743c0b2..fad83b1038 100644 --- a/tests/test-array_map.c +++ b/tests/test-array_map.c @@ -216,5 +216,5 @@ main (int argc, char *argv[]) gl_list_free (values); } - return 0; + return test_exit_status; } diff --git a/tests/test-array_omap.c b/tests/test-array_omap.c index c6a5aea86b..2aabe7d53a 100644 --- a/tests/test-array_omap.c +++ b/tests/test-array_omap.c @@ -174,5 +174,5 @@ main (int argc, char *argv[]) gl_list_free (values); } - return 0; + return test_exit_status; } diff --git a/tests/test-array_oset.c b/tests/test-array_oset.c index 5c8e9f6433..4b9aabecfd 100644 --- a/tests/test-array_oset.c +++ b/tests/test-array_oset.c @@ -188,5 +188,5 @@ main (int argc, char *argv[]) test_update (GL_ARRAY_OSET); - return 0; + return test_exit_status; } diff --git a/tests/test-array_set.c b/tests/test-array_set.c index 82d7a90a28..1a9bdc6803 100644 --- a/tests/test-array_set.c +++ b/tests/test-array_set.c @@ -151,5 +151,5 @@ main (int argc, char *argv[]) gl_oset_free (set2); } - return 0; + return test_exit_status; } diff --git a/tests/test-asin.c b/tests/test-asin.c index 3af1b7b871..c16a0d0bc2 100644 --- a/tests/test-asin.c +++ b/tests/test-asin.c @@ -36,5 +36,5 @@ main () y = asin (x); ASSERT (y >= 0.6435011087 && y <= 0.6435011088); - return 0; + return test_exit_status; } diff --git a/tests/test-asinf.c b/tests/test-asinf.c index cdf8060249..b5c22274a3 100644 --- a/tests/test-asinf.c +++ b/tests/test-asinf.c @@ -36,5 +36,5 @@ main () y = asinf (x); ASSERT (y >= 0.6435011f && y <= 0.6435013f); - return 0; + return test_exit_status; } diff --git a/tests/test-asinl.c b/tests/test-asinl.c index c4afec8c4e..5134d79357 100644 --- a/tests/test-asinl.c +++ b/tests/test-asinl.c @@ -41,5 +41,5 @@ main () y = asinl (x); ASSERT (y >= 0.6435011087L && y <= 0.6435011088L); - return 0; + return test_exit_status; } diff --git a/tests/test-astrxfrm.c b/tests/test-astrxfrm.c index f72ab0fdb7..dc9a62d6ee 100644 --- a/tests/test-astrxfrm.c +++ b/tests/test-astrxfrm.c @@ -98,5 +98,5 @@ main () free (expected_transform); - return 0; + return test_exit_status; } diff --git a/tests/test-asyncsafe-linked_list-strong.c b/tests/test-asyncsafe-linked_list-strong.c index e0c5d88ad4..d90f08288f 100644 --- a/tests/test-asyncsafe-linked_list-strong.c +++ b/tests/test-asyncsafe-linked_list-strong.c @@ -248,7 +248,7 @@ signal_sending_thread (void *arg) printf ("Sent %u signals. Received %u signals. Done after %u mutations.\n", num_signals_sent, num_signals_arrived, num_mutations); - exit (0); + exit (test_exit_status); /*NOTREACHED*/ } diff --git a/tests/test-asyncsafe-linked_list-weak.c b/tests/test-asyncsafe-linked_list-weak.c index 6532d16238..fa2e908707 100644 --- a/tests/test-asyncsafe-linked_list-weak.c +++ b/tests/test-asyncsafe-linked_list-weak.c @@ -381,7 +381,7 @@ signal_sending_thread (void *arg) printf ("Sent %u signals. Received %u signals. Done after %u mutations.\n", num_signals_sent, num_signals_arrived, num_mutations); - exit (0); + exit (test_exit_status); /*NOTREACHED*/ } diff --git a/tests/test-atan.c b/tests/test-atan.c index 0c5bee8845..cd4f92a631 100644 --- a/tests/test-atan.c +++ b/tests/test-atan.c @@ -36,5 +36,5 @@ main () y = atan (x); ASSERT (y >= 0.5404195002 && y <= 0.5404195003); - return 0; + return test_exit_status; } diff --git a/tests/test-atan2.c b/tests/test-atan2.c index 1d9d28020a..cb8df8f336 100644 --- a/tests/test-atan2.c +++ b/tests/test-atan2.c @@ -56,5 +56,5 @@ main () z = atan2 (y, x); ASSERT (z >= -0.9272952181 && z <= -0.9272952180); - return 0; + return test_exit_status; } diff --git a/tests/test-atan2f.c b/tests/test-atan2f.c index 72bb4d8ea6..3dab9c12ec 100644 --- a/tests/test-atan2f.c +++ b/tests/test-atan2f.c @@ -56,5 +56,5 @@ main () z = atan2f (y, x); ASSERT (z >= -0.9272953f && z <= -0.92729515f); - return 0; + return test_exit_status; } diff --git a/tests/test-atanf.c b/tests/test-atanf.c index d16c29eac5..ccdb9945e9 100644 --- a/tests/test-atanf.c +++ b/tests/test-atanf.c @@ -36,5 +36,5 @@ main () y = atanf (x); ASSERT (y >= 0.5404194f && y <= 0.5404196f); - return 0; + return test_exit_status; } diff --git a/tests/test-atanl.c b/tests/test-atanl.c index d148e5af89..8b43d3a2aa 100644 --- a/tests/test-atanl.c +++ b/tests/test-atanl.c @@ -41,5 +41,5 @@ main () y = atanl (x); ASSERT (y >= 0.5404195002L && y <= 0.5404195003L); - return 0; + return test_exit_status; } diff --git a/tests/test-avltree_list.c b/tests/test-avltree_list.c index cc079aa06a..4d1534b0a0 100644 --- a/tests/test-avltree_list.c +++ b/tests/test-avltree_list.c @@ -459,5 +459,5 @@ main (int argc, char *argv[]) free (contents); } - return 0; + return test_exit_status; } diff --git a/tests/test-avltree_omap.c b/tests/test-avltree_omap.c index 94e915b6b7..3c01545f19 100644 --- a/tests/test-avltree_omap.c +++ b/tests/test-avltree_omap.c @@ -134,5 +134,5 @@ main (int argc, char *argv[]) gl_omap_free (map2); } - return 0; + return test_exit_status; } diff --git a/tests/test-avltree_oset.c b/tests/test-avltree_oset.c index 4f67301205..63f3c4c65b 100644 --- a/tests/test-avltree_oset.c +++ b/tests/test-avltree_oset.c @@ -165,5 +165,5 @@ main (int argc, char *argv[]) test_update (GL_AVLTREE_OSET); - return 0; + return test_exit_status; } diff --git a/tests/test-avltreehash_list.c b/tests/test-avltreehash_list.c index 09f9c0924e..f547e74474 100644 --- a/tests/test-avltreehash_list.c +++ b/tests/test-avltreehash_list.c @@ -489,5 +489,5 @@ main (int argc, char *argv[]) free (contents); } - return 0; + return test_exit_status; } diff --git a/tests/test-base32.c b/tests/test-base32.c index 08b0f02f01..f19f46ca55 100644 --- a/tests/test-base32.c +++ b/tests/test-base32.c @@ -271,5 +271,5 @@ main (void) ok = base32_decode_alloc_ctx (NULL, "FZ======FY======", 16, &p, &len); ASSERT (!ok); - return 0; + return test_exit_status; } diff --git a/tests/test-base64.c b/tests/test-base64.c index b697da9b12..f740acf1d7 100644 --- a/tests/test-base64.c +++ b/tests/test-base64.c @@ -242,5 +242,5 @@ main (void) ok = base64_decode_alloc_ctx (NULL, "TWF=TWE=", 8, &p, &len); ASSERT (!ok); - return 0; + return test_exit_status; } diff --git a/tests/test-binary-io.c b/tests/test-binary-io.c index 32de2fe43c..73ff4c20de 100644 --- a/tests/test-binary-io.c +++ b/tests/test-binary-io.c @@ -59,5 +59,5 @@ main (_GL_UNUSED int argc, char *argv[]) break; } - return 0; + return test_exit_status; } diff --git a/tests/test-bind.c b/tests/test-bind.c index 0f8e783a87..ec7c9029be 100644 --- a/tests/test-bind.c +++ b/tests/test-bind.c @@ -54,5 +54,5 @@ main (void) } } - return 0; + return test_exit_status; } diff --git a/tests/test-bitrotate.c b/tests/test-bitrotate.c index 73d75b5b06..41cdd06b68 100644 --- a/tests/test-bitrotate.c +++ b/tests/test-bitrotate.c @@ -275,5 +275,5 @@ main (void) ASSERT (rotr64 (16045690984503098046ULL, 63) == 13644637895296644477ULL); #endif /* UINT64_MAX */ - return 0; + return test_exit_status; } diff --git a/tests/test-bitset.c b/tests/test-bitset.c index 9fa7a9f516..48e3b1df4e 100644 --- a/tests/test-bitset.c +++ b/tests/test-bitset.c @@ -425,5 +425,5 @@ int main (void) compare (BITSET_VARIABLE, BITSET_GREEDY); bitset_stats_dump (stderr); - return 0; + return test_exit_status; } diff --git a/tests/test-boot-time.c b/tests/test-boot-time.c index 17ec39c20e..1021844bc1 100644 --- a/tests/test-boot-time.c +++ b/tests/test-boot-time.c @@ -46,5 +46,5 @@ main (int argc, char *argv[]) ASSERT (tim >= now - 157680000); ASSERT (tim <= now + 604800); - return 0; + return test_exit_status; } diff --git a/tests/test-btoc32.c b/tests/test-btoc32.c index 7e15dcce1c..efb8622a94 100644 --- a/tests/test-btoc32.c +++ b/tests/test-btoc32.c @@ -71,7 +71,7 @@ main (int argc, char *argv[]) But on musl libc, the bytes 0x80..0xFF map to U+DF80..U+DFFF. */ ASSERT (wc == c || wc == 0xDF00 + c); } - return 0; + return test_exit_status; case '2': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -79,7 +79,7 @@ main (int argc, char *argv[]) ASSERT (btoc32 (c) == c); for (c = 0xA0; c < 0x100; c++) ASSERT (btoc32 (c) != WEOF); - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -87,7 +87,7 @@ main (int argc, char *argv[]) ASSERT (btoc32 (c) == c); for (c = 0x80; c < 0x100; c++) ASSERT (btoc32 (c) == WEOF); - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-btowc.c b/tests/test-btowc.c index aeac4bbf76..f2825b34aa 100644 --- a/tests/test-btowc.c +++ b/tests/test-btowc.c @@ -68,7 +68,7 @@ main (int argc, char *argv[]) But on musl libc, the bytes 0x80..0xFF map to U+DF80..U+DFFF. */ ASSERT (wc == c || wc == 0xDF00 + c); } - return 0; + return test_exit_status; case '2': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -76,7 +76,7 @@ main (int argc, char *argv[]) ASSERT (btowc (c) == c); for (c = 0xA0; c < 0x100; c++) ASSERT (btowc (c) != WEOF); - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -84,7 +84,7 @@ main (int argc, char *argv[]) ASSERT (btowc (c) == c); for (c = 0x80; c < 0x100; c++) ASSERT (btowc (c) == WEOF); - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-byteswap.c b/tests/test-byteswap.c index 475a655a13..db0bd2f1df 100644 --- a/tests/test-byteswap.c +++ b/tests/test-byteswap.c @@ -72,5 +72,5 @@ main (void) test_bswap_eval_once (); test_bswap_double (); - return 0; + return test_exit_status; } diff --git a/tests/test-c-ctype.c b/tests/test-c-ctype.c index 8414a31d9e..898e79cc8a 100644 --- a/tests/test-c-ctype.c +++ b/tests/test-c-ctype.c @@ -224,5 +224,5 @@ main () setlocale (LC_ALL, "ja_JP.EUC-JP"); test_all (); - return 0; + return test_exit_status; } diff --git a/tests/test-c-dtoastr.c b/tests/test-c-dtoastr.c index 5c9e23f247..401901c325 100644 --- a/tests/test-c-dtoastr.c +++ b/tests/test-c-dtoastr.c @@ -54,5 +54,5 @@ main (int argc, char *argv[]) ASSERT (!strcmp (buf, "0.1")); } - return 0; + return test_exit_status; } diff --git a/tests/test-c-ldtoastr.c b/tests/test-c-ldtoastr.c index c0402c95da..aa95a7f9af 100644 --- a/tests/test-c-ldtoastr.c +++ b/tests/test-c-ldtoastr.c @@ -54,5 +54,5 @@ main (int argc, char *argv[]) ASSERT (!strcmp (buf, "0.1")); } - return 0; + return test_exit_status; } diff --git a/tests/test-c-nstrftime.c b/tests/test-c-nstrftime.c index 46ab58c92b..7eef155688 100644 --- a/tests/test-c-nstrftime.c +++ b/tests/test-c-nstrftime.c @@ -52,5 +52,5 @@ main (void) fail |= quarter_test (); fail |= errno_test (); fail |= locales_test (english); - return fail; + return (fail ? fail : test_exit_status); } diff --git a/tests/test-c-snprintf.c b/tests/test-c-snprintf.c index d89ff95aa8..879699c804 100644 --- a/tests/test-c-snprintf.c +++ b/tests/test-c-snprintf.c @@ -54,5 +54,5 @@ main (int argc, char *argv[]) ASSERT (!strcmp (s, "1.")); } - return 0; + return test_exit_status; } diff --git a/tests/test-c-strcasecmp.c b/tests/test-c-strcasecmp.c index fd07e0093a..ac993a47f9 100644 --- a/tests/test-c-strcasecmp.c +++ b/tests/test-c-strcasecmp.c @@ -64,5 +64,5 @@ main (int argc, char *argv[]) ASSERT (c_strcasecmp ("TURK\304\260SH", "turkish") > 0); #endif - return 0; + return test_exit_status; } diff --git a/tests/test-c-strcasestr.c b/tests/test-c-strcasestr.c index 39fad3ccc6..4f7caa0253 100644 --- a/tests/test-c-strcasestr.c +++ b/tests/test-c-strcasestr.c @@ -268,5 +268,5 @@ main () free (haystack); } - return 0; + return test_exit_status; } diff --git a/tests/test-c-strncasecmp.c b/tests/test-c-strncasecmp.c index a8bb3358f2..32ebfc31cd 100644 --- a/tests/test-c-strncasecmp.c +++ b/tests/test-c-strncasecmp.c @@ -78,5 +78,5 @@ main (int argc, char *argv[]) ASSERT (c_strncasecmp ("TURK\304\260SH", "turkish", 7) > 0); #endif - return 0; + return test_exit_status; } diff --git a/tests/test-c-strstr.c b/tests/test-c-strstr.c index e0dce66b8c..fa42d3ae0e 100644 --- a/tests/test-c-strstr.c +++ b/tests/test-c-strstr.c @@ -242,5 +242,5 @@ main () free (haystack); } - return 0; + return test_exit_status; } diff --git a/tests/test-c-strtod.c b/tests/test-c-strtod.c index 6efe722bd0..13148a288c 100644 --- a/tests/test-c-strtod.c +++ b/tests/test-c-strtod.c @@ -36,5 +36,5 @@ main (void) { test_function (c_strtod); - return 0; + return test_exit_status; } diff --git a/tests/test-c-strtod1.c b/tests/test-c-strtod1.c index fbaa0d20d5..e0d7baf41a 100644 --- a/tests/test-c-strtod1.c +++ b/tests/test-c-strtod1.c @@ -94,5 +94,5 @@ main (int argc, char *argv[]) ASSERT (errno == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-c-strtof.c b/tests/test-c-strtof.c index dc3a2cd07e..447a133d48 100644 --- a/tests/test-c-strtof.c +++ b/tests/test-c-strtof.c @@ -36,5 +36,5 @@ main (void) { test_function (c_strtof); - return 0; + return test_exit_status; } diff --git a/tests/test-c-strtof1.c b/tests/test-c-strtof1.c index bd40856ca7..1e5a2b55d5 100644 --- a/tests/test-c-strtof1.c +++ b/tests/test-c-strtof1.c @@ -94,5 +94,5 @@ main (int argc, char *argv[]) ASSERT (errno == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-c-strtold.c b/tests/test-c-strtold.c index 46283df0d3..f1a4031d9d 100644 --- a/tests/test-c-strtold.c +++ b/tests/test-c-strtold.c @@ -36,5 +36,5 @@ main (void) { test_function (c_strtold); - return 0; + return test_exit_status; } diff --git a/tests/test-c-strtold1.c b/tests/test-c-strtold1.c index c6227d94ed..86b4009ffb 100644 --- a/tests/test-c-strtold1.c +++ b/tests/test-c-strtold1.c @@ -94,5 +94,5 @@ main (int argc, char *argv[]) ASSERT (errno == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-c-vasprintf.c b/tests/test-c-vasprintf.c index 9172f82b40..998f54299f 100644 --- a/tests/test-c-vasprintf.c +++ b/tests/test-c-vasprintf.c @@ -76,5 +76,5 @@ main (int argc, char *argv[]) free (s); } - return 0; + return test_exit_status; } diff --git a/tests/test-c-vsnprintf.c b/tests/test-c-vsnprintf.c index d5f3b994f6..9ea9550d47 100644 --- a/tests/test-c-vsnprintf.c +++ b/tests/test-c-vsnprintf.c @@ -69,5 +69,5 @@ main (int argc, char *argv[]) ASSERT (!strcmp (s, "1.")); } - return 0; + return test_exit_status; } diff --git a/tests/test-c-xvasprintf.c b/tests/test-c-xvasprintf.c index 1d7de685ca..6e3e10d6dd 100644 --- a/tests/test-c-xvasprintf.c +++ b/tests/test-c-xvasprintf.c @@ -74,5 +74,5 @@ main (int argc, char *argv[]) free (s); } - return 0; + return test_exit_status; } diff --git a/tests/test-c32_apply_mapping.c b/tests/test-c32_apply_mapping.c index 11aee3e958..d5272b7494 100644 --- a/tests/test-c32_apply_mapping.c +++ b/tests/test-c32_apply_mapping.c @@ -56,5 +56,5 @@ main (int argc, char *argv[]) ASSERT (c32_apply_mapping ((char32_t) 0, desc) == 0); ASSERT (c32_apply_mapping (WEOF, desc) == WEOF); - return 0; + return test_exit_status; } diff --git a/tests/test-c32_apply_type_test.c b/tests/test-c32_apply_type_test.c index e943ed95e2..b6bfd70c27 100644 --- a/tests/test-c32_apply_type_test.c +++ b/tests/test-c32_apply_type_test.c @@ -166,5 +166,5 @@ main (int argc, char *argv[]) ASSERT (! c32_apply_type_test ((char32_t) '\0', desc)); ASSERT (! c32_apply_type_test (WEOF, desc)); - return 0; + return test_exit_status; } diff --git a/tests/test-c32_get_mapping.c b/tests/test-c32_get_mapping.c index b5944ac863..64505f683f 100644 --- a/tests/test-c32_get_mapping.c +++ b/tests/test-c32_get_mapping.c @@ -39,5 +39,5 @@ main (int argc, char *argv[]) desc = c32_get_mapping ("toupper"); ASSERT (desc != (c32_mapping_t) 0); - return 0; + return test_exit_status; } diff --git a/tests/test-c32_get_type_test.c b/tests/test-c32_get_type_test.c index 24b15bdc3c..1f5235c48b 100644 --- a/tests/test-c32_get_type_test.c +++ b/tests/test-c32_get_type_test.c @@ -69,5 +69,5 @@ main (int argc, char *argv[]) desc = c32_get_type_test ("print"); ASSERT (desc != (c32_type_test_t) 0); - return 0; + return test_exit_status; } diff --git a/tests/test-c32isalnum.c b/tests/test-c32isalnum.c index 4f75e0f4aa..b35c2a1f20 100644 --- a/tests/test-c32isalnum.c +++ b/tests/test-c32isalnum.c @@ -129,7 +129,7 @@ main (int argc, char *argv[]) { case '0': /* C locale; tested above. */ - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -141,7 +141,7 @@ main (int argc, char *argv[]) is = for_character ("\330", 1); ASSERT (is != 0); } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -171,7 +171,7 @@ main (int argc, char *argv[]) ASSERT (is != 0); #endif } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -208,7 +208,7 @@ main (int argc, char *argv[]) is = for_character ("\363\240\201\241", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; case '4': /* Locale encoding is GB18030. */ @@ -253,7 +253,7 @@ main (int argc, char *argv[]) is = for_character ("\323\066\237\065", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-c32isalpha.c b/tests/test-c32isalpha.c index 14c78d7d23..ef20460f5c 100644 --- a/tests/test-c32isalpha.c +++ b/tests/test-c32isalpha.c @@ -127,7 +127,7 @@ main (int argc, char *argv[]) { case '0': /* C locale; tested above. */ - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -139,7 +139,7 @@ main (int argc, char *argv[]) is = for_character ("\330", 1); ASSERT (is != 0); } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -169,7 +169,7 @@ main (int argc, char *argv[]) ASSERT (is != 0); #endif } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -206,7 +206,7 @@ main (int argc, char *argv[]) is = for_character ("\363\240\201\241", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; case '4': /* Locale encoding is GB18030. */ @@ -251,7 +251,7 @@ main (int argc, char *argv[]) is = for_character ("\323\066\237\065", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-c32isblank.c b/tests/test-c32isblank.c index 0e722b2575..be4fde3350 100644 --- a/tests/test-c32isblank.c +++ b/tests/test-c32isblank.c @@ -114,7 +114,7 @@ main (int argc, char *argv[]) { case '0': /* C locale; tested above. */ - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -128,7 +128,7 @@ main (int argc, char *argv[]) is = for_character ("\267", 1); ASSERT (is == 0); } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -137,7 +137,7 @@ main (int argc, char *argv[]) is = for_character ("\241\243", 2); ASSERT (is == 0); } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -165,7 +165,7 @@ main (int argc, char *argv[]) is = for_character ("\363\240\200\240", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; case '4': /* Locale encoding is GB18030. */ @@ -197,7 +197,7 @@ main (int argc, char *argv[]) is = for_character ("\323\066\231\060", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-c32iscntrl.c b/tests/test-c32iscntrl.c index 674c580412..11dd956ddd 100644 --- a/tests/test-c32iscntrl.c +++ b/tests/test-c32iscntrl.c @@ -110,7 +110,7 @@ main (int argc, char *argv[]) { case '0': /* C locale; tested above. */ - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -122,7 +122,7 @@ main (int argc, char *argv[]) is = for_character ("\240", 1); ASSERT (is == 0); } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -134,7 +134,7 @@ main (int argc, char *argv[]) is = for_character ("\241\241", 2); ASSERT (is == 0); } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -167,7 +167,7 @@ main (int argc, char *argv[]) ASSERT (is != 0); #endif } - return 0; + return test_exit_status; case '4': /* Locale encoding is GB18030. */ @@ -204,7 +204,7 @@ main (int argc, char *argv[]) ASSERT (is != 0); #endif } - return 0; + return test_exit_status; } diff --git a/tests/test-c32isdigit.c b/tests/test-c32isdigit.c index 82b77015f0..3d950ee181 100644 --- a/tests/test-c32isdigit.c +++ b/tests/test-c32isdigit.c @@ -110,7 +110,7 @@ main (int argc, char *argv[]) { case '0': /* C locale; tested above. */ - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -125,7 +125,7 @@ main (int argc, char *argv[]) is = for_character ("\271", 1); ASSERT (is == 0); } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -134,7 +134,7 @@ main (int argc, char *argv[]) is = for_character ("\243\261", 2); ASSERT (is == 0); } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -179,7 +179,7 @@ main (int argc, char *argv[]) is = for_character ("\363\240\200\263", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; case '4': /* Locale encoding is GB18030. */ @@ -228,7 +228,7 @@ main (int argc, char *argv[]) is = for_character ("\323\066\232\071", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-c32isgraph.c b/tests/test-c32isgraph.c index fb993bbb96..110397fe9f 100644 --- a/tests/test-c32isgraph.c +++ b/tests/test-c32isgraph.c @@ -111,7 +111,7 @@ main (int argc, char *argv[]) { case '0': /* C locale; tested above. */ - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -130,7 +130,7 @@ main (int argc, char *argv[]) ASSERT (is != 0); #endif } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -147,7 +147,7 @@ main (int argc, char *argv[]) is = for_character ("\241\241", 2); ASSERT (is == 0); } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -190,7 +190,7 @@ main (int argc, char *argv[]) ASSERT (is == 0); #endif } - return 0; + return test_exit_status; case '4': /* Locale encoding is GB18030. */ @@ -239,7 +239,7 @@ main (int argc, char *argv[]) ASSERT (is == 0); #endif } - return 0; + return test_exit_status; } diff --git a/tests/test-c32islower.c b/tests/test-c32islower.c index 3b799677fb..36c6102050 100644 --- a/tests/test-c32islower.c +++ b/tests/test-c32islower.c @@ -120,7 +120,7 @@ main (int argc, char *argv[]) { case '0': /* C locale; tested above. */ - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -148,7 +148,7 @@ main (int argc, char *argv[]) is = for_character ("\377", 1); ASSERT (is != 0); } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -194,7 +194,7 @@ main (int argc, char *argv[]) ASSERT (is != 0); #endif } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -263,7 +263,7 @@ main (int argc, char *argv[]) is = for_character ("\363\240\201\241", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; case '4': /* Locale encoding is GB18030. */ @@ -346,7 +346,7 @@ main (int argc, char *argv[]) is = for_character ("\323\066\237\065", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-c32isprint.c b/tests/test-c32isprint.c index d28eb4922a..dfc9e59cd4 100644 --- a/tests/test-c32isprint.c +++ b/tests/test-c32isprint.c @@ -110,7 +110,7 @@ main (int argc, char *argv[]) { case '0': /* C locale; tested above. */ - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -129,7 +129,7 @@ main (int argc, char *argv[]) ASSERT (is != 0); #endif } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -146,7 +146,7 @@ main (int argc, char *argv[]) ASSERT (is != 0); #endif } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -193,7 +193,7 @@ main (int argc, char *argv[]) ASSERT (is == 0); #endif } - return 0; + return test_exit_status; case '4': /* Locale encoding is GB18030. */ @@ -242,7 +242,7 @@ main (int argc, char *argv[]) ASSERT (is == 0); #endif } - return 0; + return test_exit_status; } diff --git a/tests/test-c32ispunct.c b/tests/test-c32ispunct.c index 1b9f8e3b3c..87360aa463 100644 --- a/tests/test-c32ispunct.c +++ b/tests/test-c32ispunct.c @@ -145,7 +145,7 @@ main (int argc, char *argv[]) ASSERT (is != 0); is = for_character ("`", 1); ASSERT (is != 0); - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -167,7 +167,7 @@ main (int argc, char *argv[]) is = for_character ("\337", 1); ASSERT (is == 0); } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -208,7 +208,7 @@ main (int argc, char *argv[]) is = for_character ("\243\355", 2); ASSERT (is == 0); } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -261,7 +261,7 @@ main (int argc, char *argv[]) ASSERT (is == 0); #endif } - return 0; + return test_exit_status; case '4': /* Locale encoding is GB18030. */ @@ -322,7 +322,7 @@ main (int argc, char *argv[]) ASSERT (is == 0); #endif } - return 0; + return test_exit_status; } diff --git a/tests/test-c32isspace.c b/tests/test-c32isspace.c index 15cf387dcf..c5ce347891 100644 --- a/tests/test-c32isspace.c +++ b/tests/test-c32isspace.c @@ -117,7 +117,7 @@ main (int argc, char *argv[]) { case '0': /* C locale; tested above. */ - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -126,7 +126,7 @@ main (int argc, char *argv[]) is = for_character ("\267", 1); ASSERT (is == 0); } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -140,7 +140,7 @@ main (int argc, char *argv[]) is = for_character ("\241\242", 2); ASSERT (is == 0); } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -161,7 +161,7 @@ main (int argc, char *argv[]) is = for_character ("\363\240\200\240", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; case '4': /* Locale encoding is GB18030. */ @@ -190,7 +190,7 @@ main (int argc, char *argv[]) is = for_character ("\323\066\231\060", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-c32isupper.c b/tests/test-c32isupper.c index 178b0d1998..a824747f66 100644 --- a/tests/test-c32isupper.c +++ b/tests/test-c32isupper.c @@ -120,7 +120,7 @@ main (int argc, char *argv[]) { case '0': /* C locale; tested above. */ - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -146,7 +146,7 @@ main (int argc, char *argv[]) is = for_character ("\377", 1); ASSERT (is == 0); } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -190,7 +190,7 @@ main (int argc, char *argv[]) ASSERT (is != 0); #endif } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -255,7 +255,7 @@ main (int argc, char *argv[]) is = for_character ("\363\240\201\241", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; case '4': /* Locale encoding is GB18030. */ @@ -332,7 +332,7 @@ main (int argc, char *argv[]) is = for_character ("\323\066\237\065", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-c32isxdigit.c b/tests/test-c32isxdigit.c index 0c266f4705..68d1ce7697 100644 --- a/tests/test-c32isxdigit.c +++ b/tests/test-c32isxdigit.c @@ -112,7 +112,7 @@ main (int argc, char *argv[]) { case '0': /* C locale; tested above. */ - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -127,7 +127,7 @@ main (int argc, char *argv[]) is = for_character ("\271", 1); ASSERT (is == 0); } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -142,7 +142,7 @@ main (int argc, char *argv[]) is = for_character ("\243\341", 2); ASSERT (is == 0); } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -196,7 +196,7 @@ main (int argc, char *argv[]) is = for_character ("\363\240\201\201", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; case '4': /* Locale encoding is GB18030. */ @@ -254,7 +254,7 @@ main (int argc, char *argv[]) is = for_character ("\323\066\234\063", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-c32rtomb-w32.c b/tests/test-c32rtomb-w32.c index 3e089d112a..ad08859d04 100644 --- a/tests/test-c32rtomb-w32.c +++ b/tests/test-c32rtomb-w32.c @@ -330,11 +330,9 @@ main (int argc, char *argv[]) } if (result == 77) - { - fprintf (stderr, "Skipping test: found no locale with codepage %d\n", - codepage); - } - return result; + fprintf (stderr, "Skipping test: found no locale with codepage %d\n", + codepage); + return (result ? result : test_exit_status); } #else diff --git a/tests/test-c32rtomb.c b/tests/test-c32rtomb.c index c33d08d3d4..b54de70aa6 100644 --- a/tests/test-c32rtomb.c +++ b/tests/test-c32rtomb.c @@ -120,7 +120,7 @@ main (int argc, char *argv[]) { case '1': /* C locale; tested above. */ - return 0; + return test_exit_status; case '2': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -130,7 +130,7 @@ main (int argc, char *argv[]) check_character (input + 1, 1); check_character (input + 2, 1); } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -141,7 +141,7 @@ main (int argc, char *argv[]) check_character (input + 3, 2); check_character (input + 5, 4); } - return 0; + return test_exit_status; case '4': /* Locale encoding is EUC-JP. */ @@ -152,7 +152,7 @@ main (int argc, char *argv[]) check_character (input + 3, 2); check_character (input + 5, 2); } - return 0; + return test_exit_status; case '5': /* Locale encoding is GB18030. */ @@ -167,7 +167,7 @@ main (int argc, char *argv[]) check_character (input + 3, 4); check_character (input + 7, 4); } - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-c32snrtombs.c b/tests/test-c32snrtombs.c index 3057af8b3d..26b2dd8ef6 100644 --- a/tests/test-c32snrtombs.c +++ b/tests/test-c32snrtombs.c @@ -203,7 +203,7 @@ main (int argc, char *argv[]) return 1; } - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-c32srtombs.c b/tests/test-c32srtombs.c index 416c96e3fb..7153f4f1c0 100644 --- a/tests/test-c32srtombs.c +++ b/tests/test-c32srtombs.c @@ -203,7 +203,7 @@ main (int argc, char *argv[]) return 1; } - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-c32stombs.c b/tests/test-c32stombs.c index b7cc13ca42..0b7f78812e 100644 --- a/tests/test-c32stombs.c +++ b/tests/test-c32stombs.c @@ -174,7 +174,7 @@ main (int argc, char *argv[]) return 1; } - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-c32swidth.c b/tests/test-c32swidth.c index c90915bc90..33bdd655a3 100644 --- a/tests/test-c32swidth.c +++ b/tests/test-c32swidth.c @@ -124,5 +124,5 @@ main () ASSERT (w == 4); } - return 0; + return test_exit_status; } diff --git a/tests/test-c32tolower.c b/tests/test-c32tolower.c index 681191b4ad..fd017edb86 100644 --- a/tests/test-c32tolower.c +++ b/tests/test-c32tolower.c @@ -154,7 +154,7 @@ main (int argc, char *argv[]) { case '0': /* C locale; tested above. */ - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -184,7 +184,7 @@ main (int argc, char *argv[]) ASSERT (mb.nbytes == 1); ASSERT (memcmp (mb.buf, "\377", 1) == 0); } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -242,7 +242,7 @@ main (int argc, char *argv[]) ASSERT (mb.nbytes == 2); ASSERT (memcmp (mb.buf, "\243\347", 2) == 0); } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -332,7 +332,7 @@ main (int argc, char *argv[]) ASSERT (mb.nbytes == 4); ASSERT (memcmp (mb.buf, "\363\240\201\241", 4) == 0); } - return 0; + return test_exit_status; case '4': /* Locale encoding is GB18030. */ @@ -432,7 +432,7 @@ main (int argc, char *argv[]) ASSERT (mb.nbytes == 4); ASSERT (memcmp (mb.buf, "\323\066\237\065", 4) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-c32toupper.c b/tests/test-c32toupper.c index ef57cd76ef..062b916c4f 100644 --- a/tests/test-c32toupper.c +++ b/tests/test-c32toupper.c @@ -154,7 +154,7 @@ main (int argc, char *argv[]) { case '0': /* C locale; tested above. */ - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -188,7 +188,7 @@ main (int argc, char *argv[]) ASSERT (memcmp (mb.buf, "\377", 1) == 0); #endif } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -250,7 +250,7 @@ main (int argc, char *argv[]) ASSERT (memcmp (mb.buf, "\243\307", 2) == 0); #endif } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -344,7 +344,7 @@ main (int argc, char *argv[]) ASSERT (mb.nbytes == 4); ASSERT (memcmp (mb.buf, "\363\240\201\241", 4) == 0); } - return 0; + return test_exit_status; case '4': /* Locale encoding is GB18030. */ @@ -446,7 +446,7 @@ main (int argc, char *argv[]) ASSERT (mb.nbytes == 4); ASSERT (memcmp (mb.buf, "\323\066\237\065", 4) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-c32width.c b/tests/test-c32width.c index 4ebc1afa7e..49081a903b 100644 --- a/tests/test-c32width.c +++ b/tests/test-c32width.c @@ -100,5 +100,5 @@ main () #endif } - return 0; + return test_exit_status; } diff --git a/tests/test-call_once1.c b/tests/test-call_once1.c index 9e20453303..6bb1022a35 100644 --- a/tests/test-call_once1.c +++ b/tests/test-call_once1.c @@ -39,5 +39,5 @@ main () ASSERT (a == 42); - return 0; + return test_exit_status; } diff --git a/tests/test-call_once2.c b/tests/test-call_once2.c index a20e189488..bb780bb67e 100644 --- a/tests/test-call_once2.c +++ b/tests/test-call_once2.c @@ -251,5 +251,5 @@ main () test_once (); printf (" OK\n"); fflush (stdout); - return 0; + return test_exit_status; } diff --git a/tests/test-calloc-gnu.c b/tests/test-calloc-gnu.c index cf8c564a53..c356dfdef7 100644 --- a/tests/test-calloc-gnu.c +++ b/tests/test-calloc-gnu.c @@ -69,5 +69,5 @@ main () } } - return 0; + return test_exit_status; } diff --git a/tests/test-canonicalize-lgpl.c b/tests/test-canonicalize-lgpl.c index 21211e5eac..e388154d55 100644 --- a/tests/test-canonicalize-lgpl.c +++ b/tests/test-canonicalize-lgpl.c @@ -294,5 +294,5 @@ main (void) ASSERT (remove (BASE) == 0); ASSERT (remove ("ise") == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-canonicalize.c b/tests/test-canonicalize.c index 5d19285c00..cdd428259d 100644 --- a/tests/test-canonicalize.c +++ b/tests/test-canonicalize.c @@ -436,5 +436,5 @@ main (void) ASSERT (remove (BASE) == 0); ASSERT (remove ("ise") == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-carray_list.c b/tests/test-carray_list.c index 24f51003e9..18ae341cf4 100644 --- a/tests/test-carray_list.c +++ b/tests/test-carray_list.c @@ -455,5 +455,5 @@ main (int argc, char *argv[]) free (contents); } - return 0; + return test_exit_status; } diff --git a/tests/test-cbrt-ieee.c b/tests/test-cbrt-ieee.c index f619c30bfc..e7833805b6 100644 --- a/tests/test-cbrt-ieee.c +++ b/tests/test-cbrt-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-cbrt.c b/tests/test-cbrt.c index 61e0e32ca4..ea702c8302 100644 --- a/tests/test-cbrt.c +++ b/tests/test-cbrt.c @@ -44,5 +44,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-cbrtf-ieee.c b/tests/test-cbrtf-ieee.c index 43f905ca40..a18181a04c 100644 --- a/tests/test-cbrtf-ieee.c +++ b/tests/test-cbrtf-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-cbrtf.c b/tests/test-cbrtf.c index 2f51dc112d..0e389a3fe4 100644 --- a/tests/test-cbrtf.c +++ b/tests/test-cbrtf.c @@ -44,5 +44,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-cbrtl-ieee.c b/tests/test-cbrtl-ieee.c index d4cc9bc209..4f8bf59d32 100644 --- a/tests/test-cbrtl-ieee.c +++ b/tests/test-cbrtl-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-cbrtl.c b/tests/test-cbrtl.c index 13925804c8..14d4e893ae 100644 --- a/tests/test-cbrtl.c +++ b/tests/test-cbrtl.c @@ -44,5 +44,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-ceil-ieee.c b/tests/test-ceil-ieee.c index 80fa0ff57d..36590500ad 100644 --- a/tests/test-ceil-ieee.c +++ b/tests/test-ceil-ieee.c @@ -50,5 +50,5 @@ main () ASSERT (ceil (Infinityd ()) == Infinityd ()); ASSERT (ceil (- Infinityd ()) == - Infinityd ()); - return 0; + return test_exit_status; } diff --git a/tests/test-ceil1.c b/tests/test-ceil1.c index 8a569c9db3..6daf8f3f83 100644 --- a/tests/test-ceil1.c +++ b/tests/test-ceil1.c @@ -64,5 +64,5 @@ main () /* NaNs. */ ASSERT (isnand (ceil (NaNd ()))); - return 0; + return test_exit_status; } diff --git a/tests/test-ceil2.c b/tests/test-ceil2.c index 1e207d5987..1e404f27fa 100644 --- a/tests/test-ceil2.c +++ b/tests/test-ceil2.c @@ -168,5 +168,5 @@ main () >> NUM_HIGHBITS); error |= check (janus.f); } - return (error ? 1 : 0); + return (error ? 1 : test_exit_status); } diff --git a/tests/test-ceilf-ieee.c b/tests/test-ceilf-ieee.c index dc115e0dad..4240b82f1a 100644 --- a/tests/test-ceilf-ieee.c +++ b/tests/test-ceilf-ieee.c @@ -63,5 +63,5 @@ main (int argc, _GL_UNUSED char **argv) ASSERT (ceilf (Infinityf ()) == Infinityf ()); ASSERT (ceilf (- Infinityf ()) == - Infinityf ()); - return 0; + return test_exit_status; } diff --git a/tests/test-ceilf1.c b/tests/test-ceilf1.c index 2c632c1f02..76c90dae5c 100644 --- a/tests/test-ceilf1.c +++ b/tests/test-ceilf1.c @@ -75,5 +75,5 @@ main (int argc, _GL_UNUSED char **argv) /* NaNs. */ ASSERT (isnanf (my_ceilf (NaNf ()))); - return 0; + return test_exit_status; } diff --git a/tests/test-ceilf2.c b/tests/test-ceilf2.c index 385edb54f2..0892cbf4be 100644 --- a/tests/test-ceilf2.c +++ b/tests/test-ceilf2.c @@ -168,5 +168,5 @@ main () >> NUM_HIGHBITS); error |= check (janus.f); } - return (error ? 1 : 0); + return (error ? 1 : test_exit_status); } diff --git a/tests/test-ceill-ieee.c b/tests/test-ceill-ieee.c index f19cde48af..1c5ce2d1bf 100644 --- a/tests/test-ceill-ieee.c +++ b/tests/test-ceill-ieee.c @@ -55,5 +55,5 @@ main () ASSERT (ceill (Infinityl ()) == Infinityl ()); ASSERT (ceill (- Infinityl ()) == - Infinityl ()); - return 0; + return test_exit_status; } diff --git a/tests/test-ceill.c b/tests/test-ceill.c index 760b374044..95c1ea7c57 100644 --- a/tests/test-ceill.c +++ b/tests/test-ceill.c @@ -69,5 +69,5 @@ main () /* NaNs. */ ASSERT (isnanl (ceill (NaNl ()))); - return 0; + return test_exit_status; } diff --git a/tests/test-chdir.c b/tests/test-chdir.c index 25d168b1af..5fc44a53d5 100644 --- a/tests/test-chdir.c +++ b/tests/test-chdir.c @@ -29,5 +29,5 @@ main (void) { ASSERT (chdir ("/") == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-chmod.c b/tests/test-chmod.c index 64a37834af..61e7d9a9e8 100644 --- a/tests/test-chmod.c +++ b/tests/test-chmod.c @@ -83,5 +83,5 @@ main (void) unlink (BASE "link"); } - return 0; + return test_exit_status; } diff --git a/tests/test-chown.c b/tests/test-chown.c index 4d65336349..0e62b7114b 100644 --- a/tests/test-chown.c +++ b/tests/test-chown.c @@ -44,5 +44,6 @@ main (void) /* Remove any leftovers from a previous partial run. */ ignore_value (system ("rm -rf " BASE "*")); - return test_chown (chown, true); + int result = test_chown (chown, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-cloexec.c b/tests/test-cloexec.c index 76480bb6b2..df2e11fad0 100644 --- a/tests/test-cloexec.c +++ b/tests/test-cloexec.c @@ -148,5 +148,5 @@ main (void) ASSERT (close (fd) == 0); ASSERT (unlink (file) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-close.c b/tests/test-close.c index 47b3aa45ed..b796e0d200 100644 --- a/tests/test-close.c +++ b/tests/test-close.c @@ -41,5 +41,5 @@ main (void) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-cnd.c b/tests/test-cnd.c index 3dccb6482d..61a86a859c 100644 --- a/tests/test-cnd.c +++ b/tests/test-cnd.c @@ -205,5 +205,5 @@ main () printf (" OK\n"); fflush (stdout); #endif - return 0; + return test_exit_status; } diff --git a/tests/test-connect.c b/tests/test-connect.c index ea4b66ed6d..018229aaf9 100644 --- a/tests/test-connect.c +++ b/tests/test-connect.c @@ -56,5 +56,5 @@ main (void) } } - return 0; + return test_exit_status; } diff --git a/tests/test-copy-acl.c b/tests/test-copy-acl.c index f19e7bd36a..4ca9210890 100644 --- a/tests/test-copy-acl.c +++ b/tests/test-copy-acl.c @@ -69,5 +69,5 @@ main (int argc, char *argv[]) close (fd2); close (fd1); - return 0; + return test_exit_status; } diff --git a/tests/test-copy-file.c b/tests/test-copy-file.c index 82869b12b6..a9a811e9d4 100644 --- a/tests/test-copy-file.c +++ b/tests/test-copy-file.c @@ -42,5 +42,5 @@ main (int argc, char *argv[]) else copy_file_preserving (file1, file2); - return 0; + return test_exit_status; } diff --git a/tests/test-copysign.c b/tests/test-copysign.c index cf291f80d6..cd4a743595 100644 --- a/tests/test-copysign.c +++ b/tests/test-copysign.c @@ -107,5 +107,5 @@ main () ASSERT (z == 0.0); ASSERT (memcmp (&z, &zero, sizeof z) != 0); - return 0; + return test_exit_status; } diff --git a/tests/test-copysignf.c b/tests/test-copysignf.c index 8a0c51f46f..eb3d29a872 100644 --- a/tests/test-copysignf.c +++ b/tests/test-copysignf.c @@ -107,5 +107,5 @@ main () ASSERT (z == 0.0f); ASSERT (memcmp (&z, &zero, sizeof z) != 0); - return 0; + return test_exit_status; } diff --git a/tests/test-copysignl.c b/tests/test-copysignl.c index b2b78aa849..8f5f188872 100644 --- a/tests/test-copysignl.c +++ b/tests/test-copysignl.c @@ -107,5 +107,5 @@ main () ASSERT (z == 0.0L); ASSERT (memcmp (&z, &zero, sizeof z) != 0); - return 0; + return test_exit_status; } diff --git a/tests/test-cos.c b/tests/test-cos.c index 5025d6ce85..02800ee30e 100644 --- a/tests/test-cos.c +++ b/tests/test-cos.c @@ -36,5 +36,5 @@ main () y = cos (x); ASSERT (y >= 0.8253356149 && y <= 0.8253356150); - return 0; + return test_exit_status; } diff --git a/tests/test-cosf.c b/tests/test-cosf.c index 2aa43661f8..e2dada3e90 100644 --- a/tests/test-cosf.c +++ b/tests/test-cosf.c @@ -36,5 +36,5 @@ main () y = cosf (x); ASSERT (y >= 0.8253355f && y <= 0.8253357f); - return 0; + return test_exit_status; } diff --git a/tests/test-cosh.c b/tests/test-cosh.c index 432679c51e..2a0ace2bf9 100644 --- a/tests/test-cosh.c +++ b/tests/test-cosh.c @@ -36,5 +36,5 @@ main () y = cosh (x); ASSERT (y >= 1.185465218 && y <= 1.185465219); - return 0; + return test_exit_status; } diff --git a/tests/test-coshf.c b/tests/test-coshf.c index 4c8d090146..52126d448b 100644 --- a/tests/test-coshf.c +++ b/tests/test-coshf.c @@ -36,5 +36,5 @@ main () y = coshf (x); ASSERT (y >= 1.1854652f && y <= 1.1854653f); - return 0; + return test_exit_status; } diff --git a/tests/test-cosl.c b/tests/test-cosl.c index aaabf5947e..5487ad8157 100644 --- a/tests/test-cosl.c +++ b/tests/test-cosl.c @@ -41,5 +41,5 @@ main () y = cosl (x); ASSERT (y >= 0.8253356149L && y <= 0.8253356150L); - return 0; + return test_exit_status; } diff --git a/tests/test-count-leading-zeros.c b/tests/test-count-leading-zeros.c index f748c01449..0bdca6bc4d 100644 --- a/tests/test-count-leading-zeros.c +++ b/tests/test-count-leading-zeros.c @@ -71,5 +71,5 @@ main (int argc, char *argv[]) TEST_COUNT_LEADING_ZEROS (count_leading_zeros_ll, unsigned long long int, ULLONG_BIT, ULLONG_MAX, 1ULL); - return 0; + return test_exit_status; } diff --git a/tests/test-count-one-bits.c b/tests/test-count-one-bits.c index df0e96704e..1c80d1ad88 100644 --- a/tests/test-count-one-bits.c +++ b/tests/test-count-one-bits.c @@ -69,5 +69,5 @@ main (int argc, char *argv[]) TEST_COUNT_ONE_BITS (count_one_bits_ll, unsigned long long int, ULLONG_BIT, ULLONG_MAX, 1ULL); - return 0; + return test_exit_status; } diff --git a/tests/test-count-trailing-zeros.c b/tests/test-count-trailing-zeros.c index 37f905fa44..977d1a9b19 100644 --- a/tests/test-count-trailing-zeros.c +++ b/tests/test-count-trailing-zeros.c @@ -71,5 +71,5 @@ main (int argc, char *argv[]) TEST_COUNT_TRAILING_ZEROS (count_trailing_zeros_ll, unsigned long long int, ULLONG_BIT, ULLONG_MAX, 1ULL); - return 0; + return test_exit_status; } diff --git a/tests/test-creat.c b/tests/test-creat.c index 5f520c14d2..62ec461c62 100644 --- a/tests/test-creat.c +++ b/tests/test-creat.c @@ -58,5 +58,5 @@ main (void) ASSERT (unlink (BASE "file") == 0); ASSERT (unlink (BASE "e.exe") == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-di-set.c b/tests/test-di-set.c index 2c826951a3..e16a11de14 100644 --- a/tests/test-di-set.c +++ b/tests/test-di-set.c @@ -52,5 +52,5 @@ main (void) di_set_free (dis); - return 0; + return test_exit_status; } diff --git a/tests/test-dirent-safer.c b/tests/test-dirent-safer.c index c927e6f094..f9fc10731d 100644 --- a/tests/test-dirent-safer.c +++ b/tests/test-dirent-safer.c @@ -90,5 +90,5 @@ main (void) ASSERT (close (dfd) == 0); #endif - return 0; + return test_exit_status; } diff --git a/tests/test-dirfd.c b/tests/test-dirfd.c index 0cfac8427f..132b378a88 100644 --- a/tests/test-dirfd.c +++ b/tests/test-dirfd.c @@ -42,6 +42,6 @@ main () int fd = dirfd (d); ASSERT (fd >= 0); - return 0; + return test_exit_status; #endif } diff --git a/tests/test-dprintf-gnu.c b/tests/test-dprintf-gnu.c index feb328aa13..9f59c1cafd 100644 --- a/tests/test-dprintf-gnu.c +++ b/tests/test-dprintf-gnu.c @@ -93,5 +93,5 @@ int main (int argc, char *argv[]) { test_function (dprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-dprintf-posix.c b/tests/test-dprintf-posix.c index 7e19656ebc..83c1587daf 100644 --- a/tests/test-dprintf-posix.c +++ b/tests/test-dprintf-posix.c @@ -168,5 +168,5 @@ int main (int argc, char *argv[]) { test_function (dprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-dprintf.c b/tests/test-dprintf.c index eea134e4fe..1ce67d4d23 100644 --- a/tests/test-dprintf.c +++ b/tests/test-dprintf.c @@ -42,5 +42,5 @@ main (int argc, char *argv[]) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-dup-safer.c b/tests/test-dup-safer.c index 6ef6a2d30a..ec2cb908ba 100644 --- a/tests/test-dup-safer.c +++ b/tests/test-dup-safer.c @@ -179,5 +179,5 @@ main (void) ASSERT (close (fd) == 0); ASSERT (unlink (witness) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-dup.c b/tests/test-dup.c index cb312020ba..bf3f519bb8 100644 --- a/tests/test-dup.c +++ b/tests/test-dup.c @@ -41,5 +41,5 @@ main (void) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-dup2.c b/tests/test-dup2.c index 55f3194023..be1e022a0a 100644 --- a/tests/test-dup2.c +++ b/tests/test-dup2.c @@ -228,5 +228,5 @@ main (void) ASSERT (close (fd) == 0); ASSERT (unlink (file) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-dup3.c b/tests/test-dup3.c index 5d92b9fcc0..738046359b 100644 --- a/tests/test-dup3.c +++ b/tests/test-dup3.c @@ -168,5 +168,5 @@ main () ASSERT (unlink (file) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-duplocale.c b/tests/test-duplocale.c index cbd788bdb2..803772b662 100644 --- a/tests/test-duplocale.c +++ b/tests/test-duplocale.c @@ -230,7 +230,7 @@ main () return 77; } - return 0; + return test_exit_status; } #else diff --git a/tests/test-dynarray.c b/tests/test-dynarray.c index 024bef2df7..66ab3390c5 100644 --- a/tests/test-dynarray.c +++ b/tests/test-dynarray.c @@ -49,5 +49,5 @@ main () } intseq_free (&s); - return 0; + return test_exit_status; } diff --git a/tests/test-endian.c b/tests/test-endian.c index 739b18964e..b0156121d6 100644 --- a/tests/test-endian.c +++ b/tests/test-endian.c @@ -209,5 +209,5 @@ main (void) test_convert_eval_once (); test_convert_double (); - return 0; + return test_exit_status; } diff --git a/tests/test-erf.c b/tests/test-erf.c index 5fc26addb8..337513ca35 100644 --- a/tests/test-erf.c +++ b/tests/test-erf.c @@ -36,5 +36,5 @@ main () y = erf (x); ASSERT (y >= 0.6038560908 && y <= 0.6038560909); - return 0; + return test_exit_status; } diff --git a/tests/test-erfc.c b/tests/test-erfc.c index d65f05c016..a48fa99f94 100644 --- a/tests/test-erfc.c +++ b/tests/test-erfc.c @@ -36,5 +36,5 @@ main () y = erfc (x); ASSERT (y >= 0.3961439091 && y <= 0.3961439092); - return 0; + return test_exit_status; } diff --git a/tests/test-error.c b/tests/test-error.c index 02704d7c69..4a1399b292 100644 --- a/tests/test-error.c +++ b/tests/test-error.c @@ -85,5 +85,5 @@ main () /* Test error() function with nonzero STATUS. */ error (4, 0, "fatal error"); - return 0; + return test_exit_status; } diff --git a/tests/test-euidaccess.c b/tests/test-euidaccess.c index 204313204c..8c531439a8 100644 --- a/tests/test-euidaccess.c +++ b/tests/test-euidaccess.c @@ -36,5 +36,5 @@ main () { test_access (euidaccess); - return 0; + return test_exit_status; } diff --git a/tests/test-execinfo.c b/tests/test-execinfo.c index 5745306ed5..ad9ac180e6 100644 --- a/tests/test-execinfo.c +++ b/tests/test-execinfo.c @@ -64,5 +64,5 @@ main (void) printf ("\nTruncated stack trace:\n"); fflush (stdout); test_backtrace (1); - return 0; + return test_exit_status; } diff --git a/tests/test-execute-main.c b/tests/test-execute-main.c index 67c00ee6f3..4703941bea 100644 --- a/tests/test-execute-main.c +++ b/tests/test-execute-main.c @@ -495,5 +495,5 @@ main (int argc, char *argv[]) default: ASSERT (false); } - return 0; + return test_exit_status; } diff --git a/tests/test-execute-script.c b/tests/test-execute-script.c index 150abffb1d..b9d381d573 100644 --- a/tests/test-execute-script.c +++ b/tests/test-execute-script.c @@ -63,6 +63,9 @@ main () } } + if (test_exit_status) + return test_exit_status; + #if defined _WIN32 && !defined __CYGWIN__ /* On native Windows, scripts - even with '#!' marker - are not executable. Only .bat and .cmd files are. */ @@ -89,6 +92,6 @@ main () ASSERT (unlink (DATA_FILENAME) == 0); - return 0; + return test_exit_status; #endif } diff --git a/tests/test-exp-ieee.c b/tests/test-exp-ieee.c index 6259ae05a9..1b2edca559 100644 --- a/tests/test-exp-ieee.c +++ b/tests/test-exp-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-exp.c b/tests/test-exp.c index 08459a158d..158e5d1705 100644 --- a/tests/test-exp.c +++ b/tests/test-exp.c @@ -44,5 +44,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-exp2-ieee.c b/tests/test-exp2-ieee.c index db3dc569e1..f1b847ad64 100644 --- a/tests/test-exp2-ieee.c +++ b/tests/test-exp2-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-exp2.c b/tests/test-exp2.c index 12c4437b4c..a42bab96af 100644 --- a/tests/test-exp2.c +++ b/tests/test-exp2.c @@ -46,5 +46,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-exp2f-ieee.c b/tests/test-exp2f-ieee.c index 53deb02682..472dcccfc8 100644 --- a/tests/test-exp2f-ieee.c +++ b/tests/test-exp2f-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-exp2f.c b/tests/test-exp2f.c index 693dc752f7..8981058b65 100644 --- a/tests/test-exp2f.c +++ b/tests/test-exp2f.c @@ -46,5 +46,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-exp2l-ieee.c b/tests/test-exp2l-ieee.c index 2117a04edc..c6f11bf394 100644 --- a/tests/test-exp2l-ieee.c +++ b/tests/test-exp2l-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-exp2l.c b/tests/test-exp2l.c index 94a1dd9846..3eb1162427 100644 --- a/tests/test-exp2l.c +++ b/tests/test-exp2l.c @@ -51,5 +51,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-expf-ieee.c b/tests/test-expf-ieee.c index 81583da0b2..a739d656f3 100644 --- a/tests/test-expf-ieee.c +++ b/tests/test-expf-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-expf.c b/tests/test-expf.c index dccf9c7c79..8045e12226 100644 --- a/tests/test-expf.c +++ b/tests/test-expf.c @@ -44,5 +44,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-expl-ieee.c b/tests/test-expl-ieee.c index 4b97404213..e703bb45c3 100644 --- a/tests/test-expl-ieee.c +++ b/tests/test-expl-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-expl.c b/tests/test-expl.c index 24f439153f..0f659f958a 100644 --- a/tests/test-expl.c +++ b/tests/test-expl.c @@ -49,5 +49,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-explicit_bzero.c b/tests/test-explicit_bzero.c index b4c98b6652..1c0fd8e6e2 100644 --- a/tests/test-explicit_bzero.c +++ b/tests/test-explicit_bzero.c @@ -233,5 +233,5 @@ main () test_heap (); test_stack (); - return 0; + return test_exit_status; } diff --git a/tests/test-expm1-ieee.c b/tests/test-expm1-ieee.c index feb2e332fb..b63e7837cf 100644 --- a/tests/test-expm1-ieee.c +++ b/tests/test-expm1-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-expm1.c b/tests/test-expm1.c index dd118fb911..ccab5171d6 100644 --- a/tests/test-expm1.c +++ b/tests/test-expm1.c @@ -45,5 +45,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-expm1f-ieee.c b/tests/test-expm1f-ieee.c index 6061a2e6c0..0d628295aa 100644 --- a/tests/test-expm1f-ieee.c +++ b/tests/test-expm1f-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-expm1f.c b/tests/test-expm1f.c index 4acf2a4de2..e23d66ddd2 100644 --- a/tests/test-expm1f.c +++ b/tests/test-expm1f.c @@ -45,5 +45,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-expm1l-ieee.c b/tests/test-expm1l-ieee.c index 68fe36ec02..357b050e4a 100644 --- a/tests/test-expm1l-ieee.c +++ b/tests/test-expm1l-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-expm1l.c b/tests/test-expm1l.c index 87a2160639..09ea3edb75 100644 --- a/tests/test-expm1l.c +++ b/tests/test-expm1l.c @@ -50,5 +50,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-fabs-ieee.c b/tests/test-fabs-ieee.c index f26da631c3..6c8e436308 100644 --- a/tests/test-fabs-ieee.c +++ b/tests/test-fabs-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-fabs.c b/tests/test-fabs.c index 1393ee1218..1a2a74a395 100644 --- a/tests/test-fabs.c +++ b/tests/test-fabs.c @@ -50,5 +50,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-fabsf-ieee.c b/tests/test-fabsf-ieee.c index 8fcecd84ed..fe08225a96 100644 --- a/tests/test-fabsf-ieee.c +++ b/tests/test-fabsf-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-fabsf.c b/tests/test-fabsf.c index 80069a4c24..97aa74fc3e 100644 --- a/tests/test-fabsf.c +++ b/tests/test-fabsf.c @@ -50,5 +50,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-fabsl-ieee.c b/tests/test-fabsl-ieee.c index 680a73a480..63b85ba4aa 100644 --- a/tests/test-fabsl-ieee.c +++ b/tests/test-fabsl-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-fabsl.c b/tests/test-fabsl.c index 4b41983f11..5356960ba7 100644 --- a/tests/test-fabsl.c +++ b/tests/test-fabsl.c @@ -50,5 +50,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-faccessat.c b/tests/test-faccessat.c index caea4be484..33df8620cc 100644 --- a/tests/test-faccessat.c +++ b/tests/test-faccessat.c @@ -97,5 +97,5 @@ main (void) unlink (BASE "link1"); unlink (BASE "file"); - return 0; + return test_exit_status; } diff --git a/tests/test-fbufmode.c b/tests/test-fbufmode.c index 40b90f8805..20ca02a15c 100644 --- a/tests/test-fbufmode.c +++ b/tests/test-fbufmode.c @@ -96,7 +96,7 @@ main () if (ret != 0) goto fail; - return 0; + return test_exit_status; fail: return ret; diff --git a/tests/test-fchdir.c b/tests/test-fchdir.c index dc52974537..692ab5194c 100644 --- a/tests/test-fchdir.c +++ b/tests/test-fchdir.c @@ -106,5 +106,5 @@ main (void) } free (cwd); - return 0; + return test_exit_status; } diff --git a/tests/test-fchmod.c b/tests/test-fchmod.c index 6da7103e87..a9a5f96a35 100644 --- a/tests/test-fchmod.c +++ b/tests/test-fchmod.c @@ -64,5 +64,5 @@ main (void) ASSERT (unlink (BASE "file") == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-fchmodat.c b/tests/test-fchmodat.c index 8fdcb8942f..9f6538a9f6 100644 --- a/tests/test-fchmodat.c +++ b/tests/test-fchmodat.c @@ -93,5 +93,5 @@ main (void) ASSERT (unlink (BASE "file") == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-fchown.c b/tests/test-fchown.c index 9c32e1da75..d9e851e706 100644 --- a/tests/test-fchown.c +++ b/tests/test-fchown.c @@ -41,5 +41,5 @@ main (int argc, char *argv[]) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-fchownat.c b/tests/test-fchownat.c index 95a0eee24c..229bfd3dee 100644 --- a/tests/test-fchownat.c +++ b/tests/test-fchownat.c @@ -100,5 +100,6 @@ main (_GL_UNUSED int argc, char *argv[]) ASSERT (close (dfd) == 0); /* FIXME - add additional tests of dfd not at current directory. */ - return result1 | result2; + int result = result1 | result2; + return (result ? result : test_exit_status); } diff --git a/tests/test-fclose.c b/tests/test-fclose.c index 123ea69911..959c89bc0b 100644 --- a/tests/test-fclose.c +++ b/tests/test-fclose.c @@ -112,5 +112,5 @@ main (int argc, char **argv) /* Clean up. */ ASSERT (remove (BASE) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-fcntl-safer.c b/tests/test-fcntl-safer.c index 6997e20fe5..b8babcdef7 100644 --- a/tests/test-fcntl-safer.c +++ b/tests/test-fcntl-safer.c @@ -33,5 +33,6 @@ int main (void) { - return test_open (open, true); + int result = test_open (open, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-fcntl.c b/tests/test-fcntl.c index 0eb24a9f6a..933df99ab6 100644 --- a/tests/test-fcntl.c +++ b/tests/test-fcntl.c @@ -436,6 +436,8 @@ main (int argc, _GL_UNUSED char *argv[]) /* Test whether F_DUPFD_CLOEXEC is effective. */ ASSERT (fcntl (1, F_DUPFD_CLOEXEC, 10) >= 0); + if (test_exit_status) + return test_exit_status; #if defined _WIN32 && !defined __CYGWIN__ return _execl ("./test-fcntl", "./test-fcntl", "child", NULL); #else diff --git a/tests/test-fdatasync.c b/tests/test-fdatasync.c index c70a1d4bcd..3d55a7105b 100644 --- a/tests/test-fdatasync.c +++ b/tests/test-fdatasync.c @@ -77,5 +77,5 @@ main (void) ASSERT (unlink (file) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-fdopen.c b/tests/test-fdopen.c index e5aa6442a1..5e5a7d2749 100644 --- a/tests/test-fdopen.c +++ b/tests/test-fdopen.c @@ -50,5 +50,5 @@ main (void) } } - return 0; + return test_exit_status; } diff --git a/tests/test-fdopendir.c b/tests/test-fdopendir.c index c92e5db4d3..5dd8a4a967 100644 --- a/tests/test-fdopendir.c +++ b/tests/test-fdopendir.c @@ -76,5 +76,5 @@ main () ASSERT (dup2 (fd, fd) == -1); ASSERT (errno == EBADF); - return 0; + return test_exit_status; } diff --git a/tests/test-fdutimensat.c b/tests/test-fdutimensat.c index 56a7b49e0a..a21e297f03 100644 --- a/tests/test-fdutimensat.c +++ b/tests/test-fdutimensat.c @@ -146,5 +146,6 @@ main (void) ASSERT (chdir ("..") == 0); ASSERT (unlink (BASE "dir/file") == 0); ASSERT (rmdir (BASE "dir") == 0); - return result1 | result2 | result3; + int result = result1 | result2 | result3; + return (result ? result : test_exit_status); } diff --git a/tests/test-fenv-env-2.c b/tests/test-fenv-env-2.c index f1cc482608..98d4c7f001 100644 --- a/tests/test-fenv-env-2.c +++ b/tests/test-fenv-env-2.c @@ -135,6 +135,6 @@ main () a = 0; b = a / a; } - return 0; + return test_exit_status; #endif } diff --git a/tests/test-fenv-env-3.c b/tests/test-fenv-env-3.c index 7dbe93b465..d88013c507 100644 --- a/tests/test-fenv-env-3.c +++ b/tests/test-fenv-env-3.c @@ -153,6 +153,6 @@ main () a = 0; b = a / a; } - return 0; + return test_exit_status; #endif } diff --git a/tests/test-fenv-env-4.c b/tests/test-fenv-env-4.c index af75fc0215..ab75305c5f 100644 --- a/tests/test-fenv-env-4.c +++ b/tests/test-fenv-env-4.c @@ -138,6 +138,6 @@ main () } # endif - return 0; + return test_exit_status; #endif } diff --git a/tests/test-fenv-env-5.c b/tests/test-fenv-env-5.c index 4c6980e254..5d4fc520e3 100644 --- a/tests/test-fenv-env-5.c +++ b/tests/test-fenv-env-5.c @@ -153,6 +153,6 @@ main () } # endif - return 0; + return test_exit_status; #endif } diff --git a/tests/test-fenv-env-6.c b/tests/test-fenv-env-6.c index c366516616..39b01f0444 100644 --- a/tests/test-fenv-env-6.c +++ b/tests/test-fenv-env-6.c @@ -60,7 +60,7 @@ main () env1 has trapping on FE_INVALID enabled, this should trap. */ ASSERT (feupdateenv (&env1) == 0); - return 0; + return test_exit_status; } #else diff --git a/tests/test-fenv-except-state-2.c b/tests/test-fenv-except-state-2.c index 244c44d0df..79b6f9fd38 100644 --- a/tests/test-fenv-except-state-2.c +++ b/tests/test-fenv-except-state-2.c @@ -119,5 +119,5 @@ main () /* Check that it's clear in both units. */ ASSERT (fetestexcept (FE_INVALID) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-fenv-except-state-3.c b/tests/test-fenv-except-state-3.c index 7707de5bda..7298be4007 100644 --- a/tests/test-fenv-except-state-3.c +++ b/tests/test-fenv-except-state-3.c @@ -78,7 +78,7 @@ main () a = 1.0; b = a + a; al = 1.0L; bl = al + al; - return 0; + return test_exit_status; } #else diff --git a/tests/test-fenv-except-state-4.c b/tests/test-fenv-except-state-4.c index 36995548ca..fa7afb298a 100644 --- a/tests/test-fenv-except-state-4.c +++ b/tests/test-fenv-except-state-4.c @@ -66,5 +66,5 @@ main () ASSERT (fetestexceptflag (&saved_flags_2, FE_INVALID) == FE_INVALID); ASSERT (fetestexceptflag (&saved_flags_2, FE_OVERFLOW) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-fenv-except-tracking-1.c b/tests/test-fenv-except-tracking-1.c index 70bdda563a..c0092d28b9 100644 --- a/tests/test-fenv-except-tracking-1.c +++ b/tests/test-fenv-except-tracking-1.c @@ -254,5 +254,5 @@ main () #endif - return 0; + return test_exit_status; } diff --git a/tests/test-fenv-except-tracking-2.c b/tests/test-fenv-except-tracking-2.c index 2db4949882..544a286e0f 100644 --- a/tests/test-fenv-except-tracking-2.c +++ b/tests/test-fenv-except-tracking-2.c @@ -88,7 +88,7 @@ main (int argc, char *argv[]) break; } - return 0; + return test_exit_status; } #else diff --git a/tests/test-fenv-except-tracking-3.c b/tests/test-fenv-except-tracking-3.c index 10fbca683d..d7fbde414c 100644 --- a/tests/test-fenv-except-tracking-3.c +++ b/tests/test-fenv-except-tracking-3.c @@ -65,7 +65,7 @@ main (int argc, char *argv[]) feraiseexcept (exception); } - return 0; + return test_exit_status; } #else diff --git a/tests/test-fenv-except-tracking-4.c b/tests/test-fenv-except-tracking-4.c index 060d036b07..5f77f830d9 100644 --- a/tests/test-fenv-except-tracking-4.c +++ b/tests/test-fenv-except-tracking-4.c @@ -95,5 +95,5 @@ main () ASSERT (fetestexcept (FE_INEXACT) == FE_INEXACT); - return 0; + return test_exit_status; } diff --git a/tests/test-fenv-except-tracking-5.c b/tests/test-fenv-except-tracking-5.c index 409c06c92b..fe8b6063e6 100644 --- a/tests/test-fenv-except-tracking-5.c +++ b/tests/test-fenv-except-tracking-5.c @@ -64,7 +64,7 @@ main () a = 1.0; b = a + a; al = 1.0L; bl = al + al; - return 0; + return test_exit_status; } #else diff --git a/tests/test-fenv-except-trapping-1.c b/tests/test-fenv-except-trapping-1.c index 4d4b67972a..2fde5587fa 100644 --- a/tests/test-fenv-except-trapping-1.c +++ b/tests/test-fenv-except-trapping-1.c @@ -69,5 +69,5 @@ main () ASSERT (feenableexcept (0) == uint_to_exceptions (c)); } - return 0; + return test_exit_status; } diff --git a/tests/test-fenv-except-trapping-2.c b/tests/test-fenv-except-trapping-2.c index 257107d2ee..d97567bc1e 100644 --- a/tests/test-fenv-except-trapping-2.c +++ b/tests/test-fenv-except-trapping-2.c @@ -507,7 +507,7 @@ main (int argc, char *argv[]) } } - return 0; + return test_exit_status; skip: fputs ("Skipping test: trapping floating-point exceptions are not supported on this machine.\n", stderr); diff --git a/tests/test-fenv-round.c b/tests/test-fenv-round.c index ce56048e51..a4812ed9b7 100644 --- a/tests/test-fenv-round.c +++ b/tests/test-fenv-round.c @@ -193,5 +193,5 @@ main () test_tonearest (); ASSERT (fegetround () == FE_TONEAREST); - return 0; + return test_exit_status; } diff --git a/tests/test-fflush.c b/tests/test-fflush.c index cef089f274..1a71908963 100644 --- a/tests/test-fflush.c +++ b/tests/test-fflush.c @@ -189,5 +189,5 @@ main (void) /* Clean up. */ unlink ("test-fflush.txt"); - return 0; + return test_exit_status; } diff --git a/tests/test-fflush2.c b/tests/test-fflush2.c index 4f5025a789..2a4248cbcd 100644 --- a/tests/test-fflush2.c +++ b/tests/test-fflush2.c @@ -60,7 +60,7 @@ main (int argc, char **argv) c = fgetc (stdin); ASSERT (c == '/'); - return 0; + return test_exit_status; case '2': /* Check fflush after a non-backup ungetc() call. This is case 2a in @@ -95,7 +95,7 @@ main (int argc, char **argv) c = fgetc (stdin); ASSERT (c == '/'); - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-ffs.c b/tests/test-ffs.c index 9e03978135..02a425819e 100644 --- a/tests/test-ffs.c +++ b/tests/test-ffs.c @@ -64,5 +64,5 @@ main (int argc, char *argv[]) ASSERT (ffs (7U << i) == i + 1); ASSERT (ffs (-7U << i) == i + 1); } - return 0; + return test_exit_status; } diff --git a/tests/test-ffsl.c b/tests/test-ffsl.c index 7efc7f8bd7..31bcababf0 100644 --- a/tests/test-ffsl.c +++ b/tests/test-ffsl.c @@ -64,5 +64,5 @@ main (int argc, char *argv[]) ASSERT (ffsl (7UL << i) == i + 1); ASSERT (ffsl (-7UL << i) == i + 1); } - return 0; + return test_exit_status; } diff --git a/tests/test-ffsll.c b/tests/test-ffsll.c index fe0b37a6e2..ccfec4412e 100644 --- a/tests/test-ffsll.c +++ b/tests/test-ffsll.c @@ -64,5 +64,5 @@ main (int argc, char *argv[]) ASSERT (ffsll (7ULL << i) == i + 1); ASSERT (ffsll (-7ULL << i) == i + 1); } - return 0; + return test_exit_status; } diff --git a/tests/test-fgetc.c b/tests/test-fgetc.c index 0d61798078..fb14451d94 100644 --- a/tests/test-fgetc.c +++ b/tests/test-fgetc.c @@ -97,5 +97,5 @@ main () /* Clean up. */ unlink (filename); - return 0; + return test_exit_status; } diff --git a/tests/test-file-has-acl.c b/tests/test-file-has-acl.c index 444e167c3c..1a10286cd2 100644 --- a/tests/test-file-has-acl.c +++ b/tests/test-file-has-acl.c @@ -70,5 +70,5 @@ main (int argc, char *argv[]) printf ("no\n"); #endif - return 0; + return test_exit_status; } diff --git a/tests/test-filevercmp.c b/tests/test-filevercmp.c index 613ebdff51..20f3626b6a 100644 --- a/tests/test-filevercmp.c +++ b/tests/test-filevercmp.c @@ -202,5 +202,5 @@ main (void) ASSERT (test_filevercmp (*j, *i) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-float.c b/tests/test-float.c index e9dc4609fd..c8006058e4 100644 --- a/tests/test-float.c +++ b/tests/test-float.c @@ -377,7 +377,7 @@ main () END_LONG_DOUBLE_ROUNDING (); } - return 0; + return test_exit_status; } #else diff --git a/tests/test-flock.c b/tests/test-flock.c index 35aa0ce737..8ff301d206 100644 --- a/tests/test-flock.c +++ b/tests/test-flock.c @@ -118,5 +118,5 @@ main (int argc, char *argv[]) ASSERT (close (fd) == 0); ASSERT (unlink (file) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-floor-ieee.c b/tests/test-floor-ieee.c index 796d6c3833..71d4841dc6 100644 --- a/tests/test-floor-ieee.c +++ b/tests/test-floor-ieee.c @@ -50,5 +50,5 @@ main () ASSERT (floor (Infinityd ()) == Infinityd ()); ASSERT (floor (- Infinityd ()) == - Infinityd ()); - return 0; + return test_exit_status; } diff --git a/tests/test-floor1.c b/tests/test-floor1.c index 9dae989e98..2b2910dfab 100644 --- a/tests/test-floor1.c +++ b/tests/test-floor1.c @@ -62,5 +62,5 @@ main (int argc, _GL_UNUSED char **argv) /* NaNs. */ ASSERT (isnand (floor (NaNd ()))); - return 0; + return test_exit_status; } diff --git a/tests/test-floor2.c b/tests/test-floor2.c index b67e84de65..07a368b02d 100644 --- a/tests/test-floor2.c +++ b/tests/test-floor2.c @@ -165,7 +165,7 @@ main () >> NUM_HIGHBITS); error |= check (janus.f); } - return (error ? 1 : 0); + return (error ? 1 : test_exit_status); #else fprintf (stderr, "Skipping test: no 64-bit integer type available\n"); return 77; diff --git a/tests/test-floorf-ieee.c b/tests/test-floorf-ieee.c index 77c72fae6b..87cef458b4 100644 --- a/tests/test-floorf-ieee.c +++ b/tests/test-floorf-ieee.c @@ -63,5 +63,5 @@ main (int argc, _GL_UNUSED char **argv) ASSERT (floorf (Infinityf ()) == Infinityf ()); ASSERT (floorf (- Infinityf ()) == - Infinityf ()); - return 0; + return test_exit_status; } diff --git a/tests/test-floorf1.c b/tests/test-floorf1.c index 4585702cb1..ac8901c8a7 100644 --- a/tests/test-floorf1.c +++ b/tests/test-floorf1.c @@ -75,5 +75,5 @@ main (int argc, _GL_UNUSED char **argv) /* NaNs. */ ASSERT (isnanf (my_floorf (NaNf ()))); - return 0; + return test_exit_status; } diff --git a/tests/test-floorf2.c b/tests/test-floorf2.c index e4a7eb3867..d6166ea7bd 100644 --- a/tests/test-floorf2.c +++ b/tests/test-floorf2.c @@ -164,5 +164,5 @@ main () >> NUM_HIGHBITS); error |= check (janus.f); } - return (error ? 1 : 0); + return (error ? 1 : test_exit_status); } diff --git a/tests/test-floorl-ieee.c b/tests/test-floorl-ieee.c index 043a48165b..dfcc8aeedd 100644 --- a/tests/test-floorl-ieee.c +++ b/tests/test-floorl-ieee.c @@ -55,5 +55,5 @@ main () ASSERT (floorl (Infinityl ()) == Infinityl ()); ASSERT (floorl (- Infinityl ()) == - Infinityl ()); - return 0; + return test_exit_status; } diff --git a/tests/test-floorl.c b/tests/test-floorl.c index fdc99109d1..d7b6fb5ca9 100644 --- a/tests/test-floorl.c +++ b/tests/test-floorl.c @@ -69,5 +69,5 @@ main () /* NaNs. */ ASSERT (isnanl (floorl (NaNl ()))); - return 0; + return test_exit_status; } diff --git a/tests/test-fma-ieee.c b/tests/test-fma-ieee.c index 3dfbb45307..50100e4c60 100644 --- a/tests/test-fma-ieee.c +++ b/tests/test-fma-ieee.c @@ -39,5 +39,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-fma1.c b/tests/test-fma1.c index 7ab5923a93..e156f07ffd 100644 --- a/tests/test-fma1.c +++ b/tests/test-fma1.c @@ -43,5 +43,5 @@ main () { test_function (fma); - return 0; + return test_exit_status; } diff --git a/tests/test-fma2.c b/tests/test-fma2.c index eb4d67dffa..7d3e198434 100644 --- a/tests/test-fma2.c +++ b/tests/test-fma2.c @@ -43,5 +43,5 @@ main () { test_function (fma); - return 0; + return test_exit_status; } diff --git a/tests/test-fmaf-ieee.c b/tests/test-fmaf-ieee.c index 6c0db638ff..db41edfc0c 100644 --- a/tests/test-fmaf-ieee.c +++ b/tests/test-fmaf-ieee.c @@ -39,5 +39,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-fmaf1.c b/tests/test-fmaf1.c index 3bdc256dbd..451337bc02 100644 --- a/tests/test-fmaf1.c +++ b/tests/test-fmaf1.c @@ -43,5 +43,5 @@ main () { test_function (fmaf); - return 0; + return test_exit_status; } diff --git a/tests/test-fmaf2.c b/tests/test-fmaf2.c index 5369ce5ff5..352684c4ce 100644 --- a/tests/test-fmaf2.c +++ b/tests/test-fmaf2.c @@ -43,5 +43,5 @@ main () { test_function (fmaf); - return 0; + return test_exit_status; } diff --git a/tests/test-fmal-ieee.c b/tests/test-fmal-ieee.c index 031055fc05..5eee4ace93 100644 --- a/tests/test-fmal-ieee.c +++ b/tests/test-fmal-ieee.c @@ -39,5 +39,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-fmal1.c b/tests/test-fmal1.c index 22bf9f2c6f..763ce524d7 100644 --- a/tests/test-fmal1.c +++ b/tests/test-fmal1.c @@ -48,5 +48,5 @@ main () test_function (fmal); - return 0; + return test_exit_status; } diff --git a/tests/test-fmal2.c b/tests/test-fmal2.c index b9e0fe7710..8a74779edd 100644 --- a/tests/test-fmal2.c +++ b/tests/test-fmal2.c @@ -48,5 +48,5 @@ main () test_function (fmal); - return 0; + return test_exit_status; } diff --git a/tests/test-fmod-ieee.c b/tests/test-fmod-ieee.c index 82bf385dfe..4f12c91c98 100644 --- a/tests/test-fmod-ieee.c +++ b/tests/test-fmod-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-fmod.c b/tests/test-fmod.c index 10d8ec5db3..c9175792d5 100644 --- a/tests/test-fmod.c +++ b/tests/test-fmod.c @@ -46,5 +46,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-fmodf-ieee.c b/tests/test-fmodf-ieee.c index 08316fe187..2a17e517b2 100644 --- a/tests/test-fmodf-ieee.c +++ b/tests/test-fmodf-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-fmodf.c b/tests/test-fmodf.c index 5360b367e6..38559b2b7a 100644 --- a/tests/test-fmodf.c +++ b/tests/test-fmodf.c @@ -46,5 +46,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-fmodl-ieee.c b/tests/test-fmodl-ieee.c index 8e16e12b2c..c41b294516 100644 --- a/tests/test-fmodl-ieee.c +++ b/tests/test-fmodl-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-fmodl.c b/tests/test-fmodl.c index 3eeb2eea91..9ac990babd 100644 --- a/tests/test-fmodl.c +++ b/tests/test-fmodl.c @@ -51,5 +51,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-fnmatch-w32.c b/tests/test-fnmatch-w32.c index 0ee8a0860f..486e7fe217 100644 --- a/tests/test-fnmatch-w32.c +++ b/tests/test-fnmatch-w32.c @@ -392,11 +392,9 @@ main (int argc, char *argv[]) } if (result == 77) - { - fprintf (stderr, "Skipping test: found no locale with codepage %d\n", - codepage); - } - return result; + fprintf (stderr, "Skipping test: found no locale with codepage %d\n", + codepage); + return (result ? result : test_exit_status); } #else diff --git a/tests/test-fnmatch.c b/tests/test-fnmatch.c index afcad2df44..588d76646e 100644 --- a/tests/test-fnmatch.c +++ b/tests/test-fnmatch.c @@ -615,7 +615,7 @@ main (int argc, char *argv[]) { case '1': /* C or POSIX locale. */ - return 0; + return test_exit_status; case '2': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -671,7 +671,7 @@ main (int argc, char *argv[]) ASSERT (fnmatch ("H\366hLe", "H\326hle", FNM_CASEFOLD) == 0); #endif - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -766,7 +766,7 @@ main (int argc, char *argv[]) } #endif - return 0; + return test_exit_status; case '4': /* Locale encoding is EUC-JP. */ @@ -849,7 +849,7 @@ main (int argc, char *argv[]) } #endif - return 0; + return test_exit_status; case '5': /* Locale encoding is GB18030. */ @@ -956,7 +956,7 @@ main (int argc, char *argv[]) } #endif - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-fopen-gnu.c b/tests/test-fopen-gnu.c index b721d25fb2..6a84b57dd2 100644 --- a/tests/test-fopen-gnu.c +++ b/tests/test-fopen-gnu.c @@ -84,5 +84,5 @@ main (void) ASSERT (unlink (BASE "file") == 0); ASSERT (unlink (BASE "binary") == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-fopen-safer.c b/tests/test-fopen-safer.c index 47ea0d16a5..33dc7a2fc1 100644 --- a/tests/test-fopen-safer.c +++ b/tests/test-fopen-safer.c @@ -27,5 +27,6 @@ int main (void) { - return test_fopen (); + int result = test_fopen (); + return (result ? result : test_exit_status); } diff --git a/tests/test-fopen.c b/tests/test-fopen.c index e687de1a2c..2a03adde99 100644 --- a/tests/test-fopen.c +++ b/tests/test-fopen.c @@ -30,5 +30,6 @@ SIGNATURE_CHECK (fopen, FILE *, (char const *, char const *)); int main (void) { - return test_fopen (); + int result = test_fopen (); + return (result ? result : test_exit_status); } diff --git a/tests/test-fpending.c b/tests/test-fpending.c index 242c7a8754..d8dafaaca9 100644 --- a/tests/test-fpending.c +++ b/tests/test-fpending.c @@ -37,5 +37,5 @@ main (void) fflush (stdout); ASSERT (__fpending (stdout) == 0); - exit (0); + return test_exit_status; } diff --git a/tests/test-fprintf-gnu.c b/tests/test-fprintf-gnu.c index cef09605b5..12f1c90763 100644 --- a/tests/test-fprintf-gnu.c +++ b/tests/test-fprintf-gnu.c @@ -32,5 +32,5 @@ int main (int argc, char *argv[]) { test_function (fprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-fprintf-posix.c b/tests/test-fprintf-posix.c index 794cba76f3..f929faeca7 100644 --- a/tests/test-fprintf-posix.c +++ b/tests/test-fprintf-posix.c @@ -36,5 +36,5 @@ int main (int argc, char *argv[]) { test_function (fprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-fpurge.c b/tests/test-fpurge.c index 6878509882..07663e2e76 100644 --- a/tests/test-fpurge.c +++ b/tests/test-fpurge.c @@ -125,7 +125,7 @@ main (void) } remove (TESTFILE); - return 0; + return test_exit_status; skip: fprintf (stderr, "Skipping test: prerequisite file operations failed.\n"); diff --git a/tests/test-fputc.c b/tests/test-fputc.c index 0d48a92fbc..d8c7b73cae 100644 --- a/tests/test-fputc.c +++ b/tests/test-fputc.c @@ -91,5 +91,5 @@ main () /* Clean up. */ unlink (filename); - return 0; + return test_exit_status; } diff --git a/tests/test-fread.c b/tests/test-fread.c index ac6bdecf40..00a0dfc1a2 100644 --- a/tests/test-fread.c +++ b/tests/test-fread.c @@ -100,5 +100,5 @@ main () /* Clean up. */ unlink (filename); - return 0; + return test_exit_status; } diff --git a/tests/test-freadable.c b/tests/test-freadable.c index f5db4611be..1122053611 100644 --- a/tests/test-freadable.c +++ b/tests/test-freadable.c @@ -109,7 +109,7 @@ main () if (fclose (fp)) goto skip; - return 0; + return test_exit_status; skip: fprintf (stderr, "Skipping test: file operations failed.\n"); diff --git a/tests/test-freadahead.c b/tests/test-freadahead.c index b7a5e7c4ff..27d44bccca 100644 --- a/tests/test-freadahead.c +++ b/tests/test-freadahead.c @@ -73,5 +73,5 @@ main (int argc, char **argv) /* Free memory allocated during ungetc(). */ fclose (stdin); - return 0; + return test_exit_status; } diff --git a/tests/test-freading.c b/tests/test-freading.c index 15dd28736d..86c8d53479 100644 --- a/tests/test-freading.c +++ b/tests/test-freading.c @@ -126,5 +126,5 @@ main (void) ASSERT (!freading (fp)); ASSERT (fclose (fp) == 0); ASSERT (remove (TESTFILE) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-freadptr.c b/tests/test-freadptr.c index 34a56cd6b7..03ca9d7d8c 100644 --- a/tests/test-freadptr.c +++ b/tests/test-freadptr.c @@ -96,5 +96,5 @@ main (int argc, char **argv) /* Free memory allocated during ungetc(). */ fclose (stdin); - return 0; + return test_exit_status; } diff --git a/tests/test-freadptr2.c b/tests/test-freadptr2.c index 3ece18c212..c21651f4fe 100644 --- a/tests/test-freadptr2.c +++ b/tests/test-freadptr2.c @@ -59,5 +59,5 @@ main (int argc, char **argv) ASSERT (freadptrbufsize (stdin) != 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-freadseek.c b/tests/test-freadseek.c index da729e90ad..0da22c67d7 100644 --- a/tests/test-freadseek.c +++ b/tests/test-freadseek.c @@ -94,5 +94,5 @@ main (int argc, char **argv) free (buf3); free (buf1); - return 0; + return test_exit_status; } diff --git a/tests/test-free.c b/tests/test-free.c index 9cc0c7016c..70e481b599 100644 --- a/tests/test-free.c +++ b/tests/test-free.c @@ -178,5 +178,5 @@ main () #endif #endif - return 0; + return test_exit_status; } diff --git a/tests/test-freopen-safer.c b/tests/test-freopen-safer.c index de4e89e674..beac399355 100644 --- a/tests/test-freopen-safer.c +++ b/tests/test-freopen-safer.c @@ -93,5 +93,5 @@ main (void) ASSERT (freopen ("/dev/null", "w+", fp) == fp); ASSERT (STDERR_FILENO < fileno (fp)); - return 0; + return test_exit_status; } diff --git a/tests/test-freopen.c b/tests/test-freopen.c index 54aa2f79aa..caffe8b4ba 100644 --- a/tests/test-freopen.c +++ b/tests/test-freopen.c @@ -82,5 +82,5 @@ main () /* Clean up. */ unlink (filename); - return 0; + return test_exit_status; } diff --git a/tests/test-frexp-ieee.c b/tests/test-frexp-ieee.c index fe7b49cedb..8910a5079c 100644 --- a/tests/test-frexp-ieee.c +++ b/tests/test-frexp-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-frexp.c b/tests/test-frexp.c index 3d6bc30028..a06d6966e6 100644 --- a/tests/test-frexp.c +++ b/tests/test-frexp.c @@ -63,5 +63,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-frexpf-ieee.c b/tests/test-frexpf-ieee.c index 6a9435232f..6d6467ad93 100644 --- a/tests/test-frexpf-ieee.c +++ b/tests/test-frexpf-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-frexpf.c b/tests/test-frexpf.c index 3db0778d29..468345118d 100644 --- a/tests/test-frexpf.c +++ b/tests/test-frexpf.c @@ -58,5 +58,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-frexpl-ieee.c b/tests/test-frexpl-ieee.c index 19a7c25f65..a16dc8bac7 100644 --- a/tests/test-frexpl-ieee.c +++ b/tests/test-frexpl-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-frexpl.c b/tests/test-frexpl.c index ea4e97288f..8f67362f2d 100644 --- a/tests/test-frexpl.c +++ b/tests/test-frexpl.c @@ -74,5 +74,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-fseek.c b/tests/test-fseek.c index 4bcbd930f7..f33cdb4a45 100644 --- a/tests/test-fseek.c +++ b/tests/test-fseek.c @@ -66,5 +66,5 @@ main (int argc, char **argv) ASSERT (fseek (stdin, 0, SEEK_END) == 0); ASSERT (!feof (stdin)); } - return 0; + return test_exit_status; } diff --git a/tests/test-fseeko.c b/tests/test-fseeko.c index 2af31abb03..a251333b95 100644 --- a/tests/test-fseeko.c +++ b/tests/test-fseeko.c @@ -70,5 +70,5 @@ main (int argc, _GL_UNUSED char **argv) ASSERT (fseeko (stdin, 0, SEEK_END) == 0); ASSERT (!feof (stdin)); } - return 0; + return test_exit_status; } diff --git a/tests/test-fseeko3.c b/tests/test-fseeko3.c index 882b466992..6fc86829e3 100644 --- a/tests/test-fseeko3.c +++ b/tests/test-fseeko3.c @@ -47,5 +47,5 @@ main (int argc, char **argv) ASSERT (fclose (fp) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-fseeko4.c b/tests/test-fseeko4.c index 2156ca94a4..cbc55b9fb8 100644 --- a/tests/test-fseeko4.c +++ b/tests/test-fseeko4.c @@ -71,5 +71,5 @@ main (int argc, char **argv) } } - return 0; + return test_exit_status; } diff --git a/tests/test-fstat.c b/tests/test-fstat.c index 7a361b8608..3af63136d8 100644 --- a/tests/test-fstat.c +++ b/tests/test-fstat.c @@ -46,5 +46,5 @@ main () ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-fstatat.c b/tests/test-fstatat.c index 3b5dd43579..65c8010461 100644 --- a/tests/test-fstatat.c +++ b/tests/test-fstatat.c @@ -103,5 +103,5 @@ main (_GL_UNUSED int argc, _GL_UNUSED char *argv[]) if (result == 77) fputs ("skipping test: symlinks not supported on this file system\n", stderr); - return result; + return (result ? result : test_exit_status); } diff --git a/tests/test-fstrcmp.c b/tests/test-fstrcmp.c index 50eebabbaf..7c0114e70b 100644 --- a/tests/test-fstrcmp.c +++ b/tests/test-fstrcmp.c @@ -71,5 +71,5 @@ main (int argc, char *argv[]) ASSERT (check_fstrcmp ("George Bush", "Abraham Lincoln", 2./13.)); ASSERT (check_fstrcmp ("George Bush", "George \"Bugs\" Moran", 2./3.)); - return 0; + return test_exit_status; } diff --git a/tests/test-fsync.c b/tests/test-fsync.c index 4ec4d8aac9..c28a5cc6ab 100644 --- a/tests/test-fsync.c +++ b/tests/test-fsync.c @@ -79,5 +79,5 @@ main (void) ASSERT (unlink (file) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-ftell.c b/tests/test-ftell.c index 06ec0e8be0..34bbd0ccbe 100644 --- a/tests/test-ftell.c +++ b/tests/test-ftell.c @@ -41,7 +41,7 @@ main (int argc, char **argv) if (argc == 1) { ASSERT (ftell (stdin) == -1); - return 0; + return test_exit_status; } /* mingw ftell is unreliable on text mode input. */ @@ -103,5 +103,5 @@ main (int argc, char **argv) ASSERT (ftell (stdin) == ch + 10); #endif - return 0; + return test_exit_status; } diff --git a/tests/test-ftell3.c b/tests/test-ftell3.c index 6f3cffcd4a..44540fde2f 100644 --- a/tests/test-ftell3.c +++ b/tests/test-ftell3.c @@ -69,7 +69,7 @@ main (void) /* The file's contents is now "foogarsh!". */ remove (TESTFILE); - return 0; + return test_exit_status; skip: fprintf (stderr, "Skipping test: prerequisite file operations failed.\n"); diff --git a/tests/test-ftello.c b/tests/test-ftello.c index f4c03a4800..62dbac43c4 100644 --- a/tests/test-ftello.c +++ b/tests/test-ftello.c @@ -114,5 +114,5 @@ main (int argc, _GL_UNUSED char **argv) ASSERT (ftello (stdin) == ch + 10); #endif - return 0; + return test_exit_status; } diff --git a/tests/test-ftello3.c b/tests/test-ftello3.c index f9d8cafd01..e5174fd2b6 100644 --- a/tests/test-ftello3.c +++ b/tests/test-ftello3.c @@ -69,7 +69,7 @@ main (void) /* The file's contents is now "foogarsh!". */ remove (TESTFILE); - return 0; + return test_exit_status; skip: fprintf (stderr, "Skipping test: prerequisite file operations failed.\n"); diff --git a/tests/test-ftello4.c b/tests/test-ftello4.c index 3bd52acd2d..556a9feae4 100644 --- a/tests/test-ftello4.c +++ b/tests/test-ftello4.c @@ -68,5 +68,5 @@ main (int argc, char **argv) } } - return 0; + return test_exit_status; } diff --git a/tests/test-ftruncate.c b/tests/test-ftruncate.c index e9daf1bdcb..ccbe680c50 100644 --- a/tests/test-ftruncate.c +++ b/tests/test-ftruncate.c @@ -56,5 +56,5 @@ main (_GL_UNUSED int argc, char *argv[]) close (fd); } - return 0; + return test_exit_status; } diff --git a/tests/test-func.c b/tests/test-func.c index 62082b4193..e01c2600d9 100644 --- a/tests/test-func.c +++ b/tests/test-func.c @@ -36,5 +36,5 @@ main () ASSERT (strcmp (__func__, "main") == 0 || strcmp (__func__, "") == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-futimens.c b/tests/test-futimens.c index d6ccbd7056..06045a7006 100644 --- a/tests/test-futimens.c +++ b/tests/test-futimens.c @@ -46,5 +46,6 @@ main (void) /* Clean up any trash from prior testsuite runs. */ ignore_value (system ("rm -rf " BASE "*")); - return test_futimens (futimens, true); + int result = test_futimens (futimens, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-fwritable.c b/tests/test-fwritable.c index 0cb158a275..ef1539ff9c 100644 --- a/tests/test-fwritable.c +++ b/tests/test-fwritable.c @@ -109,7 +109,7 @@ main () if (fclose (fp)) goto skip; - return 0; + return test_exit_status; skip: fprintf (stderr, "Skipping test: file operations failed.\n"); diff --git a/tests/test-fwrite.c b/tests/test-fwrite.c index f00f35cafc..76be02effe 100644 --- a/tests/test-fwrite.c +++ b/tests/test-fwrite.c @@ -94,5 +94,5 @@ main () /* Clean up. */ unlink (filename); - return 0; + return test_exit_status; } diff --git a/tests/test-fwriting.c b/tests/test-fwriting.c index e3300794c9..4c1ff18c24 100644 --- a/tests/test-fwriting.c +++ b/tests/test-fwriting.c @@ -156,7 +156,7 @@ main () if (fclose (fp)) goto skip; - return 0; + return test_exit_status; skip: fprintf (stderr, "Skipping test: file operations failed.\n"); diff --git a/tests/test-get-rusage-as.c b/tests/test-get-rusage-as.c index ad5cdf931b..e1e92f842e 100644 --- a/tests/test-get-rusage-as.c +++ b/tests/test-get-rusage-as.c @@ -70,6 +70,6 @@ main () #endif ASSERT (value3 > value1); - return 0; + return test_exit_status; } } diff --git a/tests/test-get-rusage-data.c b/tests/test-get-rusage-data.c index eab165ee01..fa64660642 100644 --- a/tests/test-get-rusage-data.c +++ b/tests/test-get-rusage-data.c @@ -66,6 +66,6 @@ main () ASSERT (value3 > value1); #endif - return 0; + return test_exit_status; } } diff --git a/tests/test-getcwd-lgpl.c b/tests/test-getcwd-lgpl.c index 1e7238a06d..c94bfe6d48 100644 --- a/tests/test-getcwd-lgpl.c +++ b/tests/test-getcwd-lgpl.c @@ -98,5 +98,5 @@ main (int argc, char **argv) free (pwd1); free (pwd2); - return 0; + return test_exit_status; } diff --git a/tests/test-getcwd.c b/tests/test-getcwd.c index 03c63180d4..00447e83a8 100644 --- a/tests/test-getcwd.c +++ b/tests/test-getcwd.c @@ -266,5 +266,6 @@ main () { int err1 = test_abort_bug (); int err2 = test_long_name (); - return err1 * 10 + (err1 != 0 && err2 == 77 ? 0 : err2); + int result = err1 * 10 + (err1 != 0 && err2 == 77 ? 0 : err2); + return (result ? result : test_exit_status); } diff --git a/tests/test-getdelim.c b/tests/test-getdelim.c index 48b5f8cae4..f47307c1fa 100644 --- a/tests/test-getdelim.c +++ b/tests/test-getdelim.c @@ -90,5 +90,5 @@ main (void) free (line); fclose (f); remove ("test-getdelim.txt"); - return 0; + return test_exit_status; } diff --git a/tests/test-getdtablesize.c b/tests/test-getdtablesize.c index 401fe9011a..e826c634a9 100644 --- a/tests/test-getdtablesize.c +++ b/tests/test-getdtablesize.c @@ -37,5 +37,5 @@ main () ASSERT (dup2 (0, getdtablesize() - 1) == getdtablesize () - 1); ASSERT (dup2 (0, getdtablesize()) == -1); - return 0; + return test_exit_status; } diff --git a/tests/test-getentropy.c b/tests/test-getentropy.c index 983690ea62..288c1952ea 100644 --- a/tests/test-getentropy.c +++ b/tests/test-getentropy.c @@ -50,5 +50,5 @@ main (int argc, char *argv[]) ASSERT (memcmp (buf1, buf2, sizeof (buf1)) != 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-getgroups.c b/tests/test-getgroups.c index 45d01a3237..7a99c012d8 100644 --- a/tests/test-getgroups.c +++ b/tests/test-getgroups.c @@ -84,5 +84,5 @@ main (int argc, _GL_UNUSED char **argv) printf ("%d\n", (int) groups[i]); } free (groups); - return 0; + return test_exit_status; } diff --git a/tests/test-getline.c b/tests/test-getline.c index f2ee66292f..c13bee7fa6 100644 --- a/tests/test-getline.c +++ b/tests/test-getline.c @@ -90,5 +90,5 @@ main (void) free (line); fclose (f); remove ("test-getline.txt"); - return 0; + return test_exit_status; } diff --git a/tests/test-getlogin.c b/tests/test-getlogin.c index 5da702503a..c681d12f6e 100644 --- a/tests/test-getlogin.c +++ b/tests/test-getlogin.c @@ -41,5 +41,5 @@ main (void) #endif test_getlogin_result (buf, err); - return 0; + return test_exit_status; } diff --git a/tests/test-getlogin_r.c b/tests/test-getlogin_r.c index e74aae3306..84ab833112 100644 --- a/tests/test-getlogin_r.c +++ b/tests/test-getlogin_r.c @@ -68,5 +68,5 @@ main (void) ASSERT (strcmp (hugebuf, buf) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-getndelim2.c b/tests/test-getndelim2.c index c0473cfaaa..a940f027bd 100644 --- a/tests/test-getndelim2.c +++ b/tests/test-getndelim2.c @@ -147,5 +147,5 @@ main (void) fclose (f); remove ("test-getndelim2.txt"); - return 0; + return test_exit_status; } diff --git a/tests/test-getopt-main.h b/tests/test-getopt-main.h index 82ad65dfaf..c1a215464b 100644 --- a/tests/test-getopt-main.h +++ b/tests/test-getopt-main.h @@ -72,5 +72,5 @@ main (void) ASSERT (fclose (stderr) == 0); ASSERT (remove (TEST_GETOPT_TMP_NAME) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-getpayload.c b/tests/test-getpayload.c index 54d4e77612..c0047a82ec 100644 --- a/tests/test-getpayload.c +++ b/tests/test-getpayload.c @@ -109,5 +109,5 @@ main () ASSERT (neg_ret == pos_ret); } - return 0; + return test_exit_status; } diff --git a/tests/test-getpayloadf.c b/tests/test-getpayloadf.c index 48832763e3..7736c55aeb 100644 --- a/tests/test-getpayloadf.c +++ b/tests/test-getpayloadf.c @@ -109,5 +109,5 @@ main () ASSERT (neg_ret == pos_ret); } - return 0; + return test_exit_status; } diff --git a/tests/test-getpayloadl.c b/tests/test-getpayloadl.c index 12ff6dea8f..f7ebd2cf62 100644 --- a/tests/test-getpayloadl.c +++ b/tests/test-getpayloadl.c @@ -116,5 +116,5 @@ main () ASSERT (neg_ret == pos_ret); } - return 0; + return test_exit_status; } diff --git a/tests/test-getpeername.c b/tests/test-getpeername.c index 63cbbd0f0d..4e3034410d 100644 --- a/tests/test-getpeername.c +++ b/tests/test-getpeername.c @@ -52,5 +52,5 @@ main (void) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-getrandom.c b/tests/test-getrandom.c index 68a3ae346b..0102ffa24e 100644 --- a/tests/test-getrandom.c +++ b/tests/test-getrandom.c @@ -88,5 +88,5 @@ main (void) return 77; } - return 0; + return test_exit_status; } diff --git a/tests/test-getrusage.c b/tests/test-getrusage.c index a6549374f7..b8fbf7ec7b 100644 --- a/tests/test-getrusage.c +++ b/tests/test-getrusage.c @@ -82,5 +82,5 @@ main (void) ASSERT (spent_utime + spent_stime > 10000U); } - return 0; + return test_exit_status; } diff --git a/tests/test-getsockname.c b/tests/test-getsockname.c index 89376a4ae3..add62cbc2d 100644 --- a/tests/test-getsockname.c +++ b/tests/test-getsockname.c @@ -98,5 +98,5 @@ main (void) ASSERT (ntohs (addr.sin_port) != 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-getsockopt.c b/tests/test-getsockopt.c index cf2fb0d88b..93e55699cc 100644 --- a/tests/test-getsockopt.c +++ b/tests/test-getsockopt.c @@ -53,5 +53,5 @@ main (void) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-gettimeofday.c b/tests/test-gettimeofday.c index ea810bd55e..f5990aedce 100644 --- a/tests/test-gettimeofday.c +++ b/tests/test-gettimeofday.c @@ -84,5 +84,5 @@ main (void) test_clobber (); test_consistency (); - return 0; + return test_exit_status; } diff --git a/tests/test-getumask.c b/tests/test-getumask.c index ffe401738e..26b59f19ac 100644 --- a/tests/test-getumask.c +++ b/tests/test-getumask.c @@ -53,5 +53,5 @@ main (void) #endif - return 0; + return test_exit_status; } diff --git a/tests/test-getusershell.c b/tests/test-getusershell.c index ea9d7ac6ed..a66479dbbb 100644 --- a/tests/test-getusershell.c +++ b/tests/test-getusershell.c @@ -101,5 +101,5 @@ main (void) first_pass (); second_pass (); - return 0; + return test_exit_status; } diff --git a/tests/test-glob-h.c b/tests/test-glob-h.c index 67febac8c3..778d021c97 100644 --- a/tests/test-glob-h.c +++ b/tests/test-glob-h.c @@ -53,5 +53,5 @@ main () ASSERT (sizeof (g.gl_pathv)); ASSERT (sizeof (g.gl_offs)); - return 0; + return test_exit_status; } diff --git a/tests/test-glob.c b/tests/test-glob.c index 7ce43a2588..1834386775 100644 --- a/tests/test-glob.c +++ b/tests/test-glob.c @@ -95,5 +95,5 @@ main () globfree (&g); } - return 0; + return test_exit_status; } diff --git a/tests/test-gmtime_r-mt.c b/tests/test-gmtime_r-mt.c index 4d38bad1a3..95a36ac682 100644 --- a/tests/test-gmtime_r-mt.c +++ b/tests/test-gmtime_r-mt.c @@ -104,7 +104,7 @@ main (int argc, char *argv[]) nanosleep (&duration, NULL); } - return 0; + return test_exit_status; } #else diff --git a/tests/test-gmtime_r.c b/tests/test-gmtime_r.c index 01eebf3c29..1531f9962b 100644 --- a/tests/test-gmtime_r.c +++ b/tests/test-gmtime_r.c @@ -52,5 +52,5 @@ main (void) #endif } - return 0; + return test_exit_status; } diff --git a/tests/test-grantpt.c b/tests/test-grantpt.c index 4311c9209d..40daa1bd02 100644 --- a/tests/test-grantpt.c +++ b/tests/test-grantpt.c @@ -62,5 +62,5 @@ main (void) } } - return 0; + return test_exit_status; } diff --git a/tests/test-hamt.c b/tests/test-hamt.c index b836ad8122..b1a4619871 100644 --- a/tests/test-hamt.c +++ b/tests/test-hamt.c @@ -377,5 +377,5 @@ main (void) test_destructive_update (); test_iterator (); - return 0; + return test_exit_status; } diff --git a/tests/test-hash.c b/tests/test-hash.c index 12ce00ccde..10929ae541 100644 --- a/tests/test-hash.c +++ b/tests/test-hash.c @@ -258,5 +258,5 @@ main (int argc, char **argv) hash_free (ht); } - return 0; + return test_exit_status; } diff --git a/tests/test-hash_map.c b/tests/test-hash_map.c index 0de45ea5b1..b8de8378db 100644 --- a/tests/test-hash_map.c +++ b/tests/test-hash_map.c @@ -192,5 +192,5 @@ main (int argc, char *argv[]) gl_map_free (map2); } - return 0; + return test_exit_status; } diff --git a/tests/test-hash_set.c b/tests/test-hash_set.c index cc08d2fa75..925072d971 100644 --- a/tests/test-hash_set.c +++ b/tests/test-hash_set.c @@ -166,5 +166,5 @@ main (int argc, char *argv[]) gl_set_free (set2); } - return 0; + return test_exit_status; } diff --git a/tests/test-hypot-ieee.c b/tests/test-hypot-ieee.c index 2430a05d7d..4a799d2fd7 100644 --- a/tests/test-hypot-ieee.c +++ b/tests/test-hypot-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-hypot.c b/tests/test-hypot.c index 8237107c15..0a7e5cd595 100644 --- a/tests/test-hypot.c +++ b/tests/test-hypot.c @@ -51,5 +51,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-hypotf-ieee.c b/tests/test-hypotf-ieee.c index 22c9d53684..cc2187009c 100644 --- a/tests/test-hypotf-ieee.c +++ b/tests/test-hypotf-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-hypotf.c b/tests/test-hypotf.c index 3f170cab39..383ccc858f 100644 --- a/tests/test-hypotf.c +++ b/tests/test-hypotf.c @@ -51,5 +51,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-hypotl-ieee.c b/tests/test-hypotl-ieee.c index ac02c322df..ead6f73697 100644 --- a/tests/test-hypotl-ieee.c +++ b/tests/test-hypotl-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-hypotl.c b/tests/test-hypotl.c index 34495a2149..bc61f58d8e 100644 --- a/tests/test-hypotl.c +++ b/tests/test-hypotl.c @@ -56,5 +56,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-i-ring.c b/tests/test-i-ring.c index f395538bc2..a7b7a3e87f 100644 --- a/tests/test-i-ring.c +++ b/tests/test-i-ring.c @@ -59,5 +59,5 @@ main (void) ASSERT (o == 8); ASSERT (i_ring_empty (&ir)); - return 0; + return test_exit_status; } diff --git a/tests/test-iconv-utf.c b/tests/test-iconv-utf.c index 42e0619692..0626216dc1 100644 --- a/tests/test-iconv-utf.c +++ b/tests/test-iconv-utf.c @@ -312,5 +312,5 @@ main () } #endif - return 0; + return test_exit_status; } diff --git a/tests/test-iconv.c b/tests/test-iconv.c index 78bf7a2ede..ca18a02bc8 100644 --- a/tests/test-iconv.c +++ b/tests/test-iconv.c @@ -155,5 +155,5 @@ main () #endif /* HAVE_ICONV */ - return 0; + return test_exit_status; } diff --git a/tests/test-idpriv-drop.c b/tests/test-idpriv-drop.c index e2817715f4..754a143d40 100644 --- a/tests/test-idpriv-drop.c +++ b/tests/test-idpriv-drop.c @@ -148,5 +148,5 @@ main (int argc, char *argv[]) # endif #endif - return 0; + return test_exit_status; } diff --git a/tests/test-idpriv-droptemp.c b/tests/test-idpriv-droptemp.c index f8094ae0db..b8ee0ad889 100644 --- a/tests/test-idpriv-droptemp.c +++ b/tests/test-idpriv-droptemp.c @@ -155,5 +155,5 @@ main (int argc, char *argv[]) } - return 0; + return test_exit_status; } diff --git a/tests/test-ilogb.c b/tests/test-ilogb.c index 5a4e0185e6..6577a60afb 100644 --- a/tests/test-ilogb.c +++ b/tests/test-ilogb.c @@ -57,5 +57,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-ilogbf.c b/tests/test-ilogbf.c index 516844d8f9..19bb3674b1 100644 --- a/tests/test-ilogbf.c +++ b/tests/test-ilogbf.c @@ -52,5 +52,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-ilogbl.c b/tests/test-ilogbl.c index e55de6d599..76e68ae8f0 100644 --- a/tests/test-ilogbl.c +++ b/tests/test-ilogbl.c @@ -63,5 +63,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-imaxabs.c b/tests/test-imaxabs.c index 2d0ac3a4c3..233536799b 100644 --- a/tests/test-imaxabs.c +++ b/tests/test-imaxabs.c @@ -39,5 +39,5 @@ main (void) ASSERT (result == 23); } - return 0; + return test_exit_status; } diff --git a/tests/test-imaxdiv.c b/tests/test-imaxdiv.c index 9e9fd91bf9..88f2c7f8e5 100644 --- a/tests/test-imaxdiv.c +++ b/tests/test-imaxdiv.c @@ -47,5 +47,5 @@ main (void) ASSERT (result.rem == -3); } - return 0; + return test_exit_status; } diff --git a/tests/test-immutable.c b/tests/test-immutable.c index 6dc5f9fc96..afb2683137 100644 --- a/tests/test-immutable.c +++ b/tests/test-immutable.c @@ -153,5 +153,5 @@ main (int argc, char *argv[]) default: ASSERT (false); } - return 0; + return test_exit_status; } diff --git a/tests/test-inet_ntop.c b/tests/test-inet_ntop.c index 5985a2e7ff..5f442f39c1 100644 --- a/tests/test-inet_ntop.c +++ b/tests/test-inet_ntop.c @@ -52,5 +52,5 @@ main (void) } #endif - return 0; + return test_exit_status; } diff --git a/tests/test-inet_pton.c b/tests/test-inet_pton.c index 6598d5a0f3..bb78636e06 100644 --- a/tests/test-inet_pton.c +++ b/tests/test-inet_pton.c @@ -54,5 +54,5 @@ main (void) } #endif - return 0; + return test_exit_status; } diff --git a/tests/test-ino-map.c b/tests/test-ino-map.c index 8e83252f85..57d2b8ccfa 100644 --- a/tests/test-ino-map.c +++ b/tests/test-ino-map.c @@ -46,5 +46,5 @@ main () ino_map_free (ino_map); - return 0; + return test_exit_status; } diff --git a/tests/test-integer_length.c b/tests/test-integer_length.c index 6a17ec8ffa..045eab2bad 100644 --- a/tests/test-integer_length.c +++ b/tests/test-integer_length.c @@ -62,5 +62,5 @@ main (int argc, char *argv[]) ASSERT (integer_length (-5U << i) == NBITS); ASSERT (integer_length (-7U << i) == NBITS); } - return 0; + return test_exit_status; } diff --git a/tests/test-integer_length_l.c b/tests/test-integer_length_l.c index d3a283ef07..c99d5a01f6 100644 --- a/tests/test-integer_length_l.c +++ b/tests/test-integer_length_l.c @@ -62,5 +62,5 @@ main (int argc, char *argv[]) ASSERT (integer_length_l (-5UL << i) == NBITS); ASSERT (integer_length_l (-7UL << i) == NBITS); } - return 0; + return test_exit_status; } diff --git a/tests/test-integer_length_ll.c b/tests/test-integer_length_ll.c index d5aa595921..8c5d82e61f 100644 --- a/tests/test-integer_length_ll.c +++ b/tests/test-integer_length_ll.c @@ -62,5 +62,5 @@ main (int argc, char *argv[]) ASSERT (integer_length_ll (-5ULL << i) == NBITS); ASSERT (integer_length_ll (-7ULL << i) == NBITS); } - return 0; + return test_exit_status; } diff --git a/tests/test-intprops.c b/tests/test-intprops.c index e0d63d4741..8d3b8c37e6 100644 --- a/tests/test-intprops.c +++ b/tests/test-intprops.c @@ -444,5 +444,5 @@ main (void) CHECK_REMAINDER (37*39u - 1, -39, true); CHECK_REMAINDER (LONG_MAX, -INT_MAX, false); - return 0; + return test_exit_status; } diff --git a/tests/test-inttostr.c b/tests/test-inttostr.c index be7b5d4521..e7632cb736 100644 --- a/tests/test-inttostr.c +++ b/tests/test-inttostr.c @@ -85,7 +85,7 @@ main (void) CK (uintmax_t, umaxtostr); CK (intmax_t, imaxtostr); free (b); - return 0; + return test_exit_status; } /* snprintf doesn't accept %ju; skip this test. */ diff --git a/tests/test-ioctl.c b/tests/test-ioctl.c index 1fef85b468..5e5c747858 100644 --- a/tests/test-ioctl.c +++ b/tests/test-ioctl.c @@ -47,5 +47,5 @@ main (void) } #endif - return 0; + return test_exit_status; } diff --git a/tests/test-isatty.c b/tests/test-isatty.c index 52e7a3dd97..1c7d6d8cd9 100644 --- a/tests/test-isatty.c +++ b/tests/test-isatty.c @@ -95,5 +95,5 @@ main (void) ASSERT (unlink (file) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-isblank.c b/tests/test-isblank.c index 8e13bae158..7935fefdb5 100644 --- a/tests/test-isblank.c +++ b/tests/test-isblank.c @@ -46,5 +46,5 @@ main () ASSERT (!isblank (c) == !(c == ' ' || c == '\t')); ASSERT (!isblank (EOF)); - return 0; + return test_exit_status; } diff --git a/tests/test-isfinite.c b/tests/test-isfinite.c index 05e15bb705..ad8cc2162e 100644 --- a/tests/test-isfinite.c +++ b/tests/test-isfinite.c @@ -178,5 +178,5 @@ main () test_isfinitef (); test_isfinited (); test_isfinitel (); - return 0; + return test_exit_status; } diff --git a/tests/test-isinf.c b/tests/test-isinf.c index 0cd96d7208..75dc6e4b3e 100644 --- a/tests/test-isinf.c +++ b/tests/test-isinf.c @@ -184,5 +184,5 @@ main () test_isinff (); test_isinfd (); test_isinfl (); - return 0; + return test_exit_status; } diff --git a/tests/test-isnan.c b/tests/test-isnan.c index 921c16e21b..79713abe56 100644 --- a/tests/test-isnan.c +++ b/tests/test-isnan.c @@ -167,5 +167,5 @@ main () test_float (); test_double (); test_long_double (); - return 0; + return test_exit_status; } diff --git a/tests/test-isnand.h b/tests/test-isnand.h index 5369e33640..712adf3875 100644 --- a/tests/test-isnand.h +++ b/tests/test-isnand.h @@ -45,5 +45,5 @@ main () /* Signalling NaN. */ ASSERT (isnand (SNaNd ())); #endif - return 0; + return test_exit_status; } diff --git a/tests/test-isnanf.h b/tests/test-isnanf.h index 6f138016c9..86ec905098 100644 --- a/tests/test-isnanf.h +++ b/tests/test-isnanf.h @@ -45,5 +45,5 @@ main () /* Signalling NaN. */ ASSERT (isnanf (SNaNf ())); #endif - return 0; + return test_exit_status; } diff --git a/tests/test-isnanl.h b/tests/test-isnanl.h index ff42ee5436..601bcb869e 100644 --- a/tests/test-isnanl.h +++ b/tests/test-isnanl.h @@ -100,5 +100,5 @@ main () #undef NWORDS #endif - return 0; + return test_exit_status; } diff --git a/tests/test-iswblank.c b/tests/test-iswblank.c index e59251791f..39723e0af2 100644 --- a/tests/test-iswblank.c +++ b/tests/test-iswblank.c @@ -36,5 +36,5 @@ main (void) ASSERT (iswblank (L'\t')); ASSERT (!iswblank (L'\n')); - return 0; + return test_exit_status; } diff --git a/tests/test-iswctype.c b/tests/test-iswctype.c index e882bdbc4d..08a2101f9e 100644 --- a/tests/test-iswctype.c +++ b/tests/test-iswctype.c @@ -194,5 +194,5 @@ main (int argc, char *argv[]) ASSERT (! iswctype (L'\0', desc)); ASSERT (! iswctype (WEOF, desc)); - return 0; + return test_exit_status; } diff --git a/tests/test-iswdigit.c b/tests/test-iswdigit.c index a5bcc4ff1d..6c2df68a42 100644 --- a/tests/test-iswdigit.c +++ b/tests/test-iswdigit.c @@ -111,7 +111,7 @@ main (int argc, char *argv[]) { case '0': /* C locale; tested above. */ - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -126,7 +126,7 @@ main (int argc, char *argv[]) is = for_character ("\271", 1); ASSERT (is == 0); } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -135,7 +135,7 @@ main (int argc, char *argv[]) is = for_character ("\243\261", 2); ASSERT (is == 0); } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -180,7 +180,7 @@ main (int argc, char *argv[]) is = for_character ("\363\240\200\263", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; case '4': /* Locale encoding is GB18030. */ @@ -225,7 +225,7 @@ main (int argc, char *argv[]) is = for_character ("\323\066\232\071", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-iswpunct.c b/tests/test-iswpunct.c index c0bbd168e7..0eb60888b8 100644 --- a/tests/test-iswpunct.c +++ b/tests/test-iswpunct.c @@ -146,7 +146,7 @@ main (int argc, char *argv[]) ASSERT (is != 0); is = for_character ("`", 1); ASSERT (is != 0); - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-iswxdigit.c b/tests/test-iswxdigit.c index f4aeb493ac..accdd79c5f 100644 --- a/tests/test-iswxdigit.c +++ b/tests/test-iswxdigit.c @@ -113,7 +113,7 @@ main (int argc, char *argv[]) { case '0': /* C locale; tested above. */ - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -128,7 +128,7 @@ main (int argc, char *argv[]) is = for_character ("\271", 1); ASSERT (is == 0); } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -143,7 +143,7 @@ main (int argc, char *argv[]) is = for_character ("\243\341", 2); ASSERT (is == 0); } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -197,7 +197,7 @@ main (int argc, char *argv[]) is = for_character ("\363\240\201\201", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; case '4': /* Locale encoding is GB18030. */ @@ -251,7 +251,7 @@ main (int argc, char *argv[]) is = for_character ("\323\066\234\063", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-j0.c b/tests/test-j0.c index 856b6e8c9d..24ca833dde 100644 --- a/tests/test-j0.c +++ b/tests/test-j0.c @@ -36,5 +36,5 @@ main () y = j0 (x); ASSERT (y >= -0.4025564102 && y <= -0.4025564101); - return 0; + return test_exit_status; } diff --git a/tests/test-j1.c b/tests/test-j1.c index d18c652747..0f25700aea 100644 --- a/tests/test-j1.c +++ b/tests/test-j1.c @@ -36,5 +36,5 @@ main () y = j1 (x); ASSERT (y >= 0.0128210029 && y <= 0.0128210030); - return 0; + return test_exit_status; } diff --git a/tests/test-jn.c b/tests/test-jn.c index c2bfaba5e2..64a15285e5 100644 --- a/tests/test-jn.c +++ b/tests/test-jn.c @@ -86,5 +86,5 @@ main () y = jn (10, x); ASSERT (y >= 0.0001211233 && y <= 0.0001211234); - return 0; + return test_exit_status; } diff --git a/tests/test-lchmod.c b/tests/test-lchmod.c index 396755cae6..4d6883f4e1 100644 --- a/tests/test-lchmod.c +++ b/tests/test-lchmod.c @@ -83,5 +83,5 @@ main (void) unlink (BASE "link"); } - return 0; + return test_exit_status; } diff --git a/tests/test-lchown.c b/tests/test-lchown.c index bf205c114b..49d49eaa2d 100644 --- a/tests/test-lchown.c +++ b/tests/test-lchown.c @@ -44,5 +44,6 @@ main (void) /* Remove any leftovers from a previous partial run. */ ignore_value (system ("rm -rf " BASE "*")); - return test_lchown (lchown, true); + int result = test_lchown (lchown, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-ldexp-ieee.c b/tests/test-ldexp-ieee.c index 944fc1560a..72db7314bf 100644 --- a/tests/test-ldexp-ieee.c +++ b/tests/test-ldexp-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-ldexp.c b/tests/test-ldexp.c index ada9a57622..0251a74df6 100644 --- a/tests/test-ldexp.c +++ b/tests/test-ldexp.c @@ -51,5 +51,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-ldexpf-ieee.c b/tests/test-ldexpf-ieee.c index 7cfca53656..a7081fc34a 100644 --- a/tests/test-ldexpf-ieee.c +++ b/tests/test-ldexpf-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-ldexpf.c b/tests/test-ldexpf.c index 04491038a1..21c3478cb4 100644 --- a/tests/test-ldexpf.c +++ b/tests/test-ldexpf.c @@ -51,5 +51,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-ldexpl-ieee.c b/tests/test-ldexpl-ieee.c index c86ceac729..3005c5bf3d 100644 --- a/tests/test-ldexpl-ieee.c +++ b/tests/test-ldexpl-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-ldexpl.c b/tests/test-ldexpl.c index 2ebc1c8061..1c73490042 100644 --- a/tests/test-ldexpl.c +++ b/tests/test-ldexpl.c @@ -56,5 +56,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-lgamma.c b/tests/test-lgamma.c index 0db2b64c49..045c4aed72 100644 --- a/tests/test-lgamma.c +++ b/tests/test-lgamma.c @@ -37,5 +37,5 @@ main () /* Γ(x) = 1.4891922488... */ ASSERT (y >= 0.3982338580 && y <= 0.3982338581); - return 0; + return test_exit_status; } diff --git a/tests/test-libgmp.c b/tests/test-libgmp.c index 5e8b7f2f6f..9d1e215b94 100644 --- a/tests/test-libgmp.c +++ b/tests/test-libgmp.c @@ -70,5 +70,5 @@ main () ASSERT (mpz_get_si (four) == 4); mpz_clear (four); - return 0; + return test_exit_status; } diff --git a/tests/test-link.c b/tests/test-link.c index 042b0afcb1..92edf4e188 100644 --- a/tests/test-link.c +++ b/tests/test-link.c @@ -42,5 +42,6 @@ main (void) /* Remove any garbage left from previous partial runs. */ ignore_value (system ("rm -rf " BASE "*")); - return test_link (link, true); + int result = test_link (link, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-linkat.c b/tests/test-linkat.c index 2729821f64..c3efb5df60 100644 --- a/tests/test-linkat.c +++ b/tests/test-linkat.c @@ -383,5 +383,6 @@ main (void) ASSERT (unlink (BASE "link4") == 0); ASSERT (unlink (BASE "link5") == 0); free (cwd); - return result; + + return (result ? result : test_exit_status); } diff --git a/tests/test-linked_list.c b/tests/test-linked_list.c index 086d8cc5f9..05159519c6 100644 --- a/tests/test-linked_list.c +++ b/tests/test-linked_list.c @@ -455,5 +455,5 @@ main (int argc, char *argv[]) free (contents); } - return 0; + return test_exit_status; } diff --git a/tests/test-linkedhash_list.c b/tests/test-linkedhash_list.c index 888af6ea78..520981b05a 100644 --- a/tests/test-linkedhash_list.c +++ b/tests/test-linkedhash_list.c @@ -485,5 +485,5 @@ main (int argc, char *argv[]) free (contents); } - return 0; + return test_exit_status; } diff --git a/tests/test-linkedhash_map.c b/tests/test-linkedhash_map.c index 40d430037c..a56d25d65b 100644 --- a/tests/test-linkedhash_map.c +++ b/tests/test-linkedhash_map.c @@ -192,5 +192,5 @@ main (int argc, char *argv[]) gl_map_free (map2); } - return 0; + return test_exit_status; } diff --git a/tests/test-linkedhash_set.c b/tests/test-linkedhash_set.c index 9020e2f0ac..79d3bdafbe 100644 --- a/tests/test-linkedhash_set.c +++ b/tests/test-linkedhash_set.c @@ -166,5 +166,5 @@ main (int argc, char *argv[]) gl_set_free (set2); } - return 0; + return test_exit_status; } diff --git a/tests/test-list-c++.cc b/tests/test-list-c++.cc index 6454c81ee8..a5639ed27e 100644 --- a/tests/test-list-c++.cc +++ b/tests/test-list-c++.cc @@ -75,5 +75,5 @@ main (int argc, char *argv[]) list2.free (); list1.free (); - return 0; + return test_exit_status; } diff --git a/tests/test-listen.c b/tests/test-listen.c index 21fc7a2b3e..6ccffaa1d9 100644 --- a/tests/test-listen.c +++ b/tests/test-listen.c @@ -50,5 +50,5 @@ main (void) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-localeconv.c b/tests/test-localeconv.c index a4f0ecd89e..1f12c333ab 100644 --- a/tests/test-localeconv.c +++ b/tests/test-localeconv.c @@ -68,5 +68,5 @@ main () ASSERT (l->int_n_sep_by_space == CHAR_MAX); } - return 0; + return test_exit_status; } diff --git a/tests/test-localename.c b/tests/test-localename.c index 03b70527d5..0e64ce6a94 100644 --- a/tests/test-localename.c +++ b/tests/test-localename.c @@ -838,5 +838,5 @@ main () test_locale_name_environ (); test_locale_name_default (); - return 0; + return test_exit_status; } diff --git a/tests/test-localtime_r-mt.c b/tests/test-localtime_r-mt.c index 05921ad061..096c83eb70 100644 --- a/tests/test-localtime_r-mt.c +++ b/tests/test-localtime_r-mt.c @@ -141,7 +141,7 @@ main (int argc, char *argv[]) nanosleep (&duration, NULL); } - return 0; + return test_exit_status; } #else diff --git a/tests/test-localtime_r.c b/tests/test-localtime_r.c index c1dc43ed20..5d4f02f00f 100644 --- a/tests/test-localtime_r.c +++ b/tests/test-localtime_r.c @@ -184,5 +184,5 @@ main (void) #endif } - return 0; + return test_exit_status; } diff --git a/tests/test-log-ieee.c b/tests/test-log-ieee.c index ffa422e654..3629460798 100644 --- a/tests/test-log-ieee.c +++ b/tests/test-log-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log.c b/tests/test-log.c index 9039ac5405..2b4736d9c0 100644 --- a/tests/test-log.c +++ b/tests/test-log.c @@ -47,5 +47,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log10-ieee.c b/tests/test-log10-ieee.c index ec5adb1a8a..1404edc38b 100644 --- a/tests/test-log10-ieee.c +++ b/tests/test-log10-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log10.c b/tests/test-log10.c index c3f8181fd3..e63d0beda3 100644 --- a/tests/test-log10.c +++ b/tests/test-log10.c @@ -47,5 +47,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log10f-ieee.c b/tests/test-log10f-ieee.c index a40b591fd2..1bc5cd5cff 100644 --- a/tests/test-log10f-ieee.c +++ b/tests/test-log10f-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log10f.c b/tests/test-log10f.c index 92807ae81d..9b18d5d9bf 100644 --- a/tests/test-log10f.c +++ b/tests/test-log10f.c @@ -47,5 +47,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log10l-ieee.c b/tests/test-log10l-ieee.c index 1654e6bab4..026dfd5619 100644 --- a/tests/test-log10l-ieee.c +++ b/tests/test-log10l-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log10l.c b/tests/test-log10l.c index 80afcc5d16..e036919242 100644 --- a/tests/test-log10l.c +++ b/tests/test-log10l.c @@ -52,5 +52,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log1p-ieee.c b/tests/test-log1p-ieee.c index 72c4fde4e0..19d38c4ebc 100644 --- a/tests/test-log1p-ieee.c +++ b/tests/test-log1p-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log1p.c b/tests/test-log1p.c index 18be590435..97d785f475 100644 --- a/tests/test-log1p.c +++ b/tests/test-log1p.c @@ -45,5 +45,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log1pf-ieee.c b/tests/test-log1pf-ieee.c index 48ebb55dc7..f3df752c4d 100644 --- a/tests/test-log1pf-ieee.c +++ b/tests/test-log1pf-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log1pf.c b/tests/test-log1pf.c index 0cf18d829f..627acfb488 100644 --- a/tests/test-log1pf.c +++ b/tests/test-log1pf.c @@ -45,5 +45,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log1pl-ieee.c b/tests/test-log1pl-ieee.c index 162d10cac7..bf94822342 100644 --- a/tests/test-log1pl-ieee.c +++ b/tests/test-log1pl-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log1pl.c b/tests/test-log1pl.c index c5783d3395..3cd576ad32 100644 --- a/tests/test-log1pl.c +++ b/tests/test-log1pl.c @@ -50,5 +50,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log2-ieee.c b/tests/test-log2-ieee.c index 164331d8de..7785c58b40 100644 --- a/tests/test-log2-ieee.c +++ b/tests/test-log2-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log2.c b/tests/test-log2.c index dfcbbe8db5..14c22bc61e 100644 --- a/tests/test-log2.c +++ b/tests/test-log2.c @@ -49,5 +49,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log2f-ieee.c b/tests/test-log2f-ieee.c index 0ca2dd01ea..d24ce10842 100644 --- a/tests/test-log2f-ieee.c +++ b/tests/test-log2f-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log2f.c b/tests/test-log2f.c index 3266fc1411..9a69b7a81d 100644 --- a/tests/test-log2f.c +++ b/tests/test-log2f.c @@ -49,5 +49,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log2l-ieee.c b/tests/test-log2l-ieee.c index 0fa7150e37..1d94b1b1e1 100644 --- a/tests/test-log2l-ieee.c +++ b/tests/test-log2l-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-log2l.c b/tests/test-log2l.c index 1a9eafc5ef..3b9f45a401 100644 --- a/tests/test-log2l.c +++ b/tests/test-log2l.c @@ -54,5 +54,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-logb-ieee.c b/tests/test-logb-ieee.c index 53a3f2cd11..0e03e7f416 100644 --- a/tests/test-logb-ieee.c +++ b/tests/test-logb-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-logb.c b/tests/test-logb.c index 3675c9b29c..4a5990ad0c 100644 --- a/tests/test-logb.c +++ b/tests/test-logb.c @@ -50,5 +50,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-logbf-ieee.c b/tests/test-logbf-ieee.c index 9fdb0d5a4a..af66d1c24c 100644 --- a/tests/test-logbf-ieee.c +++ b/tests/test-logbf-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-logbf.c b/tests/test-logbf.c index efae6543df..4d19b7c33f 100644 --- a/tests/test-logbf.c +++ b/tests/test-logbf.c @@ -45,5 +45,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-logbl-ieee.c b/tests/test-logbl-ieee.c index 302c63b197..ef8c0c1243 100644 --- a/tests/test-logbl-ieee.c +++ b/tests/test-logbl-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-logbl.c b/tests/test-logbl.c index b5fd02b264..fcc7a2b0d3 100644 --- a/tests/test-logbl.c +++ b/tests/test-logbl.c @@ -56,5 +56,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-logf-ieee.c b/tests/test-logf-ieee.c index 21e4eb98c5..f3ca5c4d27 100644 --- a/tests/test-logf-ieee.c +++ b/tests/test-logf-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-logf.c b/tests/test-logf.c index 1a297f7a66..09c4985abb 100644 --- a/tests/test-logf.c +++ b/tests/test-logf.c @@ -47,5 +47,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-logl-ieee.c b/tests/test-logl-ieee.c index 62241abaf3..fa4d1c2d72 100644 --- a/tests/test-logl-ieee.c +++ b/tests/test-logl-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-logl.c b/tests/test-logl.c index 5259f0b7d9..92a8625159 100644 --- a/tests/test-logl.c +++ b/tests/test-logl.c @@ -52,5 +52,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-lseek.c b/tests/test-lseek.c index a89523bda2..230ce2672e 100644 --- a/tests/test-lseek.c +++ b/tests/test-lseek.c @@ -105,5 +105,5 @@ main (int argc, char **argv) default: return 1; } - return 0; + return test_exit_status; } diff --git a/tests/test-lstat.c b/tests/test-lstat.c index 3a2d61ec6a..757b12d97d 100644 --- a/tests/test-lstat.c +++ b/tests/test-lstat.c @@ -55,5 +55,6 @@ main (void) /* Remove any leftovers from a previous partial run. */ ignore_value (system ("rm -rf " BASE "*")); - return test_lstat_func (do_lstat, true); + int result = test_lstat_func (do_lstat, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-malloc-gnu.c b/tests/test-malloc-gnu.c index 490efb010e..126b7a60fd 100644 --- a/tests/test-malloc-gnu.c +++ b/tests/test-malloc-gnu.c @@ -41,5 +41,5 @@ main (int argc, _GL_UNUSED char **argv) ASSERT (errno == ENOMEM); } - return 0; + return test_exit_status; } diff --git a/tests/test-map-c++.cc b/tests/test-map-c++.cc index c294b6ecea..1058a8ba9f 100644 --- a/tests/test-map-c++.cc +++ b/tests/test-map-c++.cc @@ -70,5 +70,5 @@ main (int argc, char *argv[]) map1.free (); - return 0; + return test_exit_status; } diff --git a/tests/test-math.c b/tests/test-math.c index d853f2a871..d33ec7e5e2 100644 --- a/tests/test-math.c +++ b/tests/test-math.c @@ -100,5 +100,5 @@ main (void) /* Check the value of FP_ILOGBNAN. */ ASSERT (FP_ILOGBNAN == INT_MIN || FP_ILOGBNAN == INT_MAX); - return 0; + return test_exit_status; } diff --git a/tests/test-mbfile.c b/tests/test-mbfile.c index 22e6a89ca1..1d857a819b 100644 --- a/tests/test-mbfile.c +++ b/tests/test-mbfile.c @@ -62,5 +62,5 @@ main () mbf_getc (next, mbstdin); ASSERT (mb_iseof (next)); - return 0; + return test_exit_status; } diff --git a/tests/test-mbmemcasecmp.c b/tests/test-mbmemcasecmp.c index 7fd5990a92..a5118a8f38 100644 --- a/tests/test-mbmemcasecmp.c +++ b/tests/test-mbmemcasecmp.c @@ -44,17 +44,17 @@ main (int argc, char *argv[]) case '2': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ test_iso_8859_1 (mbmemcasecmp, true); - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8, locale is not Turkish. */ test_utf_8 (mbmemcasecmp, false); - return 0; + return test_exit_status; case '4': /* Locale encoding is UTF-8, locale is Turkish. */ test_utf_8 (mbmemcasecmp, true); - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-mbmemcasecoll.c b/tests/test-mbmemcasecoll.c index 1f9e38d1dc..c2e9bfafe4 100644 --- a/tests/test-mbmemcasecoll.c +++ b/tests/test-mbmemcasecoll.c @@ -50,17 +50,17 @@ main (int argc, char *argv[]) case '2': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ test_iso_8859_1 (mbmemcasecoll_hard, false); - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8, locale is not Turkish. */ test_utf_8 (mbmemcasecoll_hard, false); - return 0; + return test_exit_status; case '4': /* Locale encoding is UTF-8, locale is Turkish. */ test_utf_8 (mbmemcasecoll_hard, true); - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-mbrlen-w32.c b/tests/test-mbrlen-w32.c index 2fbcab58bd..cb0802a677 100644 --- a/tests/test-mbrlen-w32.c +++ b/tests/test-mbrlen-w32.c @@ -546,11 +546,9 @@ main (int argc, char *argv[]) } if (result == 77) - { - fprintf (stderr, "Skipping test: found no locale with codepage %d\n", - codepage); - } - return result; + fprintf (stderr, "Skipping test: found no locale with codepage %d\n", + codepage); + return (result ? result : test_exit_status); } #else diff --git a/tests/test-mbrlen.c b/tests/test-mbrlen.c index 1947ca9a30..149b7d8dd3 100644 --- a/tests/test-mbrlen.c +++ b/tests/test-mbrlen.c @@ -141,7 +141,7 @@ main (int argc, char *argv[]) ASSERT (mbsinit (&state)); } } - return 0; + return test_exit_status; case '2': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -173,7 +173,7 @@ main (int argc, char *argv[]) ASSERT (ret == 1); ASSERT (mbsinit (&state)); } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -211,7 +211,7 @@ main (int argc, char *argv[]) ASSERT (ret == 1); ASSERT (mbsinit (&state)); } - return 0; + return test_exit_status; case '4': /* Locale encoding is EUC-JP. */ @@ -250,7 +250,7 @@ main (int argc, char *argv[]) ASSERT (ret == 1); ASSERT (mbsinit (&state)); } - return 0; + return test_exit_status; case '5': /* Locale encoding is GB18030. */ @@ -290,7 +290,7 @@ main (int argc, char *argv[]) ASSERT (ret == 1); ASSERT (mbsinit (&state)); } - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-mbrtoc16-w32.c b/tests/test-mbrtoc16-w32.c index 4b023456d4..0aa23a721a 100644 --- a/tests/test-mbrtoc16-w32.c +++ b/tests/test-mbrtoc16-w32.c @@ -755,11 +755,9 @@ main (int argc, char *argv[]) } if (result == 77) - { - fprintf (stderr, "Skipping test: found no locale with codepage %d\n", - codepage); - } - return result; + fprintf (stderr, "Skipping test: found no locale with codepage %d\n", + codepage); + return (result ? result : test_exit_status); } #else diff --git a/tests/test-mbrtoc16.c b/tests/test-mbrtoc16.c index a356736ea9..5bb769fd26 100644 --- a/tests/test-mbrtoc16.c +++ b/tests/test-mbrtoc16.c @@ -172,7 +172,7 @@ main (int argc, char *argv[]) ASSERT (mbsinit (&state)); } } - return 0; + return test_exit_status; case '2': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -221,7 +221,7 @@ main (int argc, char *argv[]) ASSERT (wc == 'r'); ASSERT (mbsinit (&state)); } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -296,7 +296,7 @@ main (int argc, char *argv[]) ASSERT (wc == '!'); ASSERT (mbsinit (&state)); } - return 0; + return test_exit_status; case '4': /* Locale encoding is EUC-JP. */ @@ -357,7 +357,7 @@ main (int argc, char *argv[]) ASSERT (wc == '>'); ASSERT (mbsinit (&state)); } - return 0; + return test_exit_status; case '5': /* Locale encoding is GB18030. */ @@ -438,7 +438,7 @@ main (int argc, char *argv[]) ASSERT (wc == '!'); ASSERT (mbsinit (&state)); } - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-mbrtoc32-regular.c b/tests/test-mbrtoc32-regular.c index 7dd75662e4..513e0eae0c 100644 --- a/tests/test-mbrtoc32-regular.c +++ b/tests/test-mbrtoc32-regular.c @@ -75,5 +75,5 @@ main (int argc, char *argv[]) ASSERT (c32 == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-mbrtoc32-w32.c b/tests/test-mbrtoc32-w32.c index 93196d48f6..1ec7c99666 100644 --- a/tests/test-mbrtoc32-w32.c +++ b/tests/test-mbrtoc32-w32.c @@ -731,11 +731,9 @@ main (int argc, char *argv[]) } if (result == 77) - { - fprintf (stderr, "Skipping test: found no locale with codepage %d\n", - codepage); - } - return result; + fprintf (stderr, "Skipping test: found no locale with codepage %d\n", + codepage); + return (result ? result : test_exit_status); } #else diff --git a/tests/test-mbrtoc32.c b/tests/test-mbrtoc32.c index 6fffb2a71c..83312ee4f7 100644 --- a/tests/test-mbrtoc32.c +++ b/tests/test-mbrtoc32.c @@ -172,7 +172,7 @@ main (int argc, char *argv[]) ASSERT (mbsinit (&state)); } } - return 0; + return test_exit_status; case '2': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -225,7 +225,7 @@ main (int argc, char *argv[]) ASSERT (wc == 'r'); ASSERT (mbsinit (&state)); } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -291,7 +291,7 @@ main (int argc, char *argv[]) ASSERT (wc == '!'); ASSERT (mbsinit (&state)); } - return 0; + return test_exit_status; case '4': /* Locale encoding is EUC-JP. */ @@ -356,7 +356,7 @@ main (int argc, char *argv[]) ASSERT (wc == '>'); ASSERT (mbsinit (&state)); } - return 0; + return test_exit_status; case '5': /* Locale encoding is GB18030. */ @@ -434,7 +434,7 @@ main (int argc, char *argv[]) ASSERT (wc == '!'); ASSERT (mbsinit (&state)); } - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-mbrtowc-w32.c b/tests/test-mbrtowc-w32.c index 2071ddeb82..2edd5660ab 100644 --- a/tests/test-mbrtowc-w32.c +++ b/tests/test-mbrtowc-w32.c @@ -715,11 +715,9 @@ main (int argc, char *argv[]) } if (result == 77) - { - fprintf (stderr, "Skipping test: found no locale with codepage %d\n", - codepage); - } - return result; + fprintf (stderr, "Skipping test: found no locale with codepage %d\n", + codepage); + return (result ? result : test_exit_status); } #else diff --git a/tests/test-mbrtowc.c b/tests/test-mbrtowc.c index f45f90e4ec..f506e77544 100644 --- a/tests/test-mbrtowc.c +++ b/tests/test-mbrtowc.c @@ -169,7 +169,7 @@ main (int argc, char *argv[]) ASSERT (mbsinit (&state)); } } - return 0; + return test_exit_status; case '2': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -216,7 +216,7 @@ main (int argc, char *argv[]) ASSERT (wc == 'r'); ASSERT (mbsinit (&state)); } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -271,7 +271,7 @@ main (int argc, char *argv[]) ASSERT (wc == 'r'); ASSERT (mbsinit (&state)); } - return 0; + return test_exit_status; case '4': /* Locale encoding is EUC-JP. */ @@ -327,7 +327,7 @@ main (int argc, char *argv[]) ASSERT (wc == '>'); ASSERT (mbsinit (&state)); } - return 0; + return test_exit_status; case '5': /* Locale encoding is GB18030. */ @@ -384,7 +384,7 @@ main (int argc, char *argv[]) ASSERT (wc == 'r'); ASSERT (mbsinit (&state)); } - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-mbscasecmp.c b/tests/test-mbscasecmp.c index c097a98209..c048ee81d5 100644 --- a/tests/test-mbscasecmp.c +++ b/tests/test-mbscasecmp.c @@ -51,5 +51,5 @@ main () ASSERT (mbscasecmp ("turkish", "TURK\304\260SH") == 0); ASSERT (mbscasecmp ("TURK\304\260SH", "turkish") == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-mbscasestr1.c b/tests/test-mbscasestr1.c index 1bf3c630db..cb83d22200 100644 --- a/tests/test-mbscasestr1.c +++ b/tests/test-mbscasestr1.c @@ -125,5 +125,5 @@ main () free (haystack); } - return 0; + return test_exit_status; } diff --git a/tests/test-mbscasestr2.c b/tests/test-mbscasestr2.c index c5370be58f..677e2b918a 100644 --- a/tests/test-mbscasestr2.c +++ b/tests/test-mbscasestr2.c @@ -137,5 +137,5 @@ main () free (haystack); } - return 0; + return test_exit_status; } diff --git a/tests/test-mbscasestr3.c b/tests/test-mbscasestr3.c index 9a2ca85b00..67df697283 100644 --- a/tests/test-mbscasestr3.c +++ b/tests/test-mbscasestr3.c @@ -78,5 +78,5 @@ main () ASSERT (result == NULL); } - return 0; + return test_exit_status; } diff --git a/tests/test-mbscasestr4.c b/tests/test-mbscasestr4.c index a7fda64910..bc5bbde9fb 100644 --- a/tests/test-mbscasestr4.c +++ b/tests/test-mbscasestr4.c @@ -52,5 +52,5 @@ main () ASSERT (mbscasestr (input, "TB\304\260L\304\260S\304\260 \304\260m\304\260n\304\260") == input + 1); /* TBİLİSİ İmİnİ */ } - return 0; + return test_exit_status; } diff --git a/tests/test-mbschr.c b/tests/test-mbschr.c index 20291614e3..fee78b1252 100644 --- a/tests/test-mbschr.c +++ b/tests/test-mbschr.c @@ -64,5 +64,5 @@ main () ASSERT (result == NULL); } - return 0; + return test_exit_status; } diff --git a/tests/test-mbscspn.c b/tests/test-mbscspn.c index ed0df48b9f..08edafe325 100644 --- a/tests/test-mbscspn.c +++ b/tests/test-mbscspn.c @@ -57,5 +57,5 @@ main () ASSERT (mbscspn (input, "\303") == 14); /* invalid multibyte sequence */ } - return 0; + return test_exit_status; } diff --git a/tests/test-mbsinit.c b/tests/test-mbsinit.c index 0250894dd2..d420935542 100644 --- a/tests/test-mbsinit.c +++ b/tests/test-mbsinit.c @@ -51,5 +51,5 @@ main (int argc, char *argv[]) ASSERT (!mbsinit (&state)); } - return 0; + return test_exit_status; } diff --git a/tests/test-mbsncasecmp.c b/tests/test-mbsncasecmp.c index 33cd5202e7..ce5c3c91b4 100644 --- a/tests/test-mbsncasecmp.c +++ b/tests/test-mbsncasecmp.c @@ -65,5 +65,5 @@ main () ASSERT (mbsncasecmp ("turkish", "TURK\304\260SH", 7) == 0); ASSERT (mbsncasecmp ("TURK\304\260SH", "turkish", 7) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-mbsnrtoc32s.c b/tests/test-mbsnrtoc32s.c index aa980bc4b5..63776aad37 100644 --- a/tests/test-mbsnrtoc32s.c +++ b/tests/test-mbsnrtoc32s.c @@ -368,7 +368,7 @@ main (int argc, char *argv[]) } } - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-mbsnrtowcs.c b/tests/test-mbsnrtowcs.c index 697512f08d..4386e29689 100644 --- a/tests/test-mbsnrtowcs.c +++ b/tests/test-mbsnrtowcs.c @@ -361,7 +361,7 @@ main (int argc, char *argv[]) } } - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-mbspbrk.c b/tests/test-mbspbrk.c index 95f47e48f5..037eefce9e 100644 --- a/tests/test-mbspbrk.c +++ b/tests/test-mbspbrk.c @@ -51,5 +51,5 @@ main () ASSERT (mbspbrk (input, "\303") == NULL); /* invalid multibyte sequence */ } - return 0; + return test_exit_status; } diff --git a/tests/test-mbspcasecmp.c b/tests/test-mbspcasecmp.c index 440cbd7144..aea64ca702 100644 --- a/tests/test-mbspcasecmp.c +++ b/tests/test-mbspcasecmp.c @@ -86,5 +86,5 @@ main () ASSERT (mbspcasecmp (string, "turkish") == string + 8); } - return 0; + return test_exit_status; } diff --git a/tests/test-mbsrchr.c b/tests/test-mbsrchr.c index 280430f76b..9f42187dff 100644 --- a/tests/test-mbsrchr.c +++ b/tests/test-mbsrchr.c @@ -58,5 +58,5 @@ main () ASSERT (result == input + 5); } - return 0; + return test_exit_status; } diff --git a/tests/test-mbsrtoc32s.c b/tests/test-mbsrtoc32s.c index fb6494a76d..066cfbc215 100644 --- a/tests/test-mbsrtoc32s.c +++ b/tests/test-mbsrtoc32s.c @@ -368,7 +368,7 @@ main (int argc, char *argv[]) } } - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-mbsrtowcs.c b/tests/test-mbsrtowcs.c index 7e958a40df..b863e1371c 100644 --- a/tests/test-mbsrtowcs.c +++ b/tests/test-mbsrtowcs.c @@ -361,7 +361,7 @@ main (int argc, char *argv[]) } } - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-mbsspn.c b/tests/test-mbsspn.c index 7ed12c8e73..b00fd43a2e 100644 --- a/tests/test-mbsspn.c +++ b/tests/test-mbsspn.c @@ -53,5 +53,5 @@ main () ASSERT (mbsspn (input, "\303") == 0); /* invalid multibyte sequence */ } - return 0; + return test_exit_status; } diff --git a/tests/test-mbsstr1.c b/tests/test-mbsstr1.c index c94309f5c8..828a92561f 100644 --- a/tests/test-mbsstr1.c +++ b/tests/test-mbsstr1.c @@ -124,5 +124,5 @@ main () free (haystack); } - return 0; + return test_exit_status; } diff --git a/tests/test-mbsstr2.c b/tests/test-mbsstr2.c index 8696d3159e..bbde2cce4b 100644 --- a/tests/test-mbsstr2.c +++ b/tests/test-mbsstr2.c @@ -137,5 +137,5 @@ main () free (haystack); } - return 0; + return test_exit_status; } diff --git a/tests/test-mbsstr3.c b/tests/test-mbsstr3.c index ff146c8ef4..54068c8945 100644 --- a/tests/test-mbsstr3.c +++ b/tests/test-mbsstr3.c @@ -77,5 +77,5 @@ main () ASSERT (result == NULL); } - return 0; + return test_exit_status; } diff --git a/tests/test-mbstoc32s.c b/tests/test-mbstoc32s.c index 297d707d41..987e18ee56 100644 --- a/tests/test-mbstoc32s.c +++ b/tests/test-mbstoc32s.c @@ -307,7 +307,7 @@ main (int argc, char *argv[]) } } - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-mbstowcs.c b/tests/test-mbstowcs.c index 766ea14e4a..b057b30892 100644 --- a/tests/test-mbstowcs.c +++ b/tests/test-mbstowcs.c @@ -256,7 +256,7 @@ main (int argc, char *argv[]) } } - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-mcel.c b/tests/test-mcel.c index 6988fffeee..7458fa472c 100644 --- a/tests/test-mcel.c +++ b/tests/test-mcel.c @@ -136,5 +136,5 @@ main (void) } } - return 0; + return test_exit_status; } diff --git a/tests/test-md5-stream.c b/tests/test-md5-stream.c index a9d2ef07a7..e78956de9e 100644 --- a/tests/test-md5-stream.c +++ b/tests/test-md5-stream.c @@ -40,5 +40,5 @@ main (void) "\x0d\x70\x06\xcd\x05\x5e\x94\xcf\x61\x45\x87\xe1\xd2\xae\x0c\x8e", "\xec\x99\x67\x9b\xff\xc0\xf9\xb0\x6d\x18\x30\x6b\x06\xd6\x56\x23"); - return 0; + return test_exit_status; } diff --git a/tests/test-memalign.c b/tests/test-memalign.c index 53f26127fa..13c2416ed5 100644 --- a/tests/test-memalign.c +++ b/tests/test-memalign.c @@ -88,7 +88,7 @@ main (int argc, char *argv[]) free (aligned64_blocks[i]); } - return 0; + return test_exit_status; } #else diff --git a/tests/test-memcasecmp.c b/tests/test-memcasecmp.c index ebafded1be..2619075837 100644 --- a/tests/test-memcasecmp.c +++ b/tests/test-memcasecmp.c @@ -69,5 +69,5 @@ main (void) } } - return 0; + return test_exit_status; } diff --git a/tests/test-memchr.c b/tests/test-memchr.c index c43ce9ff19..9111371a15 100644 --- a/tests/test-memchr.c +++ b/tests/test-memchr.c @@ -133,5 +133,5 @@ main (void) free (input); - return 0; + return test_exit_status; } diff --git a/tests/test-memchr2.c b/tests/test-memchr2.c index 84aec727af..bffc4b1dcd 100644 --- a/tests/test-memchr2.c +++ b/tests/test-memchr2.c @@ -98,5 +98,5 @@ main (void) free (input); - return 0; + return test_exit_status; } diff --git a/tests/test-memcmp.c b/tests/test-memcmp.c index 4a9cd3e361..11ae43719c 100644 --- a/tests/test-memcmp.c +++ b/tests/test-memcmp.c @@ -75,5 +75,5 @@ main (void) } } - return 0; + return test_exit_status; } diff --git a/tests/test-memcoll.c b/tests/test-memcoll.c index e21aa77d3d..8f98ea118b 100644 --- a/tests/test-memcoll.c +++ b/tests/test-memcoll.c @@ -48,5 +48,5 @@ main (void) ASSERT (memcoll0 ("x\0""1", 4, "x\0""2", 4) < 0); ASSERT (memcoll0 ("x\0""2", 4, "x\0""1", 4) > 0); - return 0; + return test_exit_status; } diff --git a/tests/test-memmem.c b/tests/test-memmem.c index b741f6abd5..748173fbe6 100644 --- a/tests/test-memmem.c +++ b/tests/test-memmem.c @@ -322,5 +322,5 @@ main (int argc, char *argv[]) free (haystack); } - return 0; + return test_exit_status; } diff --git a/tests/test-memrchr.c b/tests/test-memrchr.c index 0dde27ddf6..a6f15ceff7 100644 --- a/tests/test-memrchr.c +++ b/tests/test-memrchr.c @@ -94,5 +94,5 @@ main (void) free (input); - return 0; + return test_exit_status; } diff --git a/tests/test-memset_explicit.c b/tests/test-memset_explicit.c index f3da4a775b..e7ac64147c 100644 --- a/tests/test-memset_explicit.c +++ b/tests/test-memset_explicit.c @@ -243,5 +243,5 @@ main () test_heap (); test_stack (); - return 0; + return test_exit_status; } diff --git a/tests/test-mkdir.c b/tests/test-mkdir.c index ae0ed3415d..6a214639e3 100644 --- a/tests/test-mkdir.c +++ b/tests/test-mkdir.c @@ -42,5 +42,6 @@ main (void) /* Clean up any trash from prior testsuite runs. */ ignore_value (system ("rm -rf " BASE "*")); - return test_mkdir (mkdir, true); + int result = test_mkdir (mkdir, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-mkdirat.c b/tests/test-mkdirat.c index 6faa8443fe..037d0dfb08 100644 --- a/tests/test-mkdirat.c +++ b/tests/test-mkdirat.c @@ -93,5 +93,5 @@ main (_GL_UNUSED int argc, char *argv[]) ASSERT (rmdir (BASE "dir1") == 0); ASSERT (rmdir (BASE "dir2") == 0); - return result; + return (result ? result : test_exit_status); } diff --git a/tests/test-mkfifo.c b/tests/test-mkfifo.c index 88df9266a4..983472e89c 100644 --- a/tests/test-mkfifo.c +++ b/tests/test-mkfifo.c @@ -42,5 +42,6 @@ main (void) /* Remove any leftovers from a previous partial run. */ ignore_value (system ("rm -rf " BASE "*")); - return test_mkfifo (mkfifo, true); + int result = test_mkfifo (mkfifo, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-mkfifoat.c b/tests/test-mkfifoat.c index efcc016fdf..9723c494c0 100644 --- a/tests/test-mkfifoat.c +++ b/tests/test-mkfifoat.c @@ -145,5 +145,5 @@ main (void) ASSERT (close (dfd) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-mknod.c b/tests/test-mknod.c index 4a0db1894c..5e87145549 100644 --- a/tests/test-mknod.c +++ b/tests/test-mknod.c @@ -51,5 +51,6 @@ main (void) /* We can only portably test creation of fifos. Anything else requires root privileges and knowledge of device numbers. */ - return test_mkfifo (do_mknod, true); + int result = test_mkfifo (do_mknod, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-modf-ieee.c b/tests/test-modf-ieee.c index f81bf01d94..9e14a82ffb 100644 --- a/tests/test-modf-ieee.c +++ b/tests/test-modf-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-modf.c b/tests/test-modf.c index 13519e4952..accd1145f1 100644 --- a/tests/test-modf.c +++ b/tests/test-modf.c @@ -51,5 +51,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-modff-ieee.c b/tests/test-modff-ieee.c index 8d22a73d47..6969c0a9cf 100644 --- a/tests/test-modff-ieee.c +++ b/tests/test-modff-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-modff.c b/tests/test-modff.c index 3c170970d3..70fb49508e 100644 --- a/tests/test-modff.c +++ b/tests/test-modff.c @@ -51,5 +51,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-modfl-ieee.c b/tests/test-modfl-ieee.c index c847ed36c1..d758559e72 100644 --- a/tests/test-modfl-ieee.c +++ b/tests/test-modfl-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-modfl.c b/tests/test-modfl.c index 59fca5582b..31196c3601 100644 --- a/tests/test-modfl.c +++ b/tests/test-modfl.c @@ -56,5 +56,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-mtx.c b/tests/test-mtx.c index bc44e48a03..4c9f22a3c4 100644 --- a/tests/test-mtx.c +++ b/tests/test-mtx.c @@ -331,5 +331,5 @@ main () printf (" OK\n"); fflush (stdout); #endif - return 0; + return test_exit_status; } diff --git a/tests/test-nan-1.c b/tests/test-nan-1.c index efbef9869d..70e9b6d63c 100644 --- a/tests/test-nan-1.c +++ b/tests/test-nan-1.c @@ -75,7 +75,7 @@ main () ASSERT (!fetestexcept (FE_INVALID)); } - return 0; + return test_exit_status; } #endif diff --git a/tests/test-nan-2.c b/tests/test-nan-2.c index 205f1437fd..f0951180c7 100644 --- a/tests/test-nan-2.c +++ b/tests/test-nan-2.c @@ -65,7 +65,7 @@ main () resultd = nand + 42.0; resultl = nanl + 42.0L; - return 0; + return test_exit_status; } #else diff --git a/tests/test-nanosleep.c b/tests/test-nanosleep.c index c3953843b8..7c6069015f 100644 --- a/tests/test-nanosleep.c +++ b/tests/test-nanosleep.c @@ -90,5 +90,5 @@ main (void) } #endif - return 0; + return test_exit_status; } diff --git a/tests/test-nextafter.c b/tests/test-nextafter.c index 9b75f0fcd6..16c049da28 100644 --- a/tests/test-nextafter.c +++ b/tests/test-nextafter.c @@ -49,5 +49,5 @@ main () y = nextafter (x, x); ASSERT (y == x); - return 0; + return test_exit_status; } diff --git a/tests/test-nl_langinfo1.c b/tests/test-nl_langinfo1.c index 367e0c0c40..799b0869e6 100644 --- a/tests/test-nl_langinfo1.c +++ b/tests/test-nl_langinfo1.c @@ -148,5 +148,5 @@ main (int argc, char *argv[]) ASSERT (strlen (nl_langinfo (YESEXPR)) > 0); ASSERT (strlen (nl_langinfo (NOEXPR)) > 0); - return 0; + return test_exit_status; } diff --git a/tests/test-nl_langinfo2.c b/tests/test-nl_langinfo2.c index 0b8688a6fd..7fe8e1d451 100644 --- a/tests/test-nl_langinfo2.c +++ b/tests/test-nl_langinfo2.c @@ -138,7 +138,7 @@ main (int argc, char *argv[]) return 77; } - return 0; + return test_exit_status; #else fputs ("Skipping test: uselocale() not available\n", stderr); return 77; diff --git a/tests/test-nonblocking-pipe-child.c b/tests/test-nonblocking-pipe-child.c index a48978bacf..ba92110f44 100644 --- a/tests/test-nonblocking-pipe-child.c +++ b/tests/test-nonblocking-pipe-child.c @@ -45,5 +45,5 @@ main (int argc, char *argv[]) main_reader_loop (test, PIPE_DATA_BLOCK_SIZE, STDIN_FILENO); - return 0; + return test_exit_status; } diff --git a/tests/test-nonblocking-pipe-main.c b/tests/test-nonblocking-pipe-main.c index 3aec27a9d0..1602abb175 100644 --- a/tests/test-nonblocking-pipe-main.c +++ b/tests/test-nonblocking-pipe-main.c @@ -108,5 +108,5 @@ main (int argc, char *argv[]) ASSERT (err == 0); } - return exitcode; + return (exitcode ? exitcode : test_exit_status); } diff --git a/tests/test-nonblocking-socket-child.c b/tests/test-nonblocking-socket-child.c index 586f80cdca..c6446275b1 100644 --- a/tests/test-nonblocking-socket-child.c +++ b/tests/test-nonblocking-socket-child.c @@ -47,5 +47,5 @@ main (int argc, char *argv[]) main_reader_loop (test, SOCKET_DATA_BLOCK_SIZE, client_socket); - return 0; + return test_exit_status; } diff --git a/tests/test-nonblocking-socket-main.c b/tests/test-nonblocking-socket-main.c index 4c598c7c64..f59cf445da 100644 --- a/tests/test-nonblocking-socket-main.c +++ b/tests/test-nonblocking-socket-main.c @@ -119,5 +119,5 @@ main (int argc, char *argv[]) ASSERT (err == 0); } - return exitcode; + return (exitcode ? exitcode : test_exit_status); } diff --git a/tests/test-nonblocking.c b/tests/test-nonblocking.c index 64bcd2f71b..df5d4a6f4d 100644 --- a/tests/test-nonblocking.c +++ b/tests/test-nonblocking.c @@ -128,5 +128,5 @@ main (void) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-nstrftime.c b/tests/test-nstrftime.c index 4074874366..391bb72c14 100644 --- a/tests/test-nstrftime.c +++ b/tests/test-nstrftime.c @@ -69,5 +69,5 @@ main (void) fail |= locales_test (french); #endif } - return fail; + return (fail ? fail : test_exit_status); } diff --git a/tests/test-nullptr-c++.cc b/tests/test-nullptr-c++.cc index 7d0c861c6b..a960ced320 100644 --- a/tests/test-nullptr-c++.cc +++ b/tests/test-nullptr-c++.cc @@ -54,4 +54,6 @@ int main () { varargs_callee ("type", nullptr, "foo", nullptr); + + return test_exit_status; } diff --git a/tests/test-nullptr.c b/tests/test-nullptr.c index 5c8f99e65f..80b23f6ca7 100644 --- a/tests/test-nullptr.c +++ b/tests/test-nullptr.c @@ -65,5 +65,5 @@ main () { varargs_callee ("type", nullptr, "foo", nullptr); - return 0; + return test_exit_status; } diff --git a/tests/test-obstack-printf.c b/tests/test-obstack-printf.c index cf874f41bf..2c7694320b 100644 --- a/tests/test-obstack-printf.c +++ b/tests/test-obstack-printf.c @@ -131,5 +131,5 @@ main (int argc, char *argv[]) { test_obstack_vprintf (); test_obstack_printf (); - return 0; + return test_exit_status; } diff --git a/tests/test-omap-c++.cc b/tests/test-omap-c++.cc index 80326c4962..bc5166f26e 100644 --- a/tests/test-omap-c++.cc +++ b/tests/test-omap-c++.cc @@ -64,5 +64,5 @@ main (int argc, char *argv[]) map1.free (); - return 0; + return test_exit_status; } diff --git a/tests/test-once.c b/tests/test-once.c index 70f54c0296..332c86e5eb 100644 --- a/tests/test-once.c +++ b/tests/test-once.c @@ -39,5 +39,5 @@ main () ASSERT (a == 42); - return 0; + return test_exit_status; } diff --git a/tests/test-open.c b/tests/test-open.c index 52e72be981..b82b0ba206 100644 --- a/tests/test-open.c +++ b/tests/test-open.c @@ -36,5 +36,6 @@ SIGNATURE_CHECK (open, int, (char const *, int, ...)); int main (void) { - return test_open (open, true); + int result = test_open (open, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-openat-safer.c b/tests/test-openat-safer.c index 715ba12d79..6924caba67 100644 --- a/tests/test-openat-safer.c +++ b/tests/test-openat-safer.c @@ -121,5 +121,5 @@ main (void) ASSERT (unlink (witness) == 0); ASSERT (close (dfd) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-openat.c b/tests/test-openat.c index 6ae3e3e2d7..48ca448d84 100644 --- a/tests/test-openat.c +++ b/tests/test-openat.c @@ -94,5 +94,5 @@ main () ASSERT (openat (dfd, ".", O_RDONLY) == STDIN_FILENO); ASSERT (close (dfd) == 0); } - return result; + return (result ? result : test_exit_status); } diff --git a/tests/test-oset-c++.cc b/tests/test-oset-c++.cc index d4ae13c8b7..0226ccf717 100644 --- a/tests/test-oset-c++.cc +++ b/tests/test-oset-c++.cc @@ -95,5 +95,5 @@ main (int argc, char *argv[]) set1.free (); - return 0; + return test_exit_status; } diff --git a/tests/test-parse-datetime.c b/tests/test-parse-datetime.c index 05cf566579..3b35cb70dd 100644 --- a/tests/test-parse-datetime.c +++ b/tests/test-parse-datetime.c @@ -497,5 +497,5 @@ main (_GL_UNUSED int argc, char **argv) && result.tv_nsec == 123456789); } - return 0; + return test_exit_status; } diff --git a/tests/test-passfd.c b/tests/test-passfd.c index dd76b4f3e5..2e11439d7e 100644 --- a/tests/test-passfd.c +++ b/tests/test-passfd.c @@ -124,7 +124,7 @@ main () ASSERT (fd == -1); ASSERT (errno == ENOTCONN); - return 0; + return test_exit_status; } #else errno = 0; diff --git a/tests/test-perror2.c b/tests/test-perror2.c index edf1d15f9f..5fe25d69fd 100644 --- a/tests/test-perror2.c +++ b/tests/test-perror2.c @@ -134,5 +134,5 @@ main (void) ASSERT (fclose (stderr) == 0); ASSERT (remove (BASE ".tmp") == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-physmem.c b/tests/test-physmem.c index 8aefcae3e2..a1ec541f5a 100644 --- a/tests/test-physmem.c +++ b/tests/test-physmem.c @@ -34,5 +34,5 @@ main (int argc, char *argv[]) ASSERT (physmem_total () >= physmem_available ()); ASSERT (physmem_available () >= 4 * 1024 * 1024); - return 0; + return test_exit_status; } diff --git a/tests/test-pipe-filter-gi1.c b/tests/test-pipe-filter-gi1.c index cfc58afce4..152daa9335 100644 --- a/tests/test-pipe-filter-gi1.c +++ b/tests/test-pipe-filter-gi1.c @@ -110,5 +110,5 @@ main (int argc, char *argv[]) free (input); - return 0; + return test_exit_status; } diff --git a/tests/test-pipe-filter-gi2-main.c b/tests/test-pipe-filter-gi2-main.c index 24916ab25f..ff8966a3fc 100644 --- a/tests/test-pipe-filter-gi2-main.c +++ b/tests/test-pipe-filter-gi2-main.c @@ -136,5 +136,5 @@ main (int argc, char **argv) fflush (stdout); } - return 0; + return test_exit_status; } diff --git a/tests/test-pipe-filter-ii1.c b/tests/test-pipe-filter-ii1.c index ae1106479c..ab404c199c 100644 --- a/tests/test-pipe-filter-ii1.c +++ b/tests/test-pipe-filter-ii1.c @@ -132,5 +132,5 @@ main (int argc, char *argv[]) free (input); - return 0; + return test_exit_status; } diff --git a/tests/test-pipe-filter-ii2-main.c b/tests/test-pipe-filter-ii2-main.c index 61cf081bd7..2d81dc0f4f 100644 --- a/tests/test-pipe-filter-ii2-main.c +++ b/tests/test-pipe-filter-ii2-main.c @@ -148,5 +148,5 @@ main (int argc, char **argv) fflush (stdout); } - return 0; + return test_exit_status; } diff --git a/tests/test-pipe.c b/tests/test-pipe.c index e9ebe162a7..f7b2424188 100644 --- a/tests/test-pipe.c +++ b/tests/test-pipe.c @@ -103,5 +103,5 @@ main () ASSERT (!is_nonblocking (fd[0])); ASSERT (!is_nonblocking (fd[1])); - return 0; + return test_exit_status; } diff --git a/tests/test-pipe2.c b/tests/test-pipe2.c index 900614a2a8..885aa2773a 100644 --- a/tests/test-pipe2.c +++ b/tests/test-pipe2.c @@ -142,5 +142,5 @@ main () ASSERT (close (fd[1]) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-poll.c b/tests/test-poll.c index 5275c44ac5..0f89694819 100644 --- a/tests/test-poll.c +++ b/tests/test-poll.c @@ -390,5 +390,5 @@ main () result += test (test_accept_first, "General socket test with fork"); result += test (test_pipe, "Pipe test"); - exit (result); + return (result ? result : test_exit_status); } diff --git a/tests/test-popen-safer.c b/tests/test-popen-safer.c index 646e6f5914..835786a74d 100644 --- a/tests/test-popen-safer.c +++ b/tests/test-popen-safer.c @@ -72,5 +72,6 @@ main (int argc, char **argv) status = pclose (fp); ASSERT (WIFEXITED (status)); ASSERT (!WEXITSTATUS (status)); - return 0; + + return test_exit_status; } diff --git a/tests/test-popen.h b/tests/test-popen.h index b7009bec97..5928d6b2ae 100644 --- a/tests/test-popen.h +++ b/tests/test-popen.h @@ -89,5 +89,5 @@ main (int argc, char **argv) } } free (cmd); - return 0; + return test_exit_status; } diff --git a/tests/test-posix_memalign.c b/tests/test-posix_memalign.c index af71d6d692..98a2f941df 100644 --- a/tests/test-posix_memalign.c +++ b/tests/test-posix_memalign.c @@ -99,7 +99,7 @@ main (int argc, char *argv[]) free (aligned64_blocks[i]); } - return 0; + return test_exit_status; #else fputs ("Skipping test: function 'aligned_alloc' does not exist\n", stderr); return 77; diff --git a/tests/test-posix_openpt.c b/tests/test-posix_openpt.c index daf9636dc0..95d69cd7ae 100644 --- a/tests/test-posix_openpt.c +++ b/tests/test-posix_openpt.c @@ -72,5 +72,5 @@ main (void) ASSERT (close (master) == 0); ASSERT (close (slave) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-posix_spawn-script.c b/tests/test-posix_spawn-script.c index b6d60af2ad..287ab52072 100644 --- a/tests/test-posix_spawn-script.c +++ b/tests/test-posix_spawn-script.c @@ -152,5 +152,5 @@ main () /* Clean up data file. */ unlink (DATA_FILENAME); - return 0; + return test_exit_status; } diff --git a/tests/test-posix_spawn_file_actions_addchdir.c b/tests/test-posix_spawn_file_actions_addchdir.c index 27350a4e8f..e1f34337e1 100644 --- a/tests/test-posix_spawn_file_actions_addchdir.c +++ b/tests/test-posix_spawn_file_actions_addchdir.c @@ -40,5 +40,5 @@ main (void) posix_spawn_file_actions_destroy (&actions); - return 0; + return test_exit_status; } diff --git a/tests/test-posix_spawn_file_actions_addclose.c b/tests/test-posix_spawn_file_actions_addclose.c index e7b1f163a0..595ecff3a6 100644 --- a/tests/test-posix_spawn_file_actions_addclose.c +++ b/tests/test-posix_spawn_file_actions_addclose.c @@ -66,5 +66,5 @@ main (void) posix_spawn_file_actions_destroy (&actions); - return 0; + return test_exit_status; } diff --git a/tests/test-posix_spawn_file_actions_adddup2.c b/tests/test-posix_spawn_file_actions_adddup2.c index 9eb7401094..152f3c35e0 100644 --- a/tests/test-posix_spawn_file_actions_adddup2.c +++ b/tests/test-posix_spawn_file_actions_adddup2.c @@ -70,5 +70,5 @@ main (void) posix_spawn_file_actions_destroy (&actions); - return 0; + return test_exit_status; } diff --git a/tests/test-posix_spawn_file_actions_addfchdir.c b/tests/test-posix_spawn_file_actions_addfchdir.c index 05adac5d21..7e99008a8a 100644 --- a/tests/test-posix_spawn_file_actions_addfchdir.c +++ b/tests/test-posix_spawn_file_actions_addfchdir.c @@ -40,5 +40,5 @@ main (void) posix_spawn_file_actions_destroy (&actions); - return 0; + return test_exit_status; } diff --git a/tests/test-posix_spawn_file_actions_addopen.c b/tests/test-posix_spawn_file_actions_addopen.c index 3d5ed91109..49e91385b0 100644 --- a/tests/test-posix_spawn_file_actions_addopen.c +++ b/tests/test-posix_spawn_file_actions_addopen.c @@ -68,5 +68,5 @@ main (void) posix_spawn_file_actions_destroy (&actions); - return 0; + return test_exit_status; } diff --git a/tests/test-posix_spawnp-script.c b/tests/test-posix_spawnp-script.c index 68e5b1ba84..d1ed9d9a18 100644 --- a/tests/test-posix_spawnp-script.c +++ b/tests/test-posix_spawnp-script.c @@ -152,5 +152,5 @@ main () /* Clean up data file. */ unlink (DATA_FILENAME); - return 0; + return test_exit_status; } diff --git a/tests/test-posixtm.c b/tests/test-posixtm.c index 193f4ea16e..d4e5b78bbc 100644 --- a/tests/test-posixtm.c +++ b/tests/test-posixtm.c @@ -117,7 +117,6 @@ int main (void) { unsigned int i; - int fail = 0; char curr_year_str[30]; struct tm *tm; time_t t_now; @@ -176,7 +175,7 @@ main (void) { printf ("%s return value mismatch: got %d, expected %d\n", T[i].in, !!ok, T[i].valid); - fail = 1; + test_exit_status = EXIT_FAILURE; continue; } @@ -187,11 +186,11 @@ main (void) { printf ("%s mismatch (-: actual; +:expected)\n-%12ld\n+%12ld\n", T[i].in, (long) t_out, (long) t_exp); - fail = 1; + test_exit_status = EXIT_FAILURE; } } - return fail; + return test_exit_status; } /* diff --git a/tests/test-pow.c b/tests/test-pow.c index d0b8e8d569..7b9051c792 100644 --- a/tests/test-pow.c +++ b/tests/test-pow.c @@ -38,5 +38,5 @@ main () z = pow (x, y); ASSERT (z >= 728.9999999 && z <= 729.0000001); - return 0; + return test_exit_status; } diff --git a/tests/test-powf.c b/tests/test-powf.c index 57f4f90c7c..0572ba84b5 100644 --- a/tests/test-powf.c +++ b/tests/test-powf.c @@ -38,5 +38,5 @@ main () z = powf (x, y); ASSERT (z >= 728.999f && z <= 729.001f); - return 0; + return test_exit_status; } diff --git a/tests/test-pread.c b/tests/test-pread.c index 36de84029e..938a2048f2 100644 --- a/tests/test-pread.c +++ b/tests/test-pread.c @@ -98,5 +98,5 @@ main (void) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-printf-frexp.c b/tests/test-printf-frexp.c index e3aa7cafaa..5602e56053 100644 --- a/tests/test-printf-frexp.c +++ b/tests/test-printf-frexp.c @@ -115,5 +115,5 @@ main () ASSERT (mantissa == my_ldexp (x, - exp)); } - return 0; + return test_exit_status; } diff --git a/tests/test-printf-frexpl.c b/tests/test-printf-frexpl.c index dd39fe849d..ae3f562962 100644 --- a/tests/test-printf-frexpl.c +++ b/tests/test-printf-frexpl.c @@ -130,5 +130,5 @@ main () ASSERT (mantissa == my_ldexp (x, - exp)); } - return 0; + return test_exit_status; } diff --git a/tests/test-printf-gnu.c b/tests/test-printf-gnu.c index e1e6f0ec4f..ccd4f8bd67 100644 --- a/tests/test-printf-gnu.c +++ b/tests/test-printf-gnu.c @@ -31,5 +31,5 @@ int main (int argc, char *argv[]) { test_function (printf); - return 0; + return test_exit_status; } diff --git a/tests/test-printf-posix.c b/tests/test-printf-posix.c index b84579f6d6..f24a0297ef 100644 --- a/tests/test-printf-posix.c +++ b/tests/test-printf-posix.c @@ -35,7 +35,7 @@ int main (int argc, char *argv[]) { test_function (printf); - return 0; + return test_exit_status; } /* Test whether __attribute__ (__format__ (...)) still works. */ diff --git a/tests/test-priv-set.c b/tests/test-priv-set.c index f7177d6eb8..eb7a838aef 100644 --- a/tests/test-priv-set.c +++ b/tests/test-priv-set.c @@ -84,5 +84,5 @@ main (void) ASSERT (priv_set_remove_linkdir () == -1); #endif - return 0; + return test_exit_status; } diff --git a/tests/test-pselect.c b/tests/test-pselect.c index 2f239ddf55..82b2336215 100644 --- a/tests/test-pselect.c +++ b/tests/test-pselect.c @@ -45,5 +45,6 @@ my_select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, int main (void) { - return test_function (my_select); + int result = test_function (my_select); + return (result ? result : test_exit_status); } diff --git a/tests/test-pthread-cond.c b/tests/test-pthread-cond.c index 5c784f86db..145d4b4666 100644 --- a/tests/test-pthread-cond.c +++ b/tests/test-pthread-cond.c @@ -219,7 +219,7 @@ main () printf (" OK\n"); fflush (stdout); #endif - return 0; + return test_exit_status; } #else diff --git a/tests/test-pthread-mutex.c b/tests/test-pthread-mutex.c index ece1bb43e3..ed1d64b7fc 100644 --- a/tests/test-pthread-mutex.c +++ b/tests/test-pthread-mutex.c @@ -346,7 +346,7 @@ main () printf (" OK\n"); fflush (stdout); #endif - return 0; + return test_exit_status; } #else diff --git a/tests/test-pthread-once1.c b/tests/test-pthread-once1.c index 68dad8f78a..92546e439d 100644 --- a/tests/test-pthread-once1.c +++ b/tests/test-pthread-once1.c @@ -39,5 +39,5 @@ main () ASSERT (a == 42); - return 0; + return test_exit_status; } diff --git a/tests/test-pthread-once2.c b/tests/test-pthread-once2.c index 0449319378..f175e79682 100644 --- a/tests/test-pthread-once2.c +++ b/tests/test-pthread-once2.c @@ -264,7 +264,7 @@ main () test_once (); printf (" OK\n"); fflush (stdout); - return 0; + return test_exit_status; } #else diff --git a/tests/test-pthread-rwlock.c b/tests/test-pthread-rwlock.c index 79140018b8..7ab8d5eeaa 100644 --- a/tests/test-pthread-rwlock.c +++ b/tests/test-pthread-rwlock.c @@ -210,7 +210,7 @@ main () test_rwlock (); printf (" OK\n"); fflush (stdout); - return 0; + return test_exit_status; } #else diff --git a/tests/test-pthread-spin.c b/tests/test-pthread-spin.c index e95aedc670..8b2cf3062b 100644 --- a/tests/test-pthread-spin.c +++ b/tests/test-pthread-spin.c @@ -212,7 +212,7 @@ main () test_pthread_spin (); printf (" OK\n"); fflush (stdout); - return 0; + return test_exit_status; } #else diff --git a/tests/test-pthread-thread.c b/tests/test-pthread-thread.c index f0a1979377..6390d8f74f 100644 --- a/tests/test-pthread-thread.c +++ b/tests/test-pthread-thread.c @@ -63,7 +63,7 @@ main () /* Check that worker_thread_func () has finished executing. */ ASSERT (work_done); - return 0; + return test_exit_status; } else { diff --git a/tests/test-pthread-tss.c b/tests/test-pthread-tss.c index c46bc5c8c7..76fdd62567 100644 --- a/tests/test-pthread-tss.c +++ b/tests/test-pthread-tss.c @@ -551,7 +551,7 @@ main () test_tss_racecheck (); printf (" OK\n"); fflush (stdout); - return 0; + return test_exit_status; } #else diff --git a/tests/test-pthread_sigmask1.c b/tests/test-pthread_sigmask1.c index a4f9ba6d7f..93ed7eb172 100644 --- a/tests/test-pthread_sigmask1.c +++ b/tests/test-pthread_sigmask1.c @@ -78,7 +78,7 @@ main () before the call to pthread_sigmask() returns." */ ASSERT (sigint_occurred == 1); - return 0; + return test_exit_status; } #else diff --git a/tests/test-pthread_sigmask2.c b/tests/test-pthread_sigmask2.c index d527eb8d65..fa3c1d8d91 100644 --- a/tests/test-pthread_sigmask2.c +++ b/tests/test-pthread_sigmask2.c @@ -90,7 +90,7 @@ main () from "gcc -fsanitize=thread". */ ASSERT (pthread_join (killer_thread, NULL) == 0); - return 0; + return test_exit_status; } #else diff --git a/tests/test-ptsname.c b/tests/test-ptsname.c index e99dc89f55..bbeeb0a1a3 100644 --- a/tests/test-ptsname.c +++ b/tests/test-ptsname.c @@ -247,5 +247,5 @@ main (void) #endif - return 0; + return test_exit_status; } diff --git a/tests/test-ptsname_r.c b/tests/test-ptsname_r.c index ca8cf1c581..04e27f007b 100644 --- a/tests/test-ptsname_r.c +++ b/tests/test-ptsname_r.c @@ -312,5 +312,5 @@ main (void) #endif - return 0; + return test_exit_status; } diff --git a/tests/test-putenv.c b/tests/test-putenv.c index 564c86713a..37615e3af9 100644 --- a/tests/test-putenv.c +++ b/tests/test-putenv.c @@ -57,5 +57,5 @@ main (void) ASSERT (getenv ("TEST_VAR") == NULL); } - return 0; + return test_exit_status; } diff --git a/tests/test-pwrite.c b/tests/test-pwrite.c index 4471af7977..8886298aeb 100644 --- a/tests/test-pwrite.c +++ b/tests/test-pwrite.c @@ -92,5 +92,5 @@ main (void) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-quotearg-simple.c b/tests/test-quotearg-simple.c index 18d33d4344..ca6cd9df86 100644 --- a/tests/test-quotearg-simple.c +++ b/tests/test-quotearg-simple.c @@ -375,5 +375,5 @@ main (_GL_UNUSED int argc, char *argv[]) quotearg_free (); - return 0; + return test_exit_status; } diff --git a/tests/test-quotearg.c b/tests/test-quotearg.c index c9889496d9..d454b5acd8 100644 --- a/tests/test-quotearg.c +++ b/tests/test-quotearg.c @@ -93,7 +93,7 @@ main (_GL_UNUSED int argc, char *argv[]) compare_strings (use_quotearg_colon, &locale_results[1].group3, false); quotearg_free (); - return 0; + return test_exit_status; } } diff --git a/tests/test-raise.c b/tests/test-raise.c index 39ffdc3085..35e5abac7b 100644 --- a/tests/test-raise.c +++ b/tests/test-raise.c @@ -32,7 +32,7 @@ SIGNATURE_CHECK (raise, int, (int)); static _Noreturn void handler (_GL_UNUSED int sig) { - _exit (0); + _exit (test_exit_status); } int diff --git a/tests/test-random.c b/tests/test-random.c index 4bfc1b8483..499cb7e044 100644 --- a/tests/test-random.c +++ b/tests/test-random.c @@ -45,5 +45,7 @@ main () } /* Fail if none of the numbers were larger than RAND_MAX / 2. */ - return !n_big; + if (!n_big) + return 1; + return test_exit_status; } diff --git a/tests/test-random_r.c b/tests/test-random_r.c index 19f570d787..99b7478ba3 100644 --- a/tests/test-random_r.c +++ b/tests/test-random_r.c @@ -64,5 +64,5 @@ main () for (alignment = 0; alignment < sizeof (int32_t); alignment++) if (test_failed (alignment)) return 1; - return 0; + return test_exit_status; } diff --git a/tests/test-rawmemchr.c b/tests/test-rawmemchr.c index 23d411c77a..5374a9be68 100644 --- a/tests/test-rawmemchr.c +++ b/tests/test-rawmemchr.c @@ -101,5 +101,5 @@ main (void) free (input); } - return 0; + return test_exit_status; } diff --git a/tests/test-rbtree_list.c b/tests/test-rbtree_list.c index 153715ceab..74bf20c187 100644 --- a/tests/test-rbtree_list.c +++ b/tests/test-rbtree_list.c @@ -459,5 +459,5 @@ main (int argc, char *argv[]) free (contents); } - return 0; + return test_exit_status; } diff --git a/tests/test-rbtree_omap.c b/tests/test-rbtree_omap.c index 89ce4c86aa..de346f0de6 100644 --- a/tests/test-rbtree_omap.c +++ b/tests/test-rbtree_omap.c @@ -134,5 +134,5 @@ main (int argc, char *argv[]) gl_omap_free (map2); } - return 0; + return test_exit_status; } diff --git a/tests/test-rbtree_oset.c b/tests/test-rbtree_oset.c index fc13fd14ff..ce3bbc1a72 100644 --- a/tests/test-rbtree_oset.c +++ b/tests/test-rbtree_oset.c @@ -165,5 +165,5 @@ main (int argc, char *argv[]) test_update (GL_RBTREE_OSET); - return 0; + return test_exit_status; } diff --git a/tests/test-rbtreehash_list.c b/tests/test-rbtreehash_list.c index 9995d5f578..62bd5a1efb 100644 --- a/tests/test-rbtreehash_list.c +++ b/tests/test-rbtreehash_list.c @@ -489,5 +489,5 @@ main (int argc, char *argv[]) free (contents); } - return 0; + return test_exit_status; } diff --git a/tests/test-read-file.c b/tests/test-read-file.c index dd84116efc..5c00e37265 100644 --- a/tests/test-read-file.c +++ b/tests/test-read-file.c @@ -120,5 +120,5 @@ main (void) ASSERT (!test_read_file (RF_SENSITIVE)); ASSERT (!test_read_file (RF_BINARY | RF_SENSITIVE)); - return 0; + return test_exit_status; } diff --git a/tests/test-read.c b/tests/test-read.c index 03b803b0d6..43be19df4a 100644 --- a/tests/test-read.c +++ b/tests/test-read.c @@ -69,5 +69,5 @@ main (void) /* Clean up. */ unlink (filename); - return 0; + return test_exit_status; } diff --git a/tests/test-readlink.c b/tests/test-readlink.c index 911b8a1327..2dc7268334 100644 --- a/tests/test-readlink.c +++ b/tests/test-readlink.c @@ -43,5 +43,6 @@ main (void) /* Remove any leftovers from a previous partial run. */ ignore_value (system ("rm -rf " BASE "*")); - return test_readlink (readlink, true); + int result = test_readlink (readlink, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-readlinkat.c b/tests/test-readlinkat.c index c36094f2ed..5451972c79 100644 --- a/tests/test-readlinkat.c +++ b/tests/test-readlinkat.c @@ -116,5 +116,5 @@ main (void) if (result == 77) fputs ("skipping test: symlinks not supported on this file system\n", stderr); - return result; + return (result ? result : test_exit_status); } diff --git a/tests/test-readtokens.c b/tests/test-readtokens.c index ad3cf77a66..a74cc84d19 100644 --- a/tests/test-readtokens.c +++ b/tests/test-readtokens.c @@ -93,5 +93,5 @@ main (int argc, char **argv) ASSERT ( ! ferror (stdin)); - return 0; + return test_exit_status; } diff --git a/tests/test-readutmp.c b/tests/test-readutmp.c index 510d16774d..df0fe4ac77 100644 --- a/tests/test-readutmp.c +++ b/tests/test-readutmp.c @@ -156,5 +156,5 @@ main (int argc, char *argv[]) free (entries); - return 0; + return test_exit_status; } diff --git a/tests/test-realloc-gnu.c b/tests/test-realloc-gnu.c index 54832ee8fe..f36866ce0d 100644 --- a/tests/test-realloc-gnu.c +++ b/tests/test-realloc-gnu.c @@ -45,5 +45,5 @@ main (int argc, _GL_UNUSED char **argv) } free (p); - return 0; + return test_exit_status; } diff --git a/tests/test-reallocarray.c b/tests/test-reallocarray.c index fb9171ce8a..2748b982ca 100644 --- a/tests/test-reallocarray.c +++ b/tests/test-reallocarray.c @@ -54,5 +54,5 @@ main () free (p); } - return 0; + return test_exit_status; } diff --git a/tests/test-recv.c b/tests/test-recv.c index 1062b21635..5c887b6db5 100644 --- a/tests/test-recv.c +++ b/tests/test-recv.c @@ -47,5 +47,5 @@ main (void) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-recvfrom.c b/tests/test-recvfrom.c index 223cdb086c..56354611a0 100644 --- a/tests/test-recvfrom.c +++ b/tests/test-recvfrom.c @@ -58,5 +58,5 @@ main (void) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-regex-quote.c b/tests/test-regex-quote.c index 557cff7962..6908f8a64d 100644 --- a/tests/test-regex-quote.c +++ b/tests/test-regex-quote.c @@ -95,5 +95,5 @@ main () { test_bre (); test_ere (); - return 0; + return test_exit_status; } diff --git a/tests/test-remainder-ieee.c b/tests/test-remainder-ieee.c index ac4d386946..f854d215b1 100644 --- a/tests/test-remainder-ieee.c +++ b/tests/test-remainder-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-remainder.c b/tests/test-remainder.c index 30efa2101d..29060136fc 100644 --- a/tests/test-remainder.c +++ b/tests/test-remainder.c @@ -46,5 +46,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-remainderf-ieee.c b/tests/test-remainderf-ieee.c index 13d2515c68..6ad7267461 100644 --- a/tests/test-remainderf-ieee.c +++ b/tests/test-remainderf-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-remainderf.c b/tests/test-remainderf.c index df40c207bc..f177ed326a 100644 --- a/tests/test-remainderf.c +++ b/tests/test-remainderf.c @@ -46,5 +46,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-remainderl-ieee.c b/tests/test-remainderl-ieee.c index 89b8888de7..c96b282f11 100644 --- a/tests/test-remainderl-ieee.c +++ b/tests/test-remainderl-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-remainderl.c b/tests/test-remainderl.c index 2fb14edc26..1dc77cc9d6 100644 --- a/tests/test-remainderl.c +++ b/tests/test-remainderl.c @@ -51,5 +51,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-remove.c b/tests/test-remove.c index 0674dce8a0..3d0645fbbe 100644 --- a/tests/test-remove.c +++ b/tests/test-remove.c @@ -121,5 +121,5 @@ main (void) ASSERT (remove (BASE "link") == 0); ASSERT (remove (BASE "file") == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-rename.c b/tests/test-rename.c index df3e8fb643..d3749530db 100644 --- a/tests/test-rename.c +++ b/tests/test-rename.c @@ -42,5 +42,6 @@ main (void) /* Remove any garbage left from previous partial runs. */ ignore_value (system ("rm -rf " BASE "*")); - return test_rename (rename, true); + int result = test_rename (rename, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-renameat.c b/tests/test-renameat.c index 79bf87b474..65260488ed 100644 --- a/tests/test-renameat.c +++ b/tests/test-renameat.c @@ -200,8 +200,8 @@ main (void) ASSERT (errno == ENOENT); free (cwd); - if (result) + if (result == 77) fputs ("skipping test: symlinks not supported on this file system\n", stderr); - return result; + return (result ? result : test_exit_status); } diff --git a/tests/test-renameatu.c b/tests/test-renameatu.c index 9f3a71f0d9..7f8e3444ca 100644 --- a/tests/test-renameatu.c +++ b/tests/test-renameatu.c @@ -220,8 +220,8 @@ main (void) ASSERT (rmdir (BASE "sub2") == 0); free (cwd); - if (result) + if (result == 77) fputs ("skipping test: symlinks not supported on this file system\n", stderr); - return result; + return (result ? result : test_exit_status); } diff --git a/tests/test-rint-ieee.c b/tests/test-rint-ieee.c index 31eb38df0c..283471a562 100644 --- a/tests/test-rint-ieee.c +++ b/tests/test-rint-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-rint.c b/tests/test-rint.c index 3934e4d147..d77e79cfe9 100644 --- a/tests/test-rint.c +++ b/tests/test-rint.c @@ -90,7 +90,7 @@ main () test_function (); - return 0; + return test_exit_status; } else { diff --git a/tests/test-rintf-ieee.c b/tests/test-rintf-ieee.c index d1d1f665fc..84f9753a6c 100644 --- a/tests/test-rintf-ieee.c +++ b/tests/test-rintf-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-rintf.c b/tests/test-rintf.c index 9fde9be061..f4f84ca8d4 100644 --- a/tests/test-rintf.c +++ b/tests/test-rintf.c @@ -90,7 +90,7 @@ main () test_function (); - return 0; + return test_exit_status; } else { diff --git a/tests/test-rintl-ieee.c b/tests/test-rintl-ieee.c index 1c1691e57c..3482c5b977 100644 --- a/tests/test-rintl-ieee.c +++ b/tests/test-rintl-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-rintl.c b/tests/test-rintl.c index 87f8445006..3aee963fe7 100644 --- a/tests/test-rintl.c +++ b/tests/test-rintl.c @@ -95,7 +95,7 @@ main () test_function (); - return 0; + return test_exit_status; } else { diff --git a/tests/test-rmdir.c b/tests/test-rmdir.c index 7f18663bef..e0c66b1fca 100644 --- a/tests/test-rmdir.c +++ b/tests/test-rmdir.c @@ -42,5 +42,6 @@ main (void) /* Remove any leftovers from a previous partial run. */ ignore_value (system ("rm -rf " BASE "*")); - return test_rmdir_func (rmdir, true); + int result = test_rmdir_func (rmdir, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-round-ieee.c b/tests/test-round-ieee.c index 4a43bc9247..0a3f1b4123 100644 --- a/tests/test-round-ieee.c +++ b/tests/test-round-ieee.c @@ -50,5 +50,5 @@ main () ASSERT (round (Infinityd ()) == Infinityd ()); ASSERT (round (- Infinityd ()) == - Infinityd ()); - return 0; + return test_exit_status; } diff --git a/tests/test-round1.c b/tests/test-round1.c index 94983ff177..d8e247d4b6 100644 --- a/tests/test-round1.c +++ b/tests/test-round1.c @@ -68,5 +68,5 @@ main () /* NaNs. */ ASSERT (isnand (round (NaNd ()))); - return 0; + return test_exit_status; } diff --git a/tests/test-roundf-ieee.c b/tests/test-roundf-ieee.c index 31bc540e80..20258873c0 100644 --- a/tests/test-roundf-ieee.c +++ b/tests/test-roundf-ieee.c @@ -50,5 +50,5 @@ main () ASSERT (roundf (Infinityf ()) == Infinityf ()); ASSERT (roundf (- Infinityf ()) == - Infinityf ()); - return 0; + return test_exit_status; } diff --git a/tests/test-roundf1.c b/tests/test-roundf1.c index 673b8ab430..86971c15c6 100644 --- a/tests/test-roundf1.c +++ b/tests/test-roundf1.c @@ -68,5 +68,5 @@ main () /* NaNs. */ ASSERT (isnanf (roundf (NaNf ()))); - return 0; + return test_exit_status; } diff --git a/tests/test-roundl-ieee.c b/tests/test-roundl-ieee.c index 2122284ead..0f33efdc50 100644 --- a/tests/test-roundl-ieee.c +++ b/tests/test-roundl-ieee.c @@ -55,5 +55,5 @@ main () ASSERT (roundl (Infinityl ()) == Infinityl ()); ASSERT (roundl (- Infinityl ()) == - Infinityl ()); - return 0; + return test_exit_status; } diff --git a/tests/test-roundl.c b/tests/test-roundl.c index 2e3c9a61db..af3098b2d3 100644 --- a/tests/test-roundl.c +++ b/tests/test-roundl.c @@ -75,5 +75,5 @@ main () /* NaNs. */ ASSERT (isnanl (roundl (NaNl ()))); - return 0; + return test_exit_status; } diff --git a/tests/test-safe-alloc.c b/tests/test-safe-alloc.c index 9fd9d6232c..057eda4f9f 100644 --- a/tests/test-safe-alloc.c +++ b/tests/test-safe-alloc.c @@ -50,5 +50,5 @@ main () FREE (p); ASSERT (p == NULL); - return 0; + return test_exit_status; } diff --git a/tests/test-sameacls.c b/tests/test-sameacls.c index ea1634677f..358d03773b 100644 --- a/tests/test-sameacls.c +++ b/tests/test-sameacls.c @@ -710,5 +710,5 @@ main (int argc, char *argv[]) #endif } - return 0; + return test_exit_status; } diff --git a/tests/test-scratch-buffer.c b/tests/test-scratch-buffer.c index 35a5adce0d..190061efc2 100644 --- a/tests/test-scratch-buffer.c +++ b/tests/test-scratch-buffer.c @@ -126,5 +126,5 @@ main () scratch_buffer_free (&buf); } - return 0; + return test_exit_status; } diff --git a/tests/test-select.c b/tests/test-select.c index a75c9244b4..56f8b42624 100644 --- a/tests/test-select.c +++ b/tests/test-select.c @@ -31,5 +31,6 @@ SIGNATURE_CHECK (select, int, (int, fd_set *, fd_set *, fd_set *, int main (void) { - return test_function (select); + int result = test_function (select); + return (result ? result : test_exit_status); } diff --git a/tests/test-send.c b/tests/test-send.c index d148fffc84..3e73d764a1 100644 --- a/tests/test-send.c +++ b/tests/test-send.c @@ -47,5 +47,5 @@ main (void) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-sendto.c b/tests/test-sendto.c index 219a6526d1..ade515b98d 100644 --- a/tests/test-sendto.c +++ b/tests/test-sendto.c @@ -62,5 +62,5 @@ main (void) } } - return 0; + return test_exit_status; } diff --git a/tests/test-set-c++.cc b/tests/test-set-c++.cc index cace8ef264..da664e6453 100644 --- a/tests/test-set-c++.cc +++ b/tests/test-set-c++.cc @@ -52,5 +52,5 @@ main (int argc, char *argv[]) set1.free (); - return 0; + return test_exit_status; } diff --git a/tests/test-set-mode-acl.c b/tests/test-set-mode-acl.c index 330f905892..1c2217df57 100644 --- a/tests/test-set-mode-acl.c +++ b/tests/test-set-mode-acl.c @@ -37,5 +37,5 @@ main (int argc, char *argv[]) set_acl (file, -1, mode); - return 0; + return test_exit_status; } diff --git a/tests/test-setenv.c b/tests/test-setenv.c index 3b2850e40f..3dfb623848 100644 --- a/tests/test-setenv.c +++ b/tests/test-setenv.c @@ -52,5 +52,5 @@ main (void) ASSERT (errno == EINVAL); #endif - return 0; + return test_exit_status; } diff --git a/tests/test-sethostname2.c b/tests/test-sethostname2.c index e8dd899f3f..33d7da76de 100644 --- a/tests/test-sethostname2.c +++ b/tests/test-sethostname2.c @@ -129,5 +129,5 @@ main (int argc, _GL_UNUSED char *argv[]) /* restore the original name. */ ASSERT (sethostname (origname, strlen (origname)) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-setlocale1.c b/tests/test-setlocale1.c index 329991b3a2..6602e67583 100644 --- a/tests/test-setlocale1.c +++ b/tests/test-setlocale1.c @@ -60,5 +60,5 @@ main (int argc, char *argv[]) free (name1); free (name2); - return 0; + return test_exit_status; } diff --git a/tests/test-setpayload.c b/tests/test-setpayload.c index a9976f2842..dab39b353b 100644 --- a/tests/test-setpayload.c +++ b/tests/test-setpayload.c @@ -84,5 +84,5 @@ main () ASSERT (x == 0.0); } - return 0; + return test_exit_status; } diff --git a/tests/test-setpayloadf.c b/tests/test-setpayloadf.c index af8af962ef..7d74108517 100644 --- a/tests/test-setpayloadf.c +++ b/tests/test-setpayloadf.c @@ -84,5 +84,5 @@ main () ASSERT (x == 0.0f); } - return 0; + return test_exit_status; } diff --git a/tests/test-setpayloadl.c b/tests/test-setpayloadl.c index 86139a5247..947da2ea33 100644 --- a/tests/test-setpayloadl.c +++ b/tests/test-setpayloadl.c @@ -93,5 +93,5 @@ main () ASSERT (x == 0.0L); } - return 0; + return test_exit_status; } diff --git a/tests/test-setpayloadsig.c b/tests/test-setpayloadsig.c index c8f9925841..93d5dbdcea 100644 --- a/tests/test-setpayloadsig.c +++ b/tests/test-setpayloadsig.c @@ -84,5 +84,5 @@ main () ASSERT (x == 0.0); } - return 0; + return test_exit_status; } diff --git a/tests/test-setpayloadsigf.c b/tests/test-setpayloadsigf.c index d95d497e5f..72915b9132 100644 --- a/tests/test-setpayloadsigf.c +++ b/tests/test-setpayloadsigf.c @@ -84,5 +84,5 @@ main () ASSERT (x == 0.0f); } - return 0; + return test_exit_status; } diff --git a/tests/test-setpayloadsigl.c b/tests/test-setpayloadsigl.c index 13f1eba393..0286d16d33 100644 --- a/tests/test-setpayloadsigl.c +++ b/tests/test-setpayloadsigl.c @@ -93,5 +93,5 @@ main () ASSERT (x == 0.0L); } - return 0; + return test_exit_status; } diff --git a/tests/test-setsockopt.c b/tests/test-setsockopt.c index 754938109f..5ae3856a20 100644 --- a/tests/test-setsockopt.c +++ b/tests/test-setsockopt.c @@ -51,5 +51,5 @@ main (void) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-sh-quote.c b/tests/test-sh-quote.c index c779812857..de015bd466 100644 --- a/tests/test-sh-quote.c +++ b/tests/test-sh-quote.c @@ -199,5 +199,5 @@ main (void) free (result); } - return 0; + return test_exit_status; } diff --git a/tests/test-sha1-stream.c b/tests/test-sha1-stream.c index a21428b0ac..b5206f201f 100644 --- a/tests/test-sha1-stream.c +++ b/tests/test-sha1-stream.c @@ -38,5 +38,5 @@ main (void) "\x9c\x04\xcd\x63\x72\x07\x7e\x9b\x11\xf7\x0c\xa1\x11\xc9\x80\x7d\xc7\x13\x7e\x4b", "\x91\xab\x6b\x1b\x8d\x29\x25\x3c\xcb\x8d\xce\xb7\x7a\x25\x26\x2c\x92\xc9\x22\x09"); - return 0; + return test_exit_status; } diff --git a/tests/test-sha256-stream.c b/tests/test-sha256-stream.c index d48b28e9b0..dbf8027793 100644 --- a/tests/test-sha256-stream.c +++ b/tests/test-sha256-stream.c @@ -43,5 +43,5 @@ main (void) "\xb4\x7c\xc0\xf1\x04\xb6\x2d\x4c\x7c\x30\xbc\xd6\x8f\xd8\xe6\x76\x13\xe2\x87\xdc\x4a\xd8\xc3\x10\xef\x10\xcb\xad\xea\x9c\x43\x80", "\xe5\x19\x95\xff\x0b\xc4\x95\xcf\x49\xdd\x31\x42\x0a\x6b\xe0\x6b\x38\xef\xef\x43\xab\xa6\xf4\x76\x64\x32\x99\x4a\x47\x1a\x0f\xb5"); - return 0; + return test_exit_status; } diff --git a/tests/test-sha512-stream.c b/tests/test-sha512-stream.c index bc816283bc..ff53fac0ba 100644 --- a/tests/test-sha512-stream.c +++ b/tests/test-sha512-stream.c @@ -43,5 +43,5 @@ main (void) "\x02\x0d\xa0\xf4\xd8\xa4\xc8\xbf\xbc\x98\x27\x40\x27\x74\x00\x61\xd7\xdf\x52\xee\x07\x09\x1e\xd6\x59\x5a\x08\x3e\x0f\x45\x32\x7b\xbe\x59\x42\x43\x12\xd8\x6f\x21\x8b\x74\xed\x2e\x25\x50\x7a\xba\xf5\xc7\xa5\xfc\xf4\xca\xfc\xf9\x53\x8b\x70\x58\x08\xfd\x55\xec", "\x38\x34\x58\xf3\xde\x68\x70\x33\x0c\xa4\xd4\x71\x4d\x0f\x41\xc5\xed\xc9\xf4\x67\x3e\x19\x0f\x87\x2b\x53\x72\x00\xa8\x35\x73\xf7\x0b\xf1\xf2\x0d\x9a\xa8\xd6\x08\x65\x2f\xe2\x28\xbd\x2d\x0c\xd5\xd6\xd4\xd3\xb2\x84\x3e\x32\x32\x5d\x62\x54\x7b\x39\xfd\x47\x04"); - return 0; + return test_exit_status; } diff --git a/tests/test-shutdown.c b/tests/test-shutdown.c index 0477daf65a..e99c89e0e5 100644 --- a/tests/test-shutdown.c +++ b/tests/test-shutdown.c @@ -45,5 +45,5 @@ main (void) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-sig2str.c b/tests/test-sig2str.c index 0c78dde00e..6093af0474 100644 --- a/tests/test-sig2str.c +++ b/tests/test-sig2str.c @@ -91,5 +91,5 @@ main (void) test_sig2str (); test_str2sig (); - return 0; + return test_exit_status; } diff --git a/tests/test-sigabbrev_np.c b/tests/test-sigabbrev_np.c index 9c9d81f789..a2b6cf4b30 100644 --- a/tests/test-sigabbrev_np.c +++ b/tests/test-sigabbrev_np.c @@ -247,5 +247,5 @@ main (void) ASSERT (sigabbrev_np (-714) == NULL); - return 0; + return test_exit_status; } diff --git a/tests/test-sigaction.c b/tests/test-sigaction.c index 5d29854f80..9923714ee6 100644 --- a/tests/test-sigaction.c +++ b/tests/test-sigaction.c @@ -118,5 +118,5 @@ main (void) ASSERT (old_sa.sa_handler == SIG_IGN); ASSERT (raise (SIGABRT) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-sigdescr_np.c b/tests/test-sigdescr_np.c index 2ac9fee8b7..8e9c95c821 100644 --- a/tests/test-sigdescr_np.c +++ b/tests/test-sigdescr_np.c @@ -252,5 +252,5 @@ main (void) ASSERT (sigdescr_np (-714) == NULL); - return 0; + return test_exit_status; } diff --git a/tests/test-signbit.c b/tests/test-signbit.c index da5b7981e5..1269b084a5 100644 --- a/tests/test-signbit.c +++ b/tests/test-signbit.c @@ -131,5 +131,5 @@ main () test_signbitf (); test_signbitd (); test_signbitl (); - return 0; + return test_exit_status; } diff --git a/tests/test-sigprocmask.c b/tests/test-sigprocmask.c index c712d77df5..30c04e5b72 100644 --- a/tests/test-sigprocmask.c +++ b/tests/test-sigprocmask.c @@ -79,7 +79,7 @@ main () before the call to sigprocmask() returns." */ ASSERT (sigint_occurred == 1); - return 0; + return test_exit_status; } #else diff --git a/tests/test-simple-atomic.c b/tests/test-simple-atomic.c index 8a5ff29885..4b74b338af 100644 --- a/tests/test-simple-atomic.c +++ b/tests/test-simple-atomic.c @@ -215,7 +215,7 @@ main () } } - return 0; + return test_exit_status; } #else diff --git a/tests/test-sin.c b/tests/test-sin.c index 8a0e14c667..81a1add733 100644 --- a/tests/test-sin.c +++ b/tests/test-sin.c @@ -36,5 +36,5 @@ main () y = sin (x); ASSERT (y >= 0.5646424733 && y <= 0.5646424734); - return 0; + return test_exit_status; } diff --git a/tests/test-sinf.c b/tests/test-sinf.c index a5ad675021..98e3a83e8e 100644 --- a/tests/test-sinf.c +++ b/tests/test-sinf.c @@ -36,5 +36,5 @@ main () y = sinf (x); ASSERT (y >= 0.5646424f && y <= 0.5646426f); - return 0; + return test_exit_status; } diff --git a/tests/test-sinh.c b/tests/test-sinh.c index d78aa99ae8..ccf76a49c5 100644 --- a/tests/test-sinh.c +++ b/tests/test-sinh.c @@ -36,5 +36,5 @@ main () y = sinh (x); ASSERT (y >= 0.6366535821 && y <= 0.6366535822); - return 0; + return test_exit_status; } diff --git a/tests/test-sinhf.c b/tests/test-sinhf.c index ce1f6857a0..c544b5d3c4 100644 --- a/tests/test-sinhf.c +++ b/tests/test-sinhf.c @@ -36,5 +36,5 @@ main () y = sinhf (x); ASSERT (y >= 0.6366535f && y <= 0.6366537f); - return 0; + return test_exit_status; } diff --git a/tests/test-sinl.c b/tests/test-sinl.c index 9ea27ae89c..373015b6a2 100644 --- a/tests/test-sinl.c +++ b/tests/test-sinl.c @@ -41,5 +41,5 @@ main () y = sinl (x); ASSERT (y >= 0.5646424733L && y <= 0.5646424734L); - return 0; + return test_exit_status; } diff --git a/tests/test-sleep.c b/tests/test-sleep.c index b0896f2e97..34b5da1aab 100644 --- a/tests/test-sleep.c +++ b/tests/test-sleep.c @@ -54,5 +54,5 @@ main (void) } #endif - return 0; + return test_exit_status; } diff --git a/tests/test-snan-1.c b/tests/test-snan-1.c index 856eb2376b..8fb41fa6d6 100644 --- a/tests/test-snan-1.c +++ b/tests/test-snan-1.c @@ -100,7 +100,7 @@ main () } #endif - return 0; + return test_exit_status; } #endif diff --git a/tests/test-snan-2.c b/tests/test-snan-2.c index 7d6313a50f..bdc398833e 100644 --- a/tests/test-snan-2.c +++ b/tests/test-snan-2.c @@ -135,7 +135,7 @@ main (int argc, char *argv[]) break; } - return 0; + return test_exit_status; } #else diff --git a/tests/test-snprintf-gnu.c b/tests/test-snprintf-gnu.c index 892d3d932a..487a9ca613 100644 --- a/tests/test-snprintf-gnu.c +++ b/tests/test-snprintf-gnu.c @@ -31,5 +31,5 @@ int main (int argc, char *argv[]) { test_function (snprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-snprintf-posix.c b/tests/test-snprintf-posix.c index 1d2b920b5f..6c6f10cb77 100644 --- a/tests/test-snprintf-posix.c +++ b/tests/test-snprintf-posix.c @@ -35,5 +35,5 @@ int main (int argc, char *argv[]) { test_function (snprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-snprintf.c b/tests/test-snprintf.c index 98f1f1c2ed..452c22caec 100644 --- a/tests/test-snprintf.c +++ b/tests/test-snprintf.c @@ -68,5 +68,5 @@ main () ASSERT (retval == strlen (result)); } - return 0; + return test_exit_status; } diff --git a/tests/test-spawn-pipe-child.c b/tests/test-spawn-pipe-child.c index bc71c79f73..536a1fe85b 100644 --- a/tests/test-spawn-pipe-child.c +++ b/tests/test-spawn-pipe-child.c @@ -37,6 +37,7 @@ #define BACKUP_STDERR_FILENO 10 #define ASSERT_STREAM myerr +#undef CONTINUE_AFTER_ASSERT #include "macros.h" static FILE *myerr; @@ -148,5 +149,5 @@ main (int argc, char *argv[]) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-spawn-pipe-main.c b/tests/test-spawn-pipe-main.c index cfda0dd89d..612d47bed5 100644 --- a/tests/test-spawn-pipe-main.c +++ b/tests/test-spawn-pipe-main.c @@ -133,5 +133,5 @@ main (int argc, char *argv[]) test_pipe (argv[1], test >= 4); - return 0; + return test_exit_status; } diff --git a/tests/test-spawn-pipe-script.c b/tests/test-spawn-pipe-script.c index 57cd91e083..744e2054d5 100644 --- a/tests/test-spawn-pipe-script.c +++ b/tests/test-spawn-pipe-script.c @@ -67,6 +67,9 @@ main () } } + if (test_exit_status != EXIT_SUCCESS) + return test_exit_status; + #if defined _WIN32 && !defined __CYGWIN__ /* On native Windows, scripts - even with '#!' marker - are not executable. Only .bat and .cmd files are. */ @@ -98,6 +101,6 @@ main () ASSERT (fclose (fp) == 0); } - return 0; + return test_exit_status; #endif } diff --git a/tests/test-sprintf-gnu.c b/tests/test-sprintf-gnu.c index 603ec7e279..4a2cb1c912 100644 --- a/tests/test-sprintf-gnu.c +++ b/tests/test-sprintf-gnu.c @@ -31,5 +31,5 @@ int main (int argc, char *argv[]) { test_function (sprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-sprintf-posix.c b/tests/test-sprintf-posix.c index bed1632f0d..08b5787859 100644 --- a/tests/test-sprintf-posix.c +++ b/tests/test-sprintf-posix.c @@ -38,5 +38,5 @@ int main (int argc, char *argv[]) { test_function (sprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-sqrt-ieee.c b/tests/test-sqrt-ieee.c index 9e2cbee06f..8cf5793411 100644 --- a/tests/test-sqrt-ieee.c +++ b/tests/test-sqrt-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-sqrt.c b/tests/test-sqrt.c index 89067fb81c..8bcb18066d 100644 --- a/tests/test-sqrt.c +++ b/tests/test-sqrt.c @@ -44,5 +44,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-sqrtf-ieee.c b/tests/test-sqrtf-ieee.c index cde8df3c62..8384362d81 100644 --- a/tests/test-sqrtf-ieee.c +++ b/tests/test-sqrtf-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-sqrtf.c b/tests/test-sqrtf.c index 801046cbdf..dad614145f 100644 --- a/tests/test-sqrtf.c +++ b/tests/test-sqrtf.c @@ -44,5 +44,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-sqrtl-ieee.c b/tests/test-sqrtl-ieee.c index 389c7d27a4..69fbe549e3 100644 --- a/tests/test-sqrtl-ieee.c +++ b/tests/test-sqrtl-ieee.c @@ -41,5 +41,5 @@ main () { test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-sqrtl.c b/tests/test-sqrtl.c index 5cbc7dcb00..ab47b416ef 100644 --- a/tests/test-sqrtl.c +++ b/tests/test-sqrtl.c @@ -73,5 +73,5 @@ main () test_function (); - return 0; + return test_exit_status; } diff --git a/tests/test-ssfmalloc.c b/tests/test-ssfmalloc.c index a9f471061f..406ebbc45a 100644 --- a/tests/test-ssfmalloc.c +++ b/tests/test-ssfmalloc.c @@ -354,5 +354,5 @@ main (int argc, char *argv[]) } } - return 0; + return test_exit_status; } diff --git a/tests/test-stack.c b/tests/test-stack.c index fdbf8975d3..2350eadddf 100644 --- a/tests/test-stack.c +++ b/tests/test-stack.c @@ -69,5 +69,5 @@ main (void) ASSERT (string_stack_empty (string_stack)); string_stack_destroy (string_stack); - return EXIT_SUCCESS; + return test_exit_status; } diff --git a/tests/test-stat-time.c b/tests/test-stat-time.c index f28b6c46b2..c30b225639 100644 --- a/tests/test-stat-time.c +++ b/tests/test-stat-time.c @@ -244,5 +244,5 @@ main (void) test_birthtime (statinfo, modtimes, birthtimes); cleanup (0); - return 0; + return test_exit_status; } diff --git a/tests/test-stat.c b/tests/test-stat.c index 53ff77d9b3..a0a594cf92 100644 --- a/tests/test-stat.c +++ b/tests/test-stat.c @@ -51,5 +51,6 @@ do_stat (char const *name, struct stat *st) int main (void) { - return test_stat_func (do_stat, true); + int result = test_stat_func (do_stat, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-stdio.c b/tests/test-stdio.c index 44d58f0556..b64948c943 100644 --- a/tests/test-stdio.c +++ b/tests/test-stdio.c @@ -90,5 +90,5 @@ main (void) } #endif - return 0; + return test_exit_status; } diff --git a/tests/test-strcasestr.c b/tests/test-strcasestr.c index b0d70b6bd1..529a479523 100644 --- a/tests/test-strcasestr.c +++ b/tests/test-strcasestr.c @@ -282,5 +282,5 @@ main () free (haystack); } - return 0; + return test_exit_status; } diff --git a/tests/test-strchrnul.c b/tests/test-strchrnul.c index 7d52112f31..fdb48c9bfa 100644 --- a/tests/test-strchrnul.c +++ b/tests/test-strchrnul.c @@ -82,5 +82,5 @@ main (void) free (input); - return 0; + return test_exit_status; } diff --git a/tests/test-strerror.c b/tests/test-strerror.c index 3074b5cd0d..0ab478aecf 100644 --- a/tests/test-strerror.c +++ b/tests/test-strerror.c @@ -71,5 +71,5 @@ main (void) ASSERT (*str); ASSERT (errno == 0 || errno == EINVAL); - return 0; + return test_exit_status; } diff --git a/tests/test-strerror_r.c b/tests/test-strerror_r.c index 4b4e27f4a8..108497c298 100644 --- a/tests/test-strerror_r.c +++ b/tests/test-strerror_r.c @@ -174,5 +174,5 @@ main (void) } #endif - return 0; + return test_exit_status; } diff --git a/tests/test-strerrorname_np.c b/tests/test-strerrorname_np.c index 8aae2c554b..9fc0f03117 100644 --- a/tests/test-strerrorname_np.c +++ b/tests/test-strerrorname_np.c @@ -1349,5 +1349,5 @@ main (void) ASSERT (strerrorname_np (20200830) == NULL); ASSERT (strerrorname_np (-714) == NULL); - return 0; + return test_exit_status; } diff --git a/tests/test-strfmon_l.c b/tests/test-strfmon_l.c index cab85c3c5b..80147c188d 100644 --- a/tests/test-strfmon_l.c +++ b/tests/test-strfmon_l.c @@ -91,5 +91,5 @@ main (void) } #endif - return 0; + return test_exit_status; } diff --git a/tests/test-striconv.c b/tests/test-striconv.c index a96807aee0..043c8a7000 100644 --- a/tests/test-striconv.c +++ b/tests/test-striconv.c @@ -176,5 +176,5 @@ main () #endif - return 0; + return test_exit_status; } diff --git a/tests/test-striconveh.c b/tests/test-striconveh.c index 71dfc3f73f..85f0047af1 100644 --- a/tests/test-striconveh.c +++ b/tests/test-striconveh.c @@ -1505,5 +1505,5 @@ main () #endif - return 0; + return test_exit_status; } diff --git a/tests/test-striconveha.c b/tests/test-striconveha.c index 376f3cb603..5ac1c0d850 100644 --- a/tests/test-striconveha.c +++ b/tests/test-striconveha.c @@ -602,5 +602,5 @@ main () #endif - return 0; + return test_exit_status; } diff --git a/tests/test-string-buffer.c b/tests/test-string-buffer.c index cbaa02e153..8538ac0cec 100644 --- a/tests/test-string-buffer.c +++ b/tests/test-string-buffer.c @@ -112,5 +112,5 @@ main () ASSERT (s == NULL); } - return 0; + return test_exit_status; } diff --git a/tests/test-string-desc-quotearg.c b/tests/test-string-desc-quotearg.c index 584c05484b..449533c096 100644 --- a/tests/test-string-desc-quotearg.c +++ b/tests/test-string-desc-quotearg.c @@ -100,5 +100,5 @@ main (void) ASSERT (memcmp (ret, "[[Hello world!]]", 16 + 1) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-string-desc.c b/tests/test-string-desc.c index cccdd7b38e..c39077c567 100644 --- a/tests/test-string-desc.c +++ b/tests/test-string-desc.c @@ -190,5 +190,5 @@ main (int argc, char *argv[]) close (fd3); - return 0; + return test_exit_status; } diff --git a/tests/test-strncat.c b/tests/test-strncat.c index c2050513ff..0ee5089e58 100644 --- a/tests/test-strncat.c +++ b/tests/test-strncat.c @@ -58,5 +58,5 @@ main () check (input, SIZEOF (input)); } - return 0; + return test_exit_status; } diff --git a/tests/test-strnlen.c b/tests/test-strnlen.c index 0c85b8fc14..b493d8fc24 100644 --- a/tests/test-strnlen.c +++ b/tests/test-strnlen.c @@ -64,5 +64,5 @@ main (void) while (j--); } - return 0; + return test_exit_status; } diff --git a/tests/test-strsignal.c b/tests/test-strsignal.c index 3100e0b1c4..4ecd7abf61 100644 --- a/tests/test-strsignal.c +++ b/tests/test-strsignal.c @@ -75,5 +75,5 @@ main (void) ASSERT (str != (char *) -1); ASSERT (strlen (str)); - return 0; + return test_exit_status; } diff --git a/tests/test-strstr.c b/tests/test-strstr.c index 5822a2e68b..9ae6cba91c 100644 --- a/tests/test-strstr.c +++ b/tests/test-strstr.c @@ -305,5 +305,5 @@ main (int argc, char *argv[]) free (haystack); } - return 0; + return test_exit_status; } diff --git a/tests/test-strtod.c b/tests/test-strtod.c index efe73974c9..c5f94b19e8 100644 --- a/tests/test-strtod.c +++ b/tests/test-strtod.c @@ -40,5 +40,5 @@ main (void) { test_function (strtod); - return 0; + return test_exit_status; } diff --git a/tests/test-strtod1.c b/tests/test-strtod1.c index 1a40dedf70..c45313042b 100644 --- a/tests/test-strtod1.c +++ b/tests/test-strtod1.c @@ -98,5 +98,5 @@ main (int argc, char *argv[]) ASSERT (errno == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-strtof.c b/tests/test-strtof.c index e4f1c83693..e598245160 100644 --- a/tests/test-strtof.c +++ b/tests/test-strtof.c @@ -40,5 +40,5 @@ main (void) { test_function (strtof); - return 0; + return test_exit_status; } diff --git a/tests/test-strtof1.c b/tests/test-strtof1.c index 668d1a31d4..def1fa254f 100644 --- a/tests/test-strtof1.c +++ b/tests/test-strtof1.c @@ -98,5 +98,5 @@ main (int argc, char *argv[]) ASSERT (errno == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-strtoimax.c b/tests/test-strtoimax.c index 184da30048..78421ddd65 100644 --- a/tests/test-strtoimax.c +++ b/tests/test-strtoimax.c @@ -177,5 +177,5 @@ main (void) ASSERT (errno == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-strtol.c b/tests/test-strtol.c index 1dabb50c2c..efe26a2a6b 100644 --- a/tests/test-strtol.c +++ b/tests/test-strtol.c @@ -301,5 +301,5 @@ main (void) ASSERT (errno == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-strtold.c b/tests/test-strtold.c index 33e9b6f971..4d9a67e1bb 100644 --- a/tests/test-strtold.c +++ b/tests/test-strtold.c @@ -40,5 +40,5 @@ main (void) { test_function (strtold); - return 0; + return test_exit_status; } diff --git a/tests/test-strtold1.c b/tests/test-strtold1.c index 64a567fcb4..ff434a3ff6 100644 --- a/tests/test-strtold1.c +++ b/tests/test-strtold1.c @@ -98,5 +98,5 @@ main (int argc, char *argv[]) ASSERT (errno == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-strtoll.c b/tests/test-strtoll.c index b15070227b..cef67231b9 100644 --- a/tests/test-strtoll.c +++ b/tests/test-strtoll.c @@ -301,5 +301,5 @@ main (void) ASSERT (errno == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-strtoul.c b/tests/test-strtoul.c index badf932c60..5969744542 100644 --- a/tests/test-strtoul.c +++ b/tests/test-strtoul.c @@ -300,5 +300,5 @@ main (void) ASSERT (errno == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-strtoull.c b/tests/test-strtoull.c index 9f0f22c289..5b81d72974 100644 --- a/tests/test-strtoull.c +++ b/tests/test-strtoull.c @@ -300,5 +300,5 @@ main (void) ASSERT (errno == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-strtoumax.c b/tests/test-strtoumax.c index 82ff12d82d..4226613996 100644 --- a/tests/test-strtoumax.c +++ b/tests/test-strtoumax.c @@ -176,5 +176,5 @@ main (void) ASSERT (errno == 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-strverscmp.c b/tests/test-strverscmp.c index 2706572bc6..6f3fdb115b 100644 --- a/tests/test-strverscmp.c +++ b/tests/test-strverscmp.c @@ -64,5 +64,5 @@ main (void) ASSERT (strverscmp (b, a) < 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-supersede.c b/tests/test-supersede.c index 0324813e8f..778f1675cf 100644 --- a/tests/test-supersede.c +++ b/tests/test-supersede.c @@ -58,5 +58,5 @@ main (void) test_fopen_supersede (true, false); test_fopen_supersede (true, true); - return 0; + return test_exit_status; } diff --git a/tests/test-symlink.c b/tests/test-symlink.c index 04c3e7a837..d8e4f6909a 100644 --- a/tests/test-symlink.c +++ b/tests/test-symlink.c @@ -42,5 +42,6 @@ main (void) /* Remove any leftovers from a previous partial run. */ ignore_value (system ("rm -rf " BASE "*")); - return test_symlink (symlink, true); + int result = test_symlink (symlink, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-symlinkat.c b/tests/test-symlinkat.c index 86d2558f63..313e92d708 100644 --- a/tests/test-symlinkat.c +++ b/tests/test-symlinkat.c @@ -84,5 +84,5 @@ main (void) if (result == 77) fputs ("skipping test: symlinks not supported on this file system\n", stderr); - return result; + return (result ? result : test_exit_status); } diff --git a/tests/test-system-quote-main.c b/tests/test-system-quote-main.c index 110acdeda1..86089055fa 100644 --- a/tests/test-system-quote-main.c +++ b/tests/test-system-quote-main.c @@ -39,8 +39,6 @@ #define EXPECTED_DATA_FILE "t-sq-data.tmp" -static int failed; - static void check_one (enum system_command_interpreter interpreter, const char *prog, const char *input) @@ -93,7 +91,7 @@ check_one (enum system_command_interpreter interpreter, const char *prog, { fprintf (stderr, "for input = |%s|: system() command failed with status %d: %s\n", input, exitcode, command); - failed = 1; + test_exit_status = EXIT_FAILURE; } } { @@ -103,7 +101,7 @@ check_one (enum system_command_interpreter interpreter, const char *prog, { fprintf (stderr, "for input = |%s|: popen() command failed with status %d: %s\n", input, exitcode, command); - failed = 1; + test_exit_status = EXIT_FAILURE; } } break; @@ -136,21 +134,21 @@ check_one (enum system_command_interpreter interpreter, const char *prog, { fprintf (stderr, "for input = |%s|: CreateProcess() command failed with status %d: %s\n", input, exitcode, command); - failed = 1; + test_exit_status = EXIT_FAILURE; } } else { fprintf (stderr, "for input = |%s|: GetExitCodeProcess failed, GetLastError() = %u\n", input, GetLastError ()); - failed = 1; + test_exit_status = EXIT_FAILURE; } } else { fprintf (stderr, "for input = |%s|: WaitForSingleObject failed\n", input); - failed = 1; + test_exit_status = EXIT_FAILURE; } CloseHandle (pinfo.hProcess); } @@ -158,7 +156,7 @@ check_one (enum system_command_interpreter interpreter, const char *prog, { fprintf (stderr, "for input = |%s|: CreateProcess failed, GetLastError() = %u\n", input, GetLastError ()); - failed = 1; + test_exit_status = EXIT_FAILURE; } } break; @@ -345,5 +343,5 @@ main (int argc, char *argv[]) /* Clean up. */ unlink (EXPECTED_DATA_FILE); - return failed; + return test_exit_status; } diff --git a/tests/test-tan.c b/tests/test-tan.c index eecaf84f50..a00c435287 100644 --- a/tests/test-tan.c +++ b/tests/test-tan.c @@ -36,5 +36,5 @@ main () y = tan (x); ASSERT (y >= 0.6841368083 && y <= 0.6841368084); - return 0; + return test_exit_status; } diff --git a/tests/test-tanf.c b/tests/test-tanf.c index 7a84b18fec..e81a23fe99 100644 --- a/tests/test-tanf.c +++ b/tests/test-tanf.c @@ -36,5 +36,5 @@ main () y = tanf (x); ASSERT (y >= 0.6841368f && y <= 0.6841369f); - return 0; + return test_exit_status; } diff --git a/tests/test-tanh.c b/tests/test-tanh.c index 9885efa3d1..c89f9c9739 100644 --- a/tests/test-tanh.c +++ b/tests/test-tanh.c @@ -36,5 +36,5 @@ main () y = tanh (x); ASSERT (y >= 0.5370495669 && y <= 0.5370495670); - return 0; + return test_exit_status; } diff --git a/tests/test-tanhf.c b/tests/test-tanhf.c index 9844084ec1..a35cf127f9 100644 --- a/tests/test-tanhf.c +++ b/tests/test-tanhf.c @@ -36,5 +36,5 @@ main () y = tanhf (x); ASSERT (y >= 0.5370495f && y <= 0.5370497f); - return 0; + return test_exit_status; } diff --git a/tests/test-tanl.c b/tests/test-tanl.c index a21e8afc58..4c2f70d185 100644 --- a/tests/test-tanl.c +++ b/tests/test-tanl.c @@ -41,5 +41,5 @@ main () y = tanl (x); ASSERT (y >= 0.6841368083L && y <= 0.6841368084L); - return 0; + return test_exit_status; } diff --git a/tests/test-tempname.c b/tests/test-tempname.c index b3340f7524..859dbda9de 100644 --- a/tests/test-tempname.c +++ b/tests/test-tempname.c @@ -82,5 +82,5 @@ main () unlink (filename2); } - return 0; + return test_exit_status; } diff --git a/tests/test-thrd_create.c b/tests/test-thrd_create.c index 60c0bf0fe3..1e02e49ab2 100644 --- a/tests/test-thrd_create.c +++ b/tests/test-thrd_create.c @@ -63,7 +63,7 @@ main () /* Check that worker_thread_func () has finished executing. */ ASSERT (work_done); - return 0; + return test_exit_status; } else { diff --git a/tests/test-thrd_exit.c b/tests/test-thrd_exit.c index 6966c8f855..622f4d5591 100644 --- a/tests/test-thrd_exit.c +++ b/tests/test-thrd_exit.c @@ -67,7 +67,7 @@ main () /* Check that worker_thread_func () has finished executing. */ ASSERT (work_done); - return 0; + return test_exit_status; } else { diff --git a/tests/test-thread_create.c b/tests/test-thread_create.c index 89dc1c9e69..ae1d331b08 100644 --- a/tests/test-thread_create.c +++ b/tests/test-thread_create.c @@ -63,7 +63,7 @@ main () /* Check that worker_thread_func () has finished executing. */ ASSERT (work_done); - return 0; + return test_exit_status; } else { diff --git a/tests/test-thread_local.c b/tests/test-thread_local.c index 2f74b943b9..68c05352d6 100644 --- a/tests/test-thread_local.c +++ b/tests/test-thread_local.c @@ -177,7 +177,7 @@ main () test_thread_local (); printf (" OK\n"); fflush (stdout); - return 0; + return test_exit_status; } #else diff --git a/tests/test-time.c b/tests/test-time.c index 752d4c0f3e..7f2f25bbe2 100644 --- a/tests/test-time.c +++ b/tests/test-time.c @@ -45,5 +45,5 @@ main (void) tt3 = time (NULL); ASSERT (tt3 >= tv2.tv_sec); - return 0; + return test_exit_status; } diff --git a/tests/test-timespec.c b/tests/test-timespec.c index 2859ead6a8..524c012676 100644 --- a/tests/test-timespec.c +++ b/tests/test-timespec.c @@ -162,5 +162,5 @@ main (void) } } - return 0; + return test_exit_status; } diff --git a/tests/test-timespec_get.c b/tests/test-timespec_get.c index 765541a1a2..22b624a3ef 100644 --- a/tests/test-timespec_get.c +++ b/tests/test-timespec_get.c @@ -53,5 +53,5 @@ main (void) ASSERT (tt2 <= ts3.tv_sec); ASSERT (ts3.tv_sec <= tt4); - return 0; + return test_exit_status; } diff --git a/tests/test-timespec_getres.c b/tests/test-timespec_getres.c index 482273ec06..5b70aa954d 100644 --- a/tests/test-timespec_getres.c +++ b/tests/test-timespec_getres.c @@ -36,5 +36,5 @@ main (void) ? 0 < ts.tv_nsec && ts.tv_nsec < 1000000000 : ts.tv_sec == 1 && ts.tv_nsec == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-totalorder.h b/tests/test-totalorder.h index e675bd334f..fd437160bf 100644 --- a/tests/test-totalorder.h +++ b/tests/test-totalorder.h @@ -67,15 +67,14 @@ main () positive_NaN_with_payload (1729) }; int n = SIZEOF (x); - int result = 0; for (int i = 0; i < n; i++) for (int j = 0; j < n; j++) if (!(!!TOTALORDER (&x[i].value, &x[j].value) == (i <= j))) { fprintf (stderr, "Failed: i=%d j=%d\n", i, j); - result = 1; + test_exit_status = EXIT_FAILURE; } - return result; + return test_exit_status; } diff --git a/tests/test-totalordermag.h b/tests/test-totalordermag.h index ec86d55c27..11990cda3d 100644 --- a/tests/test-totalordermag.h +++ b/tests/test-totalordermag.h @@ -67,7 +67,6 @@ main () positive_NaN_with_payload (1729) }; int n = SIZEOF (x); - int result = 0; for (int i = 0; i < n; i++) for (int j = 0; j < n; j++) @@ -75,8 +74,8 @@ main () == ((i < n / 2 ? n - 1 - i : i) <= (j < n /2 ? n - 1 - j : j)))) { fprintf (stderr, "Failed: i=%d j=%d\n", i, j); - result = 1; + test_exit_status = EXIT_FAILURE; } - return result; + return test_exit_status; } diff --git a/tests/test-towctrans.c b/tests/test-towctrans.c index e3ee3905f0..68c919ea22 100644 --- a/tests/test-towctrans.c +++ b/tests/test-towctrans.c @@ -56,5 +56,5 @@ main (int argc, char *argv[]) ASSERT (towctrans ((wchar_t) 0, desc) == 0); ASSERT (towctrans (WEOF, desc) == WEOF); - return 0; + return test_exit_status; } diff --git a/tests/test-trim.c b/tests/test-trim.c index 9d4931aa8a..beda03009a 100644 --- a/tests/test-trim.c +++ b/tests/test-trim.c @@ -119,7 +119,7 @@ main (int argc, char *argv[]) { case '1': /* C or POSIX locale. */ - return 0; + return test_exit_status; case '2': /* Locale encoding is UTF-8. */ @@ -133,7 +133,7 @@ main (int argc, char *argv[]) ASSERT (strcmp (result, "\302\267foo") == 0); free (result); } - return 0; + return test_exit_status; case '3': /* Locale encoding is GB18030. */ @@ -151,7 +151,7 @@ main (int argc, char *argv[]) free (result); } #endif - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-trunc-ieee.c b/tests/test-trunc-ieee.c index 11719d6f6e..c1ac4a7128 100644 --- a/tests/test-trunc-ieee.c +++ b/tests/test-trunc-ieee.c @@ -50,5 +50,5 @@ main () ASSERT (trunc (Infinityd ()) == Infinityd ()); ASSERT (trunc (- Infinityd ()) == - Infinityd ()); - return 0; + return test_exit_status; } diff --git a/tests/test-trunc1.c b/tests/test-trunc1.c index 3fca69f2db..f9a1b9c15c 100644 --- a/tests/test-trunc1.c +++ b/tests/test-trunc1.c @@ -61,5 +61,5 @@ main () /* NaNs. */ ASSERT (isnand (trunc (NaNd ()))); - return 0; + return test_exit_status; } diff --git a/tests/test-trunc2.c b/tests/test-trunc2.c index 562e2d4864..d125b3651e 100644 --- a/tests/test-trunc2.c +++ b/tests/test-trunc2.c @@ -173,5 +173,5 @@ main () >> NUM_HIGHBITS); error |= check (janus.f); } - return (error ? 1 : 0); + return (error ? 1 : test_exit_status); } diff --git a/tests/test-truncate.c b/tests/test-truncate.c index f903d92571..07ad289056 100644 --- a/tests/test-truncate.c +++ b/tests/test-truncate.c @@ -106,5 +106,5 @@ main (int argc, char *argv[]) /* Cleanup. */ ASSERT (unlink (BASE "file") == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-truncf-ieee.c b/tests/test-truncf-ieee.c index ab88593381..59f2d8f14f 100644 --- a/tests/test-truncf-ieee.c +++ b/tests/test-truncf-ieee.c @@ -50,5 +50,5 @@ main () ASSERT (truncf (Infinityf ()) == Infinityf ()); ASSERT (truncf (- Infinityf ()) == - Infinityf ()); - return 0; + return test_exit_status; } diff --git a/tests/test-truncf1.c b/tests/test-truncf1.c index d9f6c751eb..b2246dfa3e 100644 --- a/tests/test-truncf1.c +++ b/tests/test-truncf1.c @@ -61,5 +61,5 @@ main () /* NaNs. */ ASSERT (isnanf (truncf (NaNf ()))); - return 0; + return test_exit_status; } diff --git a/tests/test-truncf2.c b/tests/test-truncf2.c index ebb5719de0..9b8b951b5e 100644 --- a/tests/test-truncf2.c +++ b/tests/test-truncf2.c @@ -173,5 +173,5 @@ main () >> NUM_HIGHBITS); error |= check (janus.f); } - return (error ? 1 : 0); + return (error ? 1 : test_exit_status); } diff --git a/tests/test-truncl-ieee.c b/tests/test-truncl-ieee.c index 39eca411a9..032dee23de 100644 --- a/tests/test-truncl-ieee.c +++ b/tests/test-truncl-ieee.c @@ -55,5 +55,5 @@ main () ASSERT (truncl (Infinityl ()) == Infinityl ()); ASSERT (truncl (- Infinityl ()) == - Infinityl ()); - return 0; + return test_exit_status; } diff --git a/tests/test-truncl.c b/tests/test-truncl.c index 3302d799b0..8ecfa0da24 100644 --- a/tests/test-truncl.c +++ b/tests/test-truncl.c @@ -68,5 +68,5 @@ main () /* NaNs. */ ASSERT (isnanl (truncl (NaNl ()))); - return 0; + return test_exit_status; } diff --git a/tests/test-tss.c b/tests/test-tss.c index e3b25ee1b8..f73a501e73 100644 --- a/tests/test-tss.c +++ b/tests/test-tss.c @@ -522,5 +522,5 @@ main () test_tss_racecheck (); printf (" OK\n"); fflush (stdout); - return 0; + return test_exit_status; } diff --git a/tests/test-ttyname_r.c b/tests/test-ttyname_r.c index 0c98091bcb..a5a15e3f56 100644 --- a/tests/test-ttyname_r.c +++ b/tests/test-ttyname_r.c @@ -63,5 +63,5 @@ main (void) ); } - return 0; + return test_exit_status; } diff --git a/tests/test-uname.c b/tests/test-uname.c index 5fc5716c10..492387e641 100644 --- a/tests/test-uname.c +++ b/tests/test-uname.c @@ -60,5 +60,5 @@ main (int argc, char *argv[]) printf ("uname -m = machine or cpu = %s\n", buf.machine); } - return 0; + return test_exit_status; } diff --git a/tests/test-unicodeio.c b/tests/test-unicodeio.c index a2cbf7ab80..ccb44756fc 100644 --- a/tests/test-unicodeio.c +++ b/tests/test-unicodeio.c @@ -99,5 +99,5 @@ main (int argc, char *argv[]) ASSERT (0); } - return 0; + return test_exit_status; } diff --git a/tests/test-unlink.c b/tests/test-unlink.c index f857acbf23..fa3b63a485 100644 --- a/tests/test-unlink.c +++ b/tests/test-unlink.c @@ -44,5 +44,6 @@ main (void) /* Remove any leftovers from a previous partial run. */ ignore_value (system ("rm -rf " BASE "*")); - return test_unlink_func (unlink, true); + int result = test_unlink_func (unlink, true); + return (result ? result : test_exit_status); } diff --git a/tests/test-unlinkat.c b/tests/test-unlinkat.c index 4c4cf75221..4f1148a9a9 100644 --- a/tests/test-unlinkat.c +++ b/tests/test-unlinkat.c @@ -90,5 +90,5 @@ main () if (result1 == 77) fputs ("skipping test: symlinks not supported on this file system\n", stderr); - return result1; + return (result1 ? result1 : test_exit_status); } diff --git a/tests/test-unlockpt.c b/tests/test-unlockpt.c index 9f5e7735f4..3a07006892 100644 --- a/tests/test-unlockpt.c +++ b/tests/test-unlockpt.c @@ -48,5 +48,5 @@ main (void) } #endif - return 0; + return test_exit_status; } diff --git a/tests/test-unsetenv.c b/tests/test-unsetenv.c index 4e6a19ad0d..e26d0e0339 100644 --- a/tests/test-unsetenv.c +++ b/tests/test-unsetenv.c @@ -58,5 +58,5 @@ main (void) ASSERT (errno == EINVAL); #endif - return 0; + return test_exit_status; } diff --git a/tests/test-usleep.c b/tests/test-usleep.c index ba82a1620f..755c0479b3 100644 --- a/tests/test-usleep.c +++ b/tests/test-usleep.c @@ -36,5 +36,5 @@ main (void) ASSERT (usleep (0) == 0); - return 0; + return test_exit_status; } diff --git a/tests/test-utime.c b/tests/test-utime.c index 5e228d334b..63fbe20eba 100644 --- a/tests/test-utime.c +++ b/tests/test-utime.c @@ -137,5 +137,5 @@ main (void) ignore_value (system ("rm -rf " BASE "*")); result1 = test_utime (true); - return result1; + return (result1 ? result1 : test_exit_status); } diff --git a/tests/test-utimens.c b/tests/test-utimens.c index f77ceb4dc8..b95adb0b5d 100644 --- a/tests/test-utimens.c +++ b/tests/test-utimens.c @@ -75,5 +75,6 @@ main (void) result3 = test_lutimens (lutimens, (result1 + result2) == 0); /* We expect 0/0, 0/77, or 77/77, but not 77/0. */ ASSERT (result1 <= result3); - return result1 | result2 | result3; + int result = result1 | result2 | result3; + return (result ? result : test_exit_status); } diff --git a/tests/test-utimensat.c b/tests/test-utimensat.c index c248d6a347..6819a335de 100644 --- a/tests/test-utimensat.c +++ b/tests/test-utimensat.c @@ -123,5 +123,6 @@ main (void) ASSERT (chdir ("..") == 0); ASSERT (unlink (BASE "dir/file") == 0); ASSERT (rmdir (BASE "dir") == 0); - return result1 | result2; + int result = result1 | result2; + return (result ? result : test_exit_status); } diff --git a/tests/test-vasnprintf-gnu.c b/tests/test-vasnprintf-gnu.c index d975b79a0b..bcb4f143ff 100644 --- a/tests/test-vasnprintf-gnu.c +++ b/tests/test-vasnprintf-gnu.c @@ -271,5 +271,5 @@ main (int argc, char *argv[]) { test_vasnprintf (); test_asnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/test-vasnprintf-posix.c b/tests/test-vasnprintf-posix.c index 26a9733284..81a6fb313b 100644 --- a/tests/test-vasnprintf-posix.c +++ b/tests/test-vasnprintf-posix.c @@ -5271,5 +5271,5 @@ main (int argc, char *argv[]) { test_vasnprintf (); test_asnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/test-vasnprintf-posix2.c b/tests/test-vasnprintf-posix2.c index 58ebef0fc6..4c1b8a3166 100644 --- a/tests/test-vasnprintf-posix2.c +++ b/tests/test-vasnprintf-posix2.c @@ -59,5 +59,5 @@ main (int argc, char *argv[]) free (result); } - return 0; + return test_exit_status; } diff --git a/tests/test-vasnprintf-posix3.c b/tests/test-vasnprintf-posix3.c index 10a45728b9..0db514c601 100644 --- a/tests/test-vasnprintf-posix3.c +++ b/tests/test-vasnprintf-posix3.c @@ -88,7 +88,7 @@ main (int argc, char *argv[]) test_vasnprintf (); test_asnprintf (); - return 0; + return test_exit_status; #else fprintf (stderr, "Skipping test: not a glibc >= 2.3 system\n"); return 77; diff --git a/tests/test-vasnprintf.c b/tests/test-vasnprintf.c index 13b9387291..655603f7e1 100644 --- a/tests/test-vasnprintf.c +++ b/tests/test-vasnprintf.c @@ -117,5 +117,5 @@ main () { test_vasnprintf (); test_asnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/test-vasnwprintf-gnu.c b/tests/test-vasnwprintf-gnu.c index 4435dcd498..1362247603 100644 --- a/tests/test-vasnwprintf-gnu.c +++ b/tests/test-vasnwprintf-gnu.c @@ -272,5 +272,5 @@ main (int argc, char *argv[]) { test_vasnwprintf (); test_asnwprintf (); - return 0; + return test_exit_status; } diff --git a/tests/test-vasnwprintf-posix.c b/tests/test-vasnwprintf-posix.c index fb6ce0fdd8..9b1380d1c2 100644 --- a/tests/test-vasnwprintf-posix.c +++ b/tests/test-vasnwprintf-posix.c @@ -5326,5 +5326,5 @@ main (int argc, char *argv[]) { test_vasnwprintf (); test_asnwprintf (); - return 0; + return test_exit_status; } diff --git a/tests/test-vasnwprintf-posix2.c b/tests/test-vasnwprintf-posix2.c index 08a5505499..6ec9de8307 100644 --- a/tests/test-vasnwprintf-posix2.c +++ b/tests/test-vasnwprintf-posix2.c @@ -60,5 +60,5 @@ main (int argc, char *argv[]) free (result); } - return 0; + return test_exit_status; } diff --git a/tests/test-vasnwprintf-posix3.c b/tests/test-vasnwprintf-posix3.c index 7291478286..f2ddc82660 100644 --- a/tests/test-vasnwprintf-posix3.c +++ b/tests/test-vasnwprintf-posix3.c @@ -92,7 +92,7 @@ main (int argc, char *argv[]) test_vasnwprintf (); test_asnwprintf (); - return 0; + return test_exit_status; #else fprintf (stderr, "Skipping test: not a glibc >= 2.3 system\n"); return 77; diff --git a/tests/test-vasnwprintf.c b/tests/test-vasnwprintf.c index cf877ecbb9..5d6034045e 100644 --- a/tests/test-vasnwprintf.c +++ b/tests/test-vasnwprintf.c @@ -118,5 +118,5 @@ main (int argc, char *argv[]) { test_vasnwprintf (); test_asnwprintf (); - return 0; + return test_exit_status; } diff --git a/tests/test-vasprintf-gnu.c b/tests/test-vasprintf-gnu.c index a63f99c271..5b47d84a26 100644 --- a/tests/test-vasprintf-gnu.c +++ b/tests/test-vasprintf-gnu.c @@ -271,5 +271,5 @@ main (int argc, char *argv[]) { test_vasprintf (); test_asprintf (); - return 0; + return test_exit_status; } diff --git a/tests/test-vasprintf-posix.c b/tests/test-vasprintf-posix.c index f6f9159ddd..dab3c21649 100644 --- a/tests/test-vasprintf-posix.c +++ b/tests/test-vasprintf-posix.c @@ -5199,5 +5199,5 @@ main (int argc, char *argv[]) { test_vasprintf (); test_asprintf (); - return 0; + return test_exit_status; } diff --git a/tests/test-vasprintf.c b/tests/test-vasprintf.c index 809e6ad712..2e43dc3e33 100644 --- a/tests/test-vasprintf.c +++ b/tests/test-vasprintf.c @@ -99,5 +99,5 @@ main (int argc, char *argv[]) { test_vasprintf (); test_asprintf (); - return 0; + return test_exit_status; } diff --git a/tests/test-vdprintf-gnu.c b/tests/test-vdprintf-gnu.c index e341581071..5c0f0f3348 100644 --- a/tests/test-vdprintf-gnu.c +++ b/tests/test-vdprintf-gnu.c @@ -44,5 +44,5 @@ int main (int argc, char *argv[]) { test_function (my_fprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-vdprintf-posix.c b/tests/test-vdprintf-posix.c index 2a63d5df3f..0d6b6e39b3 100644 --- a/tests/test-vdprintf-posix.c +++ b/tests/test-vdprintf-posix.c @@ -48,5 +48,5 @@ int main (int argc, char *argv[]) { test_function (my_fprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-vdprintf.c b/tests/test-vdprintf.c index 186e55a9ea..6ee7d0d3b9 100644 --- a/tests/test-vdprintf.c +++ b/tests/test-vdprintf.c @@ -54,5 +54,5 @@ main (int argc, char *argv[]) ASSERT (errno == EBADF); } - return 0; + return test_exit_status; } diff --git a/tests/test-verror.c b/tests/test-verror.c index 53294aa035..1e9dcd9cc5 100644 --- a/tests/test-verror.c +++ b/tests/test-verror.c @@ -127,5 +127,5 @@ main (int argc, char *argv[]) /* Test verror() function with nonzero STATUS. */ test_fatal ("fatal error"); - return 0; + return test_exit_status; } diff --git a/tests/test-vfprintf-gnu.c b/tests/test-vfprintf-gnu.c index f872a5b58d..813992c93a 100644 --- a/tests/test-vfprintf-gnu.c +++ b/tests/test-vfprintf-gnu.c @@ -44,5 +44,5 @@ int main (int argc, char *argv[]) { test_function (my_fprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-vfprintf-posix.c b/tests/test-vfprintf-posix.c index fa0b495406..ae9c8f35bc 100644 --- a/tests/test-vfprintf-posix.c +++ b/tests/test-vfprintf-posix.c @@ -48,5 +48,5 @@ int main (int argc, char *argv[]) { test_function (my_fprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-vprintf-gnu.c b/tests/test-vprintf-gnu.c index 75ae78a7d3..1655d26140 100644 --- a/tests/test-vprintf-gnu.c +++ b/tests/test-vprintf-gnu.c @@ -44,5 +44,5 @@ int main (int argc, char *argv[]) { test_function (my_printf); - return 0; + return test_exit_status; } diff --git a/tests/test-vprintf-posix.c b/tests/test-vprintf-posix.c index 6b8fdb7409..795b09366b 100644 --- a/tests/test-vprintf-posix.c +++ b/tests/test-vprintf-posix.c @@ -48,5 +48,5 @@ int main (int argc, char *argv[]) { test_function (my_printf); - return 0; + return test_exit_status; } diff --git a/tests/test-vsnprintf-gnu.c b/tests/test-vsnprintf-gnu.c index 42cdaafd6d..8d06aed380 100644 --- a/tests/test-vsnprintf-gnu.c +++ b/tests/test-vsnprintf-gnu.c @@ -44,5 +44,5 @@ int main (int argc, char *argv[]) { test_function (my_snprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-vsnprintf-posix.c b/tests/test-vsnprintf-posix.c index 3fbe69f1ad..752ced6b54 100644 --- a/tests/test-vsnprintf-posix.c +++ b/tests/test-vsnprintf-posix.c @@ -48,5 +48,5 @@ int main (int argc, char *argv[]) { test_function (my_snprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-vsnprintf.c b/tests/test-vsnprintf.c index e2ca0e05af..552a931a51 100644 --- a/tests/test-vsnprintf.c +++ b/tests/test-vsnprintf.c @@ -81,5 +81,5 @@ main (int argc, char *argv[]) ASSERT (retval == strlen (result)); } - return 0; + return test_exit_status; } diff --git a/tests/test-vsprintf-gnu.c b/tests/test-vsprintf-gnu.c index c2844f1661..fcbf56b1ef 100644 --- a/tests/test-vsprintf-gnu.c +++ b/tests/test-vsprintf-gnu.c @@ -44,5 +44,5 @@ int main (int argc, char *argv[]) { test_function (my_sprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-vsprintf-posix.c b/tests/test-vsprintf-posix.c index 7fd7811de0..a6ef5ad664 100644 --- a/tests/test-vsprintf-posix.c +++ b/tests/test-vsprintf-posix.c @@ -51,5 +51,5 @@ int main (int argc, char *argv[]) { test_function (my_sprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-wcrtomb-w32.c b/tests/test-wcrtomb-w32.c index 4be9a0df36..b2b8f35cab 100644 --- a/tests/test-wcrtomb-w32.c +++ b/tests/test-wcrtomb-w32.c @@ -318,11 +318,9 @@ main (int argc, char *argv[]) } if (result == 77) - { - fprintf (stderr, "Skipping test: found no locale with codepage %d\n", - codepage); - } - return result; + fprintf (stderr, "Skipping test: found no locale with codepage %d\n", + codepage); + return (result ? result : test_exit_status); } #else diff --git a/tests/test-wcrtomb.c b/tests/test-wcrtomb.c index 640d6d9c50..6bb7eb6325 100644 --- a/tests/test-wcrtomb.c +++ b/tests/test-wcrtomb.c @@ -118,7 +118,7 @@ main (int argc, char *argv[]) { case '1': /* C locale; tested above. */ - return 0; + return test_exit_status; case '2': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -128,7 +128,7 @@ main (int argc, char *argv[]) check_character (input + 1, 1); check_character (input + 2, 1); } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -138,7 +138,7 @@ main (int argc, char *argv[]) check_character (input + 1, 2); check_character (input + 3, 2); } - return 0; + return test_exit_status; case '4': /* Locale encoding is EUC-JP. */ @@ -149,7 +149,7 @@ main (int argc, char *argv[]) check_character (input + 3, 2); check_character (input + 5, 2); } - return 0; + return test_exit_status; case '5': /* Locale encoding is GB18030. */ @@ -159,7 +159,7 @@ main (int argc, char *argv[]) check_character (input + 1, 2); check_character (input + 3, 4); } - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-wcscmp.c b/tests/test-wcscmp.c index 6f9db77ee4..68873612f4 100644 --- a/tests/test-wcscmp.c +++ b/tests/test-wcscmp.c @@ -118,5 +118,5 @@ main (int argc, char *argv[]) } } - return 0; + return test_exit_status; } diff --git a/tests/test-wcsncmp.c b/tests/test-wcsncmp.c index 8aae39229f..6db6c248ef 100644 --- a/tests/test-wcsncmp.c +++ b/tests/test-wcsncmp.c @@ -178,5 +178,5 @@ main (int argc, char *argv[]) } } - return 0; + return test_exit_status; } diff --git a/tests/test-wcsnrtombs.c b/tests/test-wcsnrtombs.c index d616288b50..396dd3e17a 100644 --- a/tests/test-wcsnrtombs.c +++ b/tests/test-wcsnrtombs.c @@ -195,7 +195,7 @@ main (int argc, char *argv[]) return 1; } - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-wcsrtombs.c b/tests/test-wcsrtombs.c index d95705f86d..a5c5484b0f 100644 --- a/tests/test-wcsrtombs.c +++ b/tests/test-wcsrtombs.c @@ -195,7 +195,7 @@ main (int argc, char *argv[]) return 1; } - return 0; + return test_exit_status; } return 1; diff --git a/tests/test-wcsstr.c b/tests/test-wcsstr.c index 566fed73e3..c71bebfb8c 100644 --- a/tests/test-wcsstr.c +++ b/tests/test-wcsstr.c @@ -270,5 +270,5 @@ main (int argc, char *argv[]) free (haystack); } - return 0; + return test_exit_status; } diff --git a/tests/test-wcstok.c b/tests/test-wcstok.c index f654f9d969..bfa1092558 100644 --- a/tests/test-wcstok.c +++ b/tests/test-wcstok.c @@ -49,5 +49,5 @@ main () ret = wcstok (NULL, delim, &ptr); ASSERT (ret == NULL); - return 0; + return test_exit_status; } diff --git a/tests/test-wctrans.c b/tests/test-wctrans.c index 4ce1169191..f7459ae948 100644 --- a/tests/test-wctrans.c +++ b/tests/test-wctrans.c @@ -39,5 +39,5 @@ main (int argc, char *argv[]) desc = wctrans ("toupper"); ASSERT (desc != (wctrans_t) 0); - return 0; + return test_exit_status; } diff --git a/tests/test-wctype-h.c b/tests/test-wctype-h.c index 016fd8fcfb..a6a1a51b72 100644 --- a/tests/test-wctype-h.c +++ b/tests/test-wctype-h.c @@ -107,5 +107,5 @@ main (void) ASSERT (towlower (e) == e); ASSERT (towupper (e) == e); - return 0; + return test_exit_status; } diff --git a/tests/test-wctype.c b/tests/test-wctype.c index 62d0a78c97..134096ad86 100644 --- a/tests/test-wctype.c +++ b/tests/test-wctype.c @@ -69,5 +69,5 @@ main (int argc, char *argv[]) desc = wctype ("print"); ASSERT (desc != (wctype_t) 0); - return 0; + return test_exit_status; } diff --git a/tests/test-wcwidth.c b/tests/test-wcwidth.c index 79556a24ed..9d837c4390 100644 --- a/tests/test-wcwidth.c +++ b/tests/test-wcwidth.c @@ -102,5 +102,5 @@ main () #endif } - return 0; + return test_exit_status; } diff --git a/tests/test-wgetcwd-lgpl.c b/tests/test-wgetcwd-lgpl.c index 21274922a0..95932565c5 100644 --- a/tests/test-wgetcwd-lgpl.c +++ b/tests/test-wgetcwd-lgpl.c @@ -94,5 +94,5 @@ main () free (pwd2); #endif - return 0; + return test_exit_status; } diff --git a/tests/test-wmemcmp.c b/tests/test-wmemcmp.c index 2e3cee439f..692fcb5e07 100644 --- a/tests/test-wmemcmp.c +++ b/tests/test-wmemcmp.c @@ -91,5 +91,5 @@ main (int argc, char *argv[]) ASSERT (wmemcmp (input2, input1, 1) > 0); } - return 0; + return test_exit_status; } diff --git a/tests/test-write.c b/tests/test-write.c index 0b046a56d6..d9487568e7 100644 --- a/tests/test-write.c +++ b/tests/test-write.c @@ -75,5 +75,5 @@ main (void) /* Clean up. */ unlink (filename); - return 0; + return test_exit_status; } diff --git a/tests/test-xfprintf-posix.c b/tests/test-xfprintf-posix.c index db56103afc..e17f5cbac3 100644 --- a/tests/test-xfprintf-posix.c +++ b/tests/test-xfprintf-posix.c @@ -33,5 +33,5 @@ int main (_GL_UNUSED int argc, char *argv[]) { test_function (xfprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-xmemdup0.c b/tests/test-xmemdup0.c index 6706d8827d..ebb3c5d371 100644 --- a/tests/test-xmemdup0.c +++ b/tests/test-xmemdup0.c @@ -74,5 +74,5 @@ main (int argc, char **argv) free (result); } - return 0; + return test_exit_status; } diff --git a/tests/test-xprintf-posix.c b/tests/test-xprintf-posix.c index 17660d7304..29758ef42c 100644 --- a/tests/test-xprintf-posix.c +++ b/tests/test-xprintf-posix.c @@ -32,5 +32,5 @@ int main (_GL_UNUSED int argc, char *argv[]) { test_function (xprintf); - return 0; + return test_exit_status; } diff --git a/tests/test-xstdopen.c b/tests/test-xstdopen.c index da27840cbf..cadbf11f11 100644 --- a/tests/test-xstdopen.c +++ b/tests/test-xstdopen.c @@ -28,5 +28,5 @@ main (void) xstdopen (); ASSERT (open ("Makefile", O_RDONLY) >= 3); - return 0; + return test_exit_status; } diff --git a/tests/test-xstrerror.c b/tests/test-xstrerror.c index 9dfaf3e31f..21b70fea3c 100644 --- a/tests/test-xstrerror.c +++ b/tests/test-xstrerror.c @@ -41,5 +41,5 @@ main () free (s); } - return 0; + return test_exit_status; } diff --git a/tests/test-xstring-desc.c b/tests/test-xstring-desc.c index d0680ff1a5..b4ca660c37 100644 --- a/tests/test-xstring-desc.c +++ b/tests/test-xstring-desc.c @@ -80,5 +80,5 @@ main (void) free (ptr); } - return 0; + return test_exit_status; } diff --git a/tests/test-xvasprintf.c b/tests/test-xvasprintf.c index 8202bd31d6..038b0c242b 100644 --- a/tests/test-xvasprintf.c +++ b/tests/test-xvasprintf.c @@ -131,5 +131,5 @@ main (_GL_UNUSED int argc, char *argv[]) test_xvasprintf (); test_xasprintf (); - return 0; + return test_exit_status; } diff --git a/tests/test-y0.c b/tests/test-y0.c index 3115e6d041..844199c67a 100644 --- a/tests/test-y0.c +++ b/tests/test-y0.c @@ -36,5 +36,5 @@ main () y = y0 (x); ASSERT (y >= 0.0645032466 && y <= 0.0645032467); - return 0; + return test_exit_status; } diff --git a/tests/test-y1.c b/tests/test-y1.c index 1da561dd0d..039c1bf1eb 100644 --- a/tests/test-y1.c +++ b/tests/test-y1.c @@ -36,5 +36,5 @@ main () y = y1 (x); ASSERT (y >= 0.4141146893 && y <= 0.4141146894); - return 0; + return test_exit_status; } diff --git a/tests/test-yn.c b/tests/test-yn.c index 90e3b9c901..6d8700f3f6 100644 --- a/tests/test-yn.c +++ b/tests/test-yn.c @@ -86,5 +86,5 @@ main () y = yn (10, x); ASSERT (y >= -284.4645273 && y <= -284.4645272); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-locale-language.c b/tests/unicase/test-locale-language.c index ed6adeb819..a2a7d7c4f5 100644 --- a/tests/unicase/test-locale-language.c +++ b/tests/unicase/test-locale-language.c @@ -40,5 +40,5 @@ main (int argc, char *argv[]) language = uc_locale_language (); ASSERT (strcmp (language, expected) == 0); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-mapping-part2.h b/tests/unicase/test-mapping-part2.h index ed4894820a..321ed11aac 100644 --- a/tests/unicase/test-mapping-part2.h +++ b/tests/unicase/test-mapping-part2.h @@ -33,5 +33,5 @@ main () for (; c < 0x110000; c++) ASSERT (MAP (c) == c); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-predicate-part2.h b/tests/unicase/test-predicate-part2.h index 0b58545b74..1212e01363 100644 --- a/tests/unicase/test-predicate-part2.h +++ b/tests/unicase/test-predicate-part2.h @@ -33,5 +33,5 @@ main () for (; c < 0x110000; c++) ASSERT (!PREDICATE (c)); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u16-casecmp.c b/tests/unicase/test-u16-casecmp.c index a85abbbdcd..079e2443fb 100644 --- a/tests/unicase/test-u16-casecmp.c +++ b/tests/unicase/test-u16-casecmp.c @@ -317,5 +317,5 @@ main () test_ascii (u16_casecmp, UNINORM_NFD); test_nonascii (u16_casecmp); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u16-casecoll.c b/tests/unicase/test-u16-casecoll.c index ade96bfb57..609038792b 100644 --- a/tests/unicase/test-u16-casecoll.c +++ b/tests/unicase/test-u16-casecoll.c @@ -35,5 +35,5 @@ main () on ASCII strings should behave like strcasecmp. */ test_ascii (u16_casecoll, UNINORM_NFC); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u16-casefold.c b/tests/unicase/test-u16-casefold.c index 23e94eff74..8107bebea5 100644 --- a/tests/unicase/test-u16-casefold.c +++ b/tests/unicase/test-u16-casefold.c @@ -197,5 +197,5 @@ main () ASSERT (check (input, SIZEOF (input), NULL, UNINORM_NFC, casefolded_normalized, SIZEOF (casefolded_normalized)) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u16-is-cased.c b/tests/unicase/test-u16-is-cased.c index dafba78ee8..493b74f931 100644 --- a/tests/unicase/test-u16-is-cased.c +++ b/tests/unicase/test-u16-is-cased.c @@ -32,5 +32,5 @@ main () { test_ascii (u16_is_cased); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u16-is-casefolded.c b/tests/unicase/test-u16-is-casefolded.c index 6072535a49..34de1c9d03 100644 --- a/tests/unicase/test-u16-is-casefolded.c +++ b/tests/unicase/test-u16-is-casefolded.c @@ -46,5 +46,5 @@ main () test_ascii (u16_is_casefolded); test_nonascii (u16_is_casefolded); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u16-is-lowercase.c b/tests/unicase/test-u16-is-lowercase.c index 5b4e095e84..6b14304bb8 100644 --- a/tests/unicase/test-u16-is-lowercase.c +++ b/tests/unicase/test-u16-is-lowercase.c @@ -74,5 +74,5 @@ main () test_ascii (u16_is_lowercase); test_nonascii (u16_is_lowercase); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u16-is-titlecase.c b/tests/unicase/test-u16-is-titlecase.c index 4e60c4ac72..6caad27af9 100644 --- a/tests/unicase/test-u16-is-titlecase.c +++ b/tests/unicase/test-u16-is-titlecase.c @@ -32,5 +32,5 @@ main () { test_ascii (u16_is_titlecase); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u16-is-uppercase.c b/tests/unicase/test-u16-is-uppercase.c index 354c90529f..b3dea713f2 100644 --- a/tests/unicase/test-u16-is-uppercase.c +++ b/tests/unicase/test-u16-is-uppercase.c @@ -74,5 +74,5 @@ main () test_ascii (u16_is_uppercase); test_nonascii (u16_is_uppercase); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u16-tolower.c b/tests/unicase/test-u16-tolower.c index 86ed522f88..6c47d5608f 100644 --- a/tests/unicase/test-u16-tolower.c +++ b/tests/unicase/test-u16-tolower.c @@ -234,5 +234,5 @@ main () ASSERT (check (input, SIZEOF (input), NULL, NULL, casemapped, SIZEOF (casemapped)) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u16-totitle.c b/tests/unicase/test-u16-totitle.c index be653df155..704231c090 100644 --- a/tests/unicase/test-u16-totitle.c +++ b/tests/unicase/test-u16-totitle.c @@ -194,5 +194,5 @@ main () ASSERT (check (input, SIZEOF (input), NULL, UNINORM_NFC, casemapped_normalized, SIZEOF (casemapped_normalized)) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u16-toupper.c b/tests/unicase/test-u16-toupper.c index 5bbc10ac66..e04e0ba841 100644 --- a/tests/unicase/test-u16-toupper.c +++ b/tests/unicase/test-u16-toupper.c @@ -194,5 +194,5 @@ main () ASSERT (check (input, SIZEOF (input), NULL, UNINORM_NFC, casemapped_normalized, SIZEOF (casemapped_normalized)) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u32-casecmp.c b/tests/unicase/test-u32-casecmp.c index aca59a8814..a7e5e49b05 100644 --- a/tests/unicase/test-u32-casecmp.c +++ b/tests/unicase/test-u32-casecmp.c @@ -317,5 +317,5 @@ main () test_ascii (u32_casecmp, UNINORM_NFD); test_nonascii (u32_casecmp); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u32-casecoll.c b/tests/unicase/test-u32-casecoll.c index 7ad0163047..b38d82c8a8 100644 --- a/tests/unicase/test-u32-casecoll.c +++ b/tests/unicase/test-u32-casecoll.c @@ -35,5 +35,5 @@ main () on ASCII strings should behave like strcasecmp. */ test_ascii (u32_casecoll, UNINORM_NFC); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u32-casefold.c b/tests/unicase/test-u32-casefold.c index c31245e18c..c4de76f948 100644 --- a/tests/unicase/test-u32-casefold.c +++ b/tests/unicase/test-u32-casefold.c @@ -197,5 +197,5 @@ main () ASSERT (check (input, SIZEOF (input), NULL, UNINORM_NFC, casefolded_normalized, SIZEOF (casefolded_normalized)) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u32-is-cased.c b/tests/unicase/test-u32-is-cased.c index 5f663dd81f..c7f744c427 100644 --- a/tests/unicase/test-u32-is-cased.c +++ b/tests/unicase/test-u32-is-cased.c @@ -32,5 +32,5 @@ main () { test_ascii (u32_is_cased); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u32-is-casefolded.c b/tests/unicase/test-u32-is-casefolded.c index 1798f310fa..b25362553e 100644 --- a/tests/unicase/test-u32-is-casefolded.c +++ b/tests/unicase/test-u32-is-casefolded.c @@ -46,5 +46,5 @@ main () test_ascii (u32_is_casefolded); test_nonascii (u32_is_casefolded); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u32-is-lowercase.c b/tests/unicase/test-u32-is-lowercase.c index 3c1bf91e8c..dcb1ac2850 100644 --- a/tests/unicase/test-u32-is-lowercase.c +++ b/tests/unicase/test-u32-is-lowercase.c @@ -74,5 +74,5 @@ main () test_ascii (u32_is_lowercase); test_nonascii (u32_is_lowercase); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u32-is-titlecase.c b/tests/unicase/test-u32-is-titlecase.c index 3aedb6c83e..225ff55fcc 100644 --- a/tests/unicase/test-u32-is-titlecase.c +++ b/tests/unicase/test-u32-is-titlecase.c @@ -32,5 +32,5 @@ main () { test_ascii (u32_is_titlecase); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u32-is-uppercase.c b/tests/unicase/test-u32-is-uppercase.c index cf5009917c..d8a6c35183 100644 --- a/tests/unicase/test-u32-is-uppercase.c +++ b/tests/unicase/test-u32-is-uppercase.c @@ -74,5 +74,5 @@ main () test_ascii (u32_is_uppercase); test_nonascii (u32_is_uppercase); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u32-tolower.c b/tests/unicase/test-u32-tolower.c index 47c9e1ee4c..1ca02d2fa2 100644 --- a/tests/unicase/test-u32-tolower.c +++ b/tests/unicase/test-u32-tolower.c @@ -234,5 +234,5 @@ main () ASSERT (check (input, SIZEOF (input), NULL, NULL, casemapped, SIZEOF (casemapped)) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u32-totitle.c b/tests/unicase/test-u32-totitle.c index 948f48dbe1..30cd4803b5 100644 --- a/tests/unicase/test-u32-totitle.c +++ b/tests/unicase/test-u32-totitle.c @@ -194,5 +194,5 @@ main () ASSERT (check (input, SIZEOF (input), NULL, UNINORM_NFC, casemapped_normalized, SIZEOF (casemapped_normalized)) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u32-toupper.c b/tests/unicase/test-u32-toupper.c index 098c56ce7f..36fa68895b 100644 --- a/tests/unicase/test-u32-toupper.c +++ b/tests/unicase/test-u32-toupper.c @@ -194,5 +194,5 @@ main () ASSERT (check (input, SIZEOF (input), NULL, UNINORM_NFC, casemapped_normalized, SIZEOF (casemapped_normalized)) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u8-casecmp.c b/tests/unicase/test-u8-casecmp.c index 904c928404..d9f21c7b0f 100644 --- a/tests/unicase/test-u8-casecmp.c +++ b/tests/unicase/test-u8-casecmp.c @@ -326,5 +326,5 @@ main () test_ascii (u8_casecmp, UNINORM_NFD); test_nonascii (u8_casecmp); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u8-casecoll.c b/tests/unicase/test-u8-casecoll.c index a3e6d95fca..2b1e05097f 100644 --- a/tests/unicase/test-u8-casecoll.c +++ b/tests/unicase/test-u8-casecoll.c @@ -35,5 +35,5 @@ main () on ASCII strings should behave like strcasecmp. */ test_ascii (u8_casecoll, UNINORM_NFC); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u8-casefold.c b/tests/unicase/test-u8-casefold.c index d1fc896746..7364809ddb 100644 --- a/tests/unicase/test-u8-casefold.c +++ b/tests/unicase/test-u8-casefold.c @@ -203,5 +203,5 @@ main () ASSERT (check (input, SIZEOF (input), NULL, UNINORM_NFC, casefolded_normalized, SIZEOF (casefolded_normalized)) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u8-is-cased.c b/tests/unicase/test-u8-is-cased.c index b8f0b2bf13..e963748c48 100644 --- a/tests/unicase/test-u8-is-cased.c +++ b/tests/unicase/test-u8-is-cased.c @@ -32,5 +32,5 @@ main () { test_ascii (u8_is_cased); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u8-is-casefolded.c b/tests/unicase/test-u8-is-casefolded.c index a7cc49be16..b1f42849e7 100644 --- a/tests/unicase/test-u8-is-casefolded.c +++ b/tests/unicase/test-u8-is-casefolded.c @@ -46,5 +46,5 @@ main () test_ascii (u8_is_casefolded); test_nonascii (u8_is_casefolded); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u8-is-lowercase.c b/tests/unicase/test-u8-is-lowercase.c index c78b9df0cf..1cf6903bfe 100644 --- a/tests/unicase/test-u8-is-lowercase.c +++ b/tests/unicase/test-u8-is-lowercase.c @@ -74,5 +74,5 @@ main () test_ascii (u8_is_lowercase); test_nonascii (u8_is_lowercase); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u8-is-titlecase.c b/tests/unicase/test-u8-is-titlecase.c index 5416ab599c..51ede10639 100644 --- a/tests/unicase/test-u8-is-titlecase.c +++ b/tests/unicase/test-u8-is-titlecase.c @@ -32,5 +32,5 @@ main () { test_ascii (u8_is_titlecase); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u8-is-uppercase.c b/tests/unicase/test-u8-is-uppercase.c index 279f30ccac..a01f789acb 100644 --- a/tests/unicase/test-u8-is-uppercase.c +++ b/tests/unicase/test-u8-is-uppercase.c @@ -74,5 +74,5 @@ main () test_ascii (u8_is_uppercase); test_nonascii (u8_is_uppercase); - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u8-tolower.c b/tests/unicase/test-u8-tolower.c index 1e33148e83..81c49e701b 100644 --- a/tests/unicase/test-u8-tolower.c +++ b/tests/unicase/test-u8-tolower.c @@ -240,5 +240,5 @@ main () ASSERT (check (input, SIZEOF (input), NULL, NULL, casemapped, SIZEOF (casemapped)) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u8-totitle.c b/tests/unicase/test-u8-totitle.c index 676456e059..61ad5098d4 100644 --- a/tests/unicase/test-u8-totitle.c +++ b/tests/unicase/test-u8-totitle.c @@ -200,5 +200,5 @@ main () ASSERT (check (input, SIZEOF (input), NULL, UNINORM_NFC, casemapped_normalized, SIZEOF (casemapped_normalized)) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-u8-toupper.c b/tests/unicase/test-u8-toupper.c index a954dedda7..257cf3e723 100644 --- a/tests/unicase/test-u8-toupper.c +++ b/tests/unicase/test-u8-toupper.c @@ -200,5 +200,5 @@ main () ASSERT (check (input, SIZEOF (input), NULL, UNINORM_NFC, casemapped_normalized, SIZEOF (casemapped_normalized)) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/unicase/test-ulc-casecmp.c b/tests/unicase/test-ulc-casecmp.c index 4aaf9830fd..4c641329aa 100644 --- a/tests/unicase/test-ulc-casecmp.c +++ b/tests/unicase/test-ulc-casecmp.c @@ -382,12 +382,12 @@ main (int argc, char *argv[]) case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ test_iso_8859_1 (ulc_casecmp); - return 0; + return test_exit_status; case '2': /* Locale encoding is UTF-8. */ test_utf_8 (ulc_casecmp); - return 0; + return test_exit_status; } return 1; diff --git a/tests/unicase/test-ulc-casecoll.c b/tests/unicase/test-ulc-casecoll.c index fa720e048f..9206b3ea45 100644 --- a/tests/unicase/test-ulc-casecoll.c +++ b/tests/unicase/test-ulc-casecoll.c @@ -41,5 +41,5 @@ main () on ASCII strings should behave like strcasecmp. */ test_ascii (ulc_casecoll, UNINORM_NFC); - return 0; + return test_exit_status; } diff --git a/tests/uniconv/test-u16-conv-from-enc.c b/tests/uniconv/test-u16-conv-from-enc.c index 48c7fd7760..cd025d261b 100644 --- a/tests/uniconv/test-u16-conv-from-enc.c +++ b/tests/uniconv/test-u16-conv-from-enc.c @@ -220,5 +220,5 @@ main () #endif - return 0; + return test_exit_status; } diff --git a/tests/uniconv/test-u16-conv-to-enc.c b/tests/uniconv/test-u16-conv-to-enc.c index eeb51c3d36..7691061e0f 100644 --- a/tests/uniconv/test-u16-conv-to-enc.c +++ b/tests/uniconv/test-u16-conv-to-enc.c @@ -174,5 +174,5 @@ main () #endif - return 0; + return test_exit_status; } diff --git a/tests/uniconv/test-u16-strconv-from-enc.c b/tests/uniconv/test-u16-strconv-from-enc.c index b1cb1a881a..bf452d942d 100644 --- a/tests/uniconv/test-u16-strconv-from-enc.c +++ b/tests/uniconv/test-u16-strconv-from-enc.c @@ -120,5 +120,5 @@ main () #endif - return 0; + return test_exit_status; } diff --git a/tests/uniconv/test-u16-strconv-to-enc.c b/tests/uniconv/test-u16-strconv-to-enc.c index 7d3f596efa..1e81987269 100644 --- a/tests/uniconv/test-u16-strconv-to-enc.c +++ b/tests/uniconv/test-u16-strconv-to-enc.c @@ -105,5 +105,5 @@ main () #endif - return 0; + return test_exit_status; } diff --git a/tests/uniconv/test-u32-conv-from-enc.c b/tests/uniconv/test-u32-conv-from-enc.c index 994bfb49fd..48e902fe07 100644 --- a/tests/uniconv/test-u32-conv-from-enc.c +++ b/tests/uniconv/test-u32-conv-from-enc.c @@ -220,5 +220,5 @@ main () #endif - return 0; + return test_exit_status; } diff --git a/tests/uniconv/test-u32-conv-to-enc.c b/tests/uniconv/test-u32-conv-to-enc.c index 5ce1d61090..e26d559fa5 100644 --- a/tests/uniconv/test-u32-conv-to-enc.c +++ b/tests/uniconv/test-u32-conv-to-enc.c @@ -149,5 +149,5 @@ main () #endif - return 0; + return test_exit_status; } diff --git a/tests/uniconv/test-u32-strconv-from-enc.c b/tests/uniconv/test-u32-strconv-from-enc.c index 320bc185cd..c141d3e478 100644 --- a/tests/uniconv/test-u32-strconv-from-enc.c +++ b/tests/uniconv/test-u32-strconv-from-enc.c @@ -120,5 +120,5 @@ main () #endif - return 0; + return test_exit_status; } diff --git a/tests/uniconv/test-u32-strconv-to-enc.c b/tests/uniconv/test-u32-strconv-to-enc.c index 8ce0078688..06a692166b 100644 --- a/tests/uniconv/test-u32-strconv-to-enc.c +++ b/tests/uniconv/test-u32-strconv-to-enc.c @@ -91,5 +91,5 @@ main () #endif - return 0; + return test_exit_status; } diff --git a/tests/uniconv/test-u8-conv-from-enc.c b/tests/uniconv/test-u8-conv-from-enc.c index 641200f2b5..f7fad44167 100644 --- a/tests/uniconv/test-u8-conv-from-enc.c +++ b/tests/uniconv/test-u8-conv-from-enc.c @@ -206,5 +206,5 @@ main () #endif - return 0; + return test_exit_status; } diff --git a/tests/uniconv/test-u8-conv-to-enc.c b/tests/uniconv/test-u8-conv-to-enc.c index cd89803313..f569c6a583 100644 --- a/tests/uniconv/test-u8-conv-to-enc.c +++ b/tests/uniconv/test-u8-conv-to-enc.c @@ -178,5 +178,5 @@ main () #endif - return 0; + return test_exit_status; } diff --git a/tests/uniconv/test-u8-strconv-from-enc.c b/tests/uniconv/test-u8-strconv-from-enc.c index 61e3230ba6..6b9afd095d 100644 --- a/tests/uniconv/test-u8-strconv-from-enc.c +++ b/tests/uniconv/test-u8-strconv-from-enc.c @@ -102,5 +102,5 @@ main () #endif - return 0; + return test_exit_status; } diff --git a/tests/uniconv/test-u8-strconv-to-enc.c b/tests/uniconv/test-u8-strconv-to-enc.c index 68639f9e71..5cf3cd8876 100644 --- a/tests/uniconv/test-u8-strconv-to-enc.c +++ b/tests/uniconv/test-u8-strconv-to-enc.c @@ -96,5 +96,5 @@ main () #endif - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-bidi_byname.c b/tests/unictype/test-bidi_byname.c index 96d9f173cf..f71f49bb5a 100644 --- a/tests/unictype/test-bidi_byname.c +++ b/tests/unictype/test-bidi_byname.c @@ -125,5 +125,5 @@ main () ASSERT (uc_bidi_class_byname ("X") < 0); ASSERT (uc_bidi_class_byname ("") < 0); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-bidi_longname.c b/tests/unictype/test-bidi_longname.c index fcd7255fe8..a60d48932a 100644 --- a/tests/unictype/test-bidi_longname.c +++ b/tests/unictype/test-bidi_longname.c @@ -46,5 +46,5 @@ main () ASSERT (strcmp (uc_bidi_class_long_name (UC_BIDI_WS), "White Space") == 0); ASSERT (uc_bidi_class_long_name (-1) == NULL); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-bidi_name.c b/tests/unictype/test-bidi_name.c index 4c4024d2a1..49b374efd1 100644 --- a/tests/unictype/test-bidi_name.c +++ b/tests/unictype/test-bidi_name.c @@ -28,5 +28,5 @@ main () ASSERT (strcmp (uc_bidi_class_name (UC_BIDI_NSM), "NSM") == 0); ASSERT (uc_bidi_class_name (-1) == NULL); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-bidi_of.c b/tests/unictype/test-bidi_of.c index bc158324ce..8024e68dce 100644 --- a/tests/unictype/test-bidi_of.c +++ b/tests/unictype/test-bidi_of.c @@ -29,5 +29,5 @@ main () ASSERT (uc_bidi_class (0x05D7) == UC_BIDI_R); ASSERT (uc_bidi_class ('7') == UC_BIDI_EN); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-bidi_test.c b/tests/unictype/test-bidi_test.c index fd3f2930d5..7142a6d943 100644 --- a/tests/unictype/test-bidi_test.c +++ b/tests/unictype/test-bidi_test.c @@ -44,5 +44,5 @@ main () ASSERT (uc_is_bidi_class (c, uc_bidi_class (c))); } - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-block_list.c b/tests/unictype/test-block_list.c index 267d545683..b63d8568c1 100644 --- a/tests/unictype/test-block_list.c +++ b/tests/unictype/test-block_list.c @@ -46,5 +46,5 @@ main () ASSERT (hebrew_block != NULL); } - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-block_of.c b/tests/unictype/test-block_of.c index 60345188fe..86e5d2f2f6 100644 --- a/tests/unictype/test-block_of.c +++ b/tests/unictype/test-block_of.c @@ -63,5 +63,5 @@ main () } } - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-block_test.c b/tests/unictype/test-block_test.c index be7e44178b..a0b36ca702 100644 --- a/tests/unictype/test-block_test.c +++ b/tests/unictype/test-block_test.c @@ -38,5 +38,5 @@ main () ASSERT (uc_is_block (0x2A6D6, &b)); ASSERT (!uc_is_block (0x2A6D7, &b)); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-categ_and.c b/tests/unictype/test-categ_and.c index e2ded5858c..745b64cb6a 100644 --- a/tests/unictype/test-categ_and.c +++ b/tests/unictype/test-categ_and.c @@ -35,5 +35,5 @@ main () ASSERT (uc_is_general_category ('7', ct)); ASSERT (!uc_is_general_category (0x00B2, ct)); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-categ_and_not.c b/tests/unictype/test-categ_and_not.c index 07420d53a7..d2b61434d3 100644 --- a/tests/unictype/test-categ_and_not.c +++ b/tests/unictype/test-categ_and_not.c @@ -56,5 +56,5 @@ main () ASSERT (uc_is_general_category (0x00B2, ct)); } - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-categ_byname.c b/tests/unictype/test-categ_byname.c index 8cf94f4a59..68cee1b6d4 100644 --- a/tests/unictype/test-categ_byname.c +++ b/tests/unictype/test-categ_byname.c @@ -234,5 +234,5 @@ main () ASSERT (!uc_is_general_category (c, ct)); } - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-categ_longname.c b/tests/unictype/test-categ_longname.c index 9c725486e9..101e7ac517 100644 --- a/tests/unictype/test-categ_longname.c +++ b/tests/unictype/test-categ_longname.c @@ -29,5 +29,5 @@ main () ASSERT (strcmp (uc_general_category_long_name (UC_CATEGORY_Nl), "Letter Number") == 0); ASSERT (uc_general_category_long_name (uc_general_category_or (UC_CATEGORY_Z, UC_CATEGORY_Nl)) == NULL); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-categ_name.c b/tests/unictype/test-categ_name.c index f8f4889e89..c77e68664a 100644 --- a/tests/unictype/test-categ_name.c +++ b/tests/unictype/test-categ_name.c @@ -29,5 +29,5 @@ main () ASSERT (strcmp (uc_general_category_name (UC_CATEGORY_Nl), "Nl") == 0); ASSERT (uc_general_category_name (uc_general_category_or (UC_CATEGORY_Z, UC_CATEGORY_Nl)) == NULL); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-categ_none.c b/tests/unictype/test-categ_none.c index ae10a4392c..94032da406 100644 --- a/tests/unictype/test-categ_none.c +++ b/tests/unictype/test-categ_none.c @@ -38,5 +38,5 @@ main () #endif - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-categ_of.c b/tests/unictype/test-categ_of.c index 276994ebf2..f13975c452 100644 --- a/tests/unictype/test-categ_of.c +++ b/tests/unictype/test-categ_of.c @@ -51,5 +51,5 @@ main () ASSERT (uc_is_general_category (c, lowercase_letters)); } - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-categ_or.c b/tests/unictype/test-categ_or.c index 3ed5d2b021..fbd94a2d7b 100644 --- a/tests/unictype/test-categ_or.c +++ b/tests/unictype/test-categ_or.c @@ -32,5 +32,5 @@ main () ASSERT (uc_is_general_category ('7', ct)); ASSERT (!uc_is_general_category ('$', ct)); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-categ_test_withtable.c b/tests/unictype/test-categ_test_withtable.c index fbd265a52f..f6a3f6fa1a 100644 --- a/tests/unictype/test-categ_test_withtable.c +++ b/tests/unictype/test-categ_test_withtable.c @@ -34,5 +34,5 @@ main () ASSERT (!uc_is_general_category_withtable ('7', ctmask)); ASSERT (uc_is_general_category_withtable (0x00B2, ctmask)); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-combiningclass.c b/tests/unictype/test-combiningclass.c index 0e71d02238..5efca0fa5d 100644 --- a/tests/unictype/test-combiningclass.c +++ b/tests/unictype/test-combiningclass.c @@ -31,5 +31,5 @@ main () ASSERT (uc_combining_class (0x0327) == UC_CCC_ATB); ASSERT (uc_combining_class (0x093C) == UC_CCC_NK); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-combiningclass_byname.c b/tests/unictype/test-combiningclass_byname.c index 895b2ad10f..450bc5fb7d 100644 --- a/tests/unictype/test-combiningclass_byname.c +++ b/tests/unictype/test-combiningclass_byname.c @@ -114,5 +114,5 @@ main () ASSERT (uc_combining_class_byname ("Iota_Subscript") == UC_CCC_IS); ASSERT (uc_combining_class_byname ("IotaSubscript") == UC_CCC_IS); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-combiningclass_longname.c b/tests/unictype/test-combiningclass_longname.c index 351467b8b5..f3909e8762 100644 --- a/tests/unictype/test-combiningclass_longname.c +++ b/tests/unictype/test-combiningclass_longname.c @@ -49,5 +49,5 @@ main () ASSERT (uc_combining_class_long_name (163) == NULL); ASSERT (uc_combining_class_long_name (255) == NULL); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-combiningclass_name.c b/tests/unictype/test-combiningclass_name.c index 7ccefbf23e..6b116720a4 100644 --- a/tests/unictype/test-combiningclass_name.c +++ b/tests/unictype/test-combiningclass_name.c @@ -49,5 +49,5 @@ main () ASSERT (uc_combining_class_name (163) == NULL); ASSERT (uc_combining_class_name (255) == NULL); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-decdigit.c b/tests/unictype/test-decdigit.c index e3b70470ba..1ff25ce183 100644 --- a/tests/unictype/test-decdigit.c +++ b/tests/unictype/test-decdigit.c @@ -45,5 +45,5 @@ main () for (; c < 0x110000; c++) ASSERT (uc_decimal_value (c) == -1); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-digit.c b/tests/unictype/test-digit.c index 12fa387d1f..c60dc12fc6 100644 --- a/tests/unictype/test-digit.c +++ b/tests/unictype/test-digit.c @@ -45,5 +45,5 @@ main () for (; c < 0x110000; c++) ASSERT (uc_digit_value (c) == -1); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-incb_byname.c b/tests/unictype/test-incb_byname.c index 5031d313ff..0f90919531 100644 --- a/tests/unictype/test-incb_byname.c +++ b/tests/unictype/test-incb_byname.c @@ -39,5 +39,5 @@ main () ASSERT (uc_indic_conjunct_break_byname ("X") < 0); ASSERT (uc_indic_conjunct_break_byname ("") < 0); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-incb_name.c b/tests/unictype/test-incb_name.c index 25f53c28a9..639b2fcd9a 100644 --- a/tests/unictype/test-incb_name.c +++ b/tests/unictype/test-incb_name.c @@ -33,5 +33,5 @@ main () ASSERT (strcmp (uc_indic_conjunct_break_name (UC_INDIC_CONJUNCT_BREAK_EXTEND), "Extend") == 0); ASSERT (uc_indic_conjunct_break_name (-1) == NULL); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-incb_of.c b/tests/unictype/test-incb_of.c index d2adeb5ce1..ceb5965c0d 100644 --- a/tests/unictype/test-incb_of.c +++ b/tests/unictype/test-incb_of.c @@ -48,5 +48,5 @@ main () for (; c < 0x110000; c++) ASSERT (uc_indic_conjunct_break (c) == UC_INDIC_CONJUNCT_BREAK_NONE); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-joininggroup_byname.c b/tests/unictype/test-joininggroup_byname.c index 24d5c19d0a..f57f6ad11a 100644 --- a/tests/unictype/test-joininggroup_byname.c +++ b/tests/unictype/test-joininggroup_byname.c @@ -174,5 +174,5 @@ main () ASSERT (uc_joining_group_byname ("X") < 0); ASSERT (uc_joining_group_byname ("") < 0); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-joininggroup_name.c b/tests/unictype/test-joininggroup_name.c index 9e4ef511c3..40202ced0a 100644 --- a/tests/unictype/test-joininggroup_name.c +++ b/tests/unictype/test-joininggroup_name.c @@ -86,5 +86,5 @@ main () ASSERT (strcmp (uc_joining_group_name (UC_JOINING_GROUP_ZHAIN), "Zhain") == 0); ASSERT (uc_joining_group_name (-1) == NULL); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-joininggroup_of.c b/tests/unictype/test-joininggroup_of.c index 65a70d5fb1..859f13fddf 100644 --- a/tests/unictype/test-joininggroup_of.c +++ b/tests/unictype/test-joininggroup_of.c @@ -48,5 +48,5 @@ main () for (; c < 0x110000; c++) ASSERT (uc_joining_group (c) == UC_JOINING_GROUP_NONE); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-joiningtype_byname.c b/tests/unictype/test-joiningtype_byname.c index ecde322ed5..1d6d6e8815 100644 --- a/tests/unictype/test-joiningtype_byname.c +++ b/tests/unictype/test-joiningtype_byname.c @@ -60,5 +60,5 @@ main () ASSERT (uc_joining_type_byname ("X") < 0); ASSERT (uc_joining_type_byname ("") < 0); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-joiningtype_longname.c b/tests/unictype/test-joiningtype_longname.c index 3d18ae2fa3..7416d2f95b 100644 --- a/tests/unictype/test-joiningtype_longname.c +++ b/tests/unictype/test-joiningtype_longname.c @@ -35,5 +35,5 @@ main () ASSERT (strcmp (uc_joining_type_long_name (UC_JOINING_TYPE_D), "Dual Joining") == 0); ASSERT (uc_joining_type_long_name (-1) == NULL); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-joiningtype_name.c b/tests/unictype/test-joiningtype_name.c index 0b2ca42441..004d15945a 100644 --- a/tests/unictype/test-joiningtype_name.c +++ b/tests/unictype/test-joiningtype_name.c @@ -35,5 +35,5 @@ main () ASSERT (strcmp (uc_joining_type_name (UC_JOINING_TYPE_D), "D") == 0); ASSERT (uc_joining_type_name (-1) == NULL); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-joiningtype_of.c b/tests/unictype/test-joiningtype_of.c index f0760b91da..6402150fc9 100644 --- a/tests/unictype/test-joiningtype_of.c +++ b/tests/unictype/test-joiningtype_of.c @@ -61,5 +61,5 @@ main () ASSERT (uc_joining_type (0x0613) == UC_JOINING_TYPE_T); ASSERT (uc_joining_type (0x0614) == UC_JOINING_TYPE_T); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-mirror.c b/tests/unictype/test-mirror.c index 5494e19784..b93add1526 100644 --- a/tests/unictype/test-mirror.c +++ b/tests/unictype/test-mirror.c @@ -37,5 +37,5 @@ main () ASSERT (uc_mirror_char ('}', &mirrored) && mirrored == '{'); ASSERT (!uc_mirror_char ('X', &mirrored)); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-numeric.c b/tests/unictype/test-numeric.c index 86718bf237..65330533db 100644 --- a/tests/unictype/test-numeric.c +++ b/tests/unictype/test-numeric.c @@ -55,5 +55,5 @@ main () ASSERT (value.numerator == 0 && value.denominator == 0); } - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-pr_byname.c b/tests/unictype/test-pr_byname.c index a3435e2664..4b7132f806 100644 --- a/tests/unictype/test-pr_byname.c +++ b/tests/unictype/test-pr_byname.c @@ -38,5 +38,5 @@ main () ASSERT (! uc_property_is_valid (pr)); } - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-pr_test.c b/tests/unictype/test-pr_test.c index e479123c36..ae38031a23 100644 --- a/tests/unictype/test-pr_test.c +++ b/tests/unictype/test-pr_test.c @@ -31,5 +31,5 @@ main () for (c = 0; c < 0x110000; c++) ASSERT (uc_is_property (c, pr) == uc_is_property_composite (c)); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-predicate-part2.h b/tests/unictype/test-predicate-part2.h index aecd5f5a3a..c6553334b7 100644 --- a/tests/unictype/test-predicate-part2.h +++ b/tests/unictype/test-predicate-part2.h @@ -33,5 +33,5 @@ main () for (; c < 0x110000; c++) ASSERT (!PREDICATE (c)); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-scripts.c b/tests/unictype/test-scripts.c index 6f51b6317f..b75501d0ae 100644 --- a/tests/unictype/test-scripts.c +++ b/tests/unictype/test-scripts.c @@ -70,5 +70,5 @@ main () ASSERT (found); } - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-sy_c_ident.c b/tests/unictype/test-sy_c_ident.c index 870227322b..1790de3ca9 100644 --- a/tests/unictype/test-sy_c_ident.c +++ b/tests/unictype/test-sy_c_ident.c @@ -34,5 +34,5 @@ main () ASSERT (uc_c_ident_category (0x001B) == UC_IDENTIFIER_INVALID); ASSERT (uc_c_ident_category (0xE0001) == UC_IDENTIFIER_INVALID); - return 0; + return test_exit_status; } diff --git a/tests/unictype/test-sy_java_ident.c b/tests/unictype/test-sy_java_ident.c index d3075b17f4..3ad382a9b6 100644 --- a/tests/unictype/test-sy_java_ident.c +++ b/tests/unictype/test-sy_java_ident.c @@ -34,5 +34,5 @@ main () ASSERT (uc_java_ident_category (0x001B) == UC_IDENTIFIER_IGNORABLE); ASSERT (uc_java_ident_category (0xE0001) == UC_IDENTIFIER_IGNORABLE); - return 0; + return test_exit_status; } diff --git a/tests/unigbrk/test-u16-grapheme-breaks.c b/tests/unigbrk/test-u16-grapheme-breaks.c index 7936050841..651496ebd9 100644 --- a/tests/unigbrk/test-u16-grapheme-breaks.c +++ b/tests/unigbrk/test-u16-grapheme-breaks.c @@ -115,5 +115,5 @@ main (void) '.', 0xD83C, 0xDDE9, 0xD83C, 0xDDEA, 0xD83C, 0xDDEB, 0xD83C, 0xDDF7, '.', -1); - return 0; + return test_exit_status; } diff --git a/tests/unigbrk/test-u16-grapheme-next.c b/tests/unigbrk/test-u16-grapheme-next.c index 45a7ac0a1f..8c58400f52 100644 --- a/tests/unigbrk/test-u16-grapheme-next.c +++ b/tests/unigbrk/test-u16-grapheme-next.c @@ -99,5 +99,5 @@ main (void) test_u16_grapheme_next (2, 0xd83d, 0xde10, -1); /* 😐: neutral face. */ test_u16_grapheme_next (3, 0xd83d, 0xde10, GRAVE, -1); - return 0; + return test_exit_status; } diff --git a/tests/unigbrk/test-u16-grapheme-prev.c b/tests/unigbrk/test-u16-grapheme-prev.c index 8ba01c2e09..7de29a3377 100644 --- a/tests/unigbrk/test-u16-grapheme-prev.c +++ b/tests/unigbrk/test-u16-grapheme-prev.c @@ -101,5 +101,5 @@ main (void) test_u16_grapheme_prev (2, 0xd83d, 0xde10, -1); /* 😐: neutral face. */ test_u16_grapheme_prev (3, 0xd83d, 0xde10, GRAVE, -1); - return 0; + return test_exit_status; } diff --git a/tests/unigbrk/test-u32-grapheme-breaks.c b/tests/unigbrk/test-u32-grapheme-breaks.c index 996555cc23..7b14b270a1 100644 --- a/tests/unigbrk/test-u32-grapheme-breaks.c +++ b/tests/unigbrk/test-u32-grapheme-breaks.c @@ -115,5 +115,5 @@ main (void) '.', 0x1F1E9, 0x1F1EA, 0x1F1EB, 0x1F1F7, '.', -1); - return 0; + return test_exit_status; } diff --git a/tests/unigbrk/test-u32-grapheme-next.c b/tests/unigbrk/test-u32-grapheme-next.c index 2681d674fa..74e6744880 100644 --- a/tests/unigbrk/test-u32-grapheme-next.c +++ b/tests/unigbrk/test-u32-grapheme-next.c @@ -100,5 +100,5 @@ main (void) test_u32_grapheme_next (1, NEUTRAL_FACE, -1); test_u32_grapheme_next (2, NEUTRAL_FACE, GRAVE, -1); - return 0; + return test_exit_status; } diff --git a/tests/unigbrk/test-u32-grapheme-prev.c b/tests/unigbrk/test-u32-grapheme-prev.c index 2c8006aed5..30bb3efa7d 100644 --- a/tests/unigbrk/test-u32-grapheme-prev.c +++ b/tests/unigbrk/test-u32-grapheme-prev.c @@ -102,5 +102,5 @@ main (void) test_u32_grapheme_prev (1, NEUTRAL_FACE, -1); test_u32_grapheme_prev (2, NEUTRAL_FACE, GRAVE, -1); - return 0; + return test_exit_status; } diff --git a/tests/unigbrk/test-u8-grapheme-breaks.c b/tests/unigbrk/test-u8-grapheme-breaks.c index 1ccdd60169..76b4013097 100644 --- a/tests/unigbrk/test-u8-grapheme-breaks.c +++ b/tests/unigbrk/test-u8-grapheme-breaks.c @@ -103,5 +103,5 @@ main (void) test_u8_grapheme_breaks (".\360\237\207\251\360\237\207\252\360\237\207\253\360\237\207\267.", "##_______#_______#"); - return 0; + return test_exit_status; } diff --git a/tests/unigbrk/test-u8-grapheme-next.c b/tests/unigbrk/test-u8-grapheme-next.c index 10dea9d0d4..8a3e2723dc 100644 --- a/tests/unigbrk/test-u8-grapheme-next.c +++ b/tests/unigbrk/test-u8-grapheme-next.c @@ -76,5 +76,5 @@ main (void) test_u8_grapheme_next ("e"ACUTE"x", 4, 3); test_u8_grapheme_next ("e"ACUTE "e"ACUTE, 6, 3); - return 0; + return test_exit_status; } diff --git a/tests/unigbrk/test-u8-grapheme-prev.c b/tests/unigbrk/test-u8-grapheme-prev.c index e3642367e6..31e9c77f61 100644 --- a/tests/unigbrk/test-u8-grapheme-prev.c +++ b/tests/unigbrk/test-u8-grapheme-prev.c @@ -77,5 +77,5 @@ main (void) test_u8_grapheme_prev ("e"ACUTE"x", 4, 1); test_u8_grapheme_prev ("e"ACUTE "e"ACUTE, 6, 3); - return 0; + return test_exit_status; } diff --git a/tests/unigbrk/test-uc-gbrk-prop.c b/tests/unigbrk/test-uc-gbrk-prop.c index 65b91d24a3..bbb56b58a3 100644 --- a/tests/unigbrk/test-uc-gbrk-prop.c +++ b/tests/unigbrk/test-uc-gbrk-prop.c @@ -85,5 +85,5 @@ main (void) } ASSERT (uc == 0x110000); - return 0; + return test_exit_status; } diff --git a/tests/unigbrk/test-uc-grapheme-breaks.c b/tests/unigbrk/test-uc-grapheme-breaks.c index afaab06b25..e3f0005899 100644 --- a/tests/unigbrk/test-uc-grapheme-breaks.c +++ b/tests/unigbrk/test-uc-grapheme-breaks.c @@ -98,7 +98,6 @@ main (int argc, char *argv[]) { const char *filename; char line[1024]; - int exit_code; FILE *stream; int lineno; @@ -118,7 +117,6 @@ main (int argc, char *argv[]) exit (1); } - exit_code = 0; lineno = 0; while (fgets (line, sizeof line, stream)) { @@ -186,5 +184,5 @@ main (int argc, char *argv[]) test_uc_grapheme_breaks (breaks, s, i, filename, lineno); } - return exit_code; + return test_exit_status; } diff --git a/tests/unigbrk/test-ulc-grapheme-breaks.c b/tests/unigbrk/test-ulc-grapheme-breaks.c index 519be6fe10..6a8c777e9c 100644 --- a/tests/unigbrk/test-ulc-grapheme-breaks.c +++ b/tests/unigbrk/test-ulc-grapheme-breaks.c @@ -83,5 +83,5 @@ main () } #endif - return 0; + return test_exit_status; } diff --git a/tests/unilbrk/test-u16-possible-linebreaks.c b/tests/unilbrk/test-u16-possible-linebreaks.c index 877367e7d9..438f30b804 100644 --- a/tests/unilbrk/test-u16-possible-linebreaks.c +++ b/tests/unilbrk/test-u16-possible-linebreaks.c @@ -260,5 +260,5 @@ main () test_function (u16_possible_linebreaks, 1); #endif - return 0; + return test_exit_status; } diff --git a/tests/unilbrk/test-u16-width-linebreaks.c b/tests/unilbrk/test-u16-width-linebreaks.c index fb337873d1..8443f353e2 100644 --- a/tests/unilbrk/test-u16-width-linebreaks.c +++ b/tests/unilbrk/test-u16-width-linebreaks.c @@ -81,5 +81,5 @@ main () test_function (u16_width_linebreaks, 1); #endif - return 0; + return test_exit_status; } diff --git a/tests/unilbrk/test-u32-possible-linebreaks.c b/tests/unilbrk/test-u32-possible-linebreaks.c index 84b0e3c04f..8e70c25658 100644 --- a/tests/unilbrk/test-u32-possible-linebreaks.c +++ b/tests/unilbrk/test-u32-possible-linebreaks.c @@ -260,5 +260,5 @@ main () test_function (u32_possible_linebreaks, 1); #endif - return 0; + return test_exit_status; } diff --git a/tests/unilbrk/test-u32-width-linebreaks.c b/tests/unilbrk/test-u32-width-linebreaks.c index b59405cda1..9e68750f19 100644 --- a/tests/unilbrk/test-u32-width-linebreaks.c +++ b/tests/unilbrk/test-u32-width-linebreaks.c @@ -81,5 +81,5 @@ main () test_function (u32_width_linebreaks, 1); #endif - return 0; + return test_exit_status; } diff --git a/tests/unilbrk/test-u8-possible-linebreaks.c b/tests/unilbrk/test-u8-possible-linebreaks.c index 90768d20e3..7a1b65d54d 100644 --- a/tests/unilbrk/test-u8-possible-linebreaks.c +++ b/tests/unilbrk/test-u8-possible-linebreaks.c @@ -243,5 +243,5 @@ main () test_function (u8_possible_linebreaks, 1); #endif - return 0; + return test_exit_status; } diff --git a/tests/unilbrk/test-u8-width-linebreaks.c b/tests/unilbrk/test-u8-width-linebreaks.c index a84ee0dbf9..ca04257a86 100644 --- a/tests/unilbrk/test-u8-width-linebreaks.c +++ b/tests/unilbrk/test-u8-width-linebreaks.c @@ -75,5 +75,5 @@ main () test_function (u8_width_linebreaks, 1); #endif - return 0; + return test_exit_status; } diff --git a/tests/unilbrk/test-ulc-possible-linebreaks.c b/tests/unilbrk/test-ulc-possible-linebreaks.c index 21ec0b5e67..8267f3e076 100644 --- a/tests/unilbrk/test-ulc-possible-linebreaks.c +++ b/tests/unilbrk/test-ulc-possible-linebreaks.c @@ -76,5 +76,5 @@ main () test_function (ulc_possible_linebreaks, 1); #endif - return 0; + return test_exit_status; } diff --git a/tests/unilbrk/test-ulc-width-linebreaks.c b/tests/unilbrk/test-ulc-width-linebreaks.c index 65e125e5de..1905bc57af 100644 --- a/tests/unilbrk/test-ulc-width-linebreaks.c +++ b/tests/unilbrk/test-ulc-width-linebreaks.c @@ -60,5 +60,5 @@ main () test_function (ulc_width_linebreaks, 1); #endif - return 0; + return test_exit_status; } diff --git a/tests/unimetadata/test-u-version.c b/tests/unimetadata/test-u-version.c index 6dc48ad389..81a48958dd 100644 --- a/tests/unimetadata/test-u-version.c +++ b/tests/unimetadata/test-u-version.c @@ -35,5 +35,5 @@ main () ASSERT (v >= (15 << 8)); ASSERT (v < (100 << 8)); - return 0; + return test_exit_status; } diff --git a/tests/uninorm/test-canonical-decomposition.c b/tests/uninorm/test-canonical-decomposition.c index 6ebac8e5bc..7ccab64b9d 100644 --- a/tests/uninorm/test-canonical-decomposition.c +++ b/tests/uninorm/test-canonical-decomposition.c @@ -139,5 +139,5 @@ main () ASSERT (decomposed[0] == 0x1100); ASSERT (decomposed[1] == 0x1173); - return 0; + return test_exit_status; } diff --git a/tests/uninorm/test-compat-decomposition.c b/tests/uninorm/test-compat-decomposition.c index d4252cbc36..e66d92bedc 100644 --- a/tests/uninorm/test-compat-decomposition.c +++ b/tests/uninorm/test-compat-decomposition.c @@ -180,5 +180,5 @@ main () ASSERT (decomposed[0] == 0x1100); ASSERT (decomposed[1] == 0x1173); - return 0; + return test_exit_status; } diff --git a/tests/uninorm/test-composition.c b/tests/uninorm/test-composition.c index 4f90cfcb6f..3816983c32 100644 --- a/tests/uninorm/test-composition.c +++ b/tests/uninorm/test-composition.c @@ -49,5 +49,5 @@ main () /* HANGUL SYLLABLE GEUL */ ASSERT (uc_composition (0xADF8, 0x11AF) == 0xAE00); - return 0; + return test_exit_status; } diff --git a/tests/uninorm/test-decomposing-form.c b/tests/uninorm/test-decomposing-form.c index d56cd28cfc..fab8023a65 100644 --- a/tests/uninorm/test-decomposing-form.c +++ b/tests/uninorm/test-decomposing-form.c @@ -30,5 +30,5 @@ main () ASSERT (uninorm_decomposing_form (UNINORM_NFKC) == UNINORM_NFKD); ASSERT (uninorm_decomposing_form (UNINORM_NFKD) == UNINORM_NFKD); - return 0; + return test_exit_status; } diff --git a/tests/uninorm/test-decomposition.c b/tests/uninorm/test-decomposition.c index 7da461439f..c37b170da8 100644 --- a/tests/uninorm/test-decomposition.c +++ b/tests/uninorm/test-decomposition.c @@ -203,5 +203,5 @@ main () ASSERT (decomposed[0] == 0x1100); ASSERT (decomposed[1] == 0x1173); - return 0; + return test_exit_status; } diff --git a/tests/uninorm/test-nfc.c b/tests/uninorm/test-nfc.c index f1459ed34a..5efff6ad39 100644 --- a/tests/uninorm/test-nfc.c +++ b/tests/uninorm/test-nfc.c @@ -20,6 +20,8 @@ #include "uninorm.h" +#include "macros.h" + #if !(((defined _WIN32 || defined __CYGWIN__) && (HAVE_LIBUNISTRING || WOE32DLL)) || defined __ANDROID__) /* Check that UNINORM_NFC is defined and links. */ uninorm_t n = UNINORM_NFC; @@ -40,5 +42,5 @@ main () test_u16_nfc (); test_u8_nfc (); - return 0; + return test_exit_status; } diff --git a/tests/uninorm/test-nfd.c b/tests/uninorm/test-nfd.c index 17df0f0edd..ec4405f2b0 100644 --- a/tests/uninorm/test-nfd.c +++ b/tests/uninorm/test-nfd.c @@ -20,6 +20,8 @@ #include "uninorm.h" +#include "macros.h" + #if !(((defined _WIN32 || defined __CYGWIN__) && (HAVE_LIBUNISTRING || WOE32DLL)) || defined __ANDROID__) /* Check that UNINORM_NFD is defined and links. */ uninorm_t n = UNINORM_NFD; @@ -40,5 +42,5 @@ main () test_u16_nfd (); test_u8_nfd (); - return 0; + return test_exit_status; } diff --git a/tests/uninorm/test-nfkc.c b/tests/uninorm/test-nfkc.c index 640066c32d..7e62e3db0c 100644 --- a/tests/uninorm/test-nfkc.c +++ b/tests/uninorm/test-nfkc.c @@ -20,6 +20,8 @@ #include "uninorm.h" +#include "macros.h" + #if !(((defined _WIN32 || defined __CYGWIN__) && (HAVE_LIBUNISTRING || WOE32DLL)) || defined __ANDROID__) /* Check that UNINORM_NFKC is defined and links. */ uninorm_t n = UNINORM_NFKC; @@ -40,5 +42,5 @@ main () test_u16_nfkc (); test_u8_nfkc (); - return 0; + return test_exit_status; } diff --git a/tests/uninorm/test-nfkd.c b/tests/uninorm/test-nfkd.c index 8d5ff8365c..6d3db8e892 100644 --- a/tests/uninorm/test-nfkd.c +++ b/tests/uninorm/test-nfkd.c @@ -20,6 +20,8 @@ #include "uninorm.h" +#include "macros.h" + #if !(((defined _WIN32 || defined __CYGWIN__) && (HAVE_LIBUNISTRING || WOE32DLL)) || defined __ANDROID__) /* Check that UNINORM_NFKD is defined and links. */ uninorm_t n = UNINORM_NFKD; @@ -40,5 +42,5 @@ main () test_u16_nfkd (); test_u8_nfkd (); - return 0; + return test_exit_status; } diff --git a/tests/uninorm/test-u16-nfc.c b/tests/uninorm/test-u16-nfc.c index 36cbf979a2..1b5bfe57c2 100644 --- a/tests/uninorm/test-u16-nfc.c +++ b/tests/uninorm/test-u16-nfc.c @@ -27,6 +27,7 @@ #include #include "unistr.h" +#define NO_MAIN_HERE #include "macros.h" static int diff --git a/tests/uninorm/test-u16-nfd.c b/tests/uninorm/test-u16-nfd.c index 0be54c2104..2f3b92518f 100644 --- a/tests/uninorm/test-u16-nfd.c +++ b/tests/uninorm/test-u16-nfd.c @@ -27,6 +27,7 @@ #include #include "unistr.h" +#define NO_MAIN_HERE #include "macros.h" static int diff --git a/tests/uninorm/test-u16-nfkc.c b/tests/uninorm/test-u16-nfkc.c index c6bedaf89d..d9c4020257 100644 --- a/tests/uninorm/test-u16-nfkc.c +++ b/tests/uninorm/test-u16-nfkc.c @@ -27,6 +27,7 @@ #include #include "unistr.h" +#define NO_MAIN_HERE #include "macros.h" static int diff --git a/tests/uninorm/test-u16-nfkd.c b/tests/uninorm/test-u16-nfkd.c index f9a198c496..b244ac1640 100644 --- a/tests/uninorm/test-u16-nfkd.c +++ b/tests/uninorm/test-u16-nfkd.c @@ -27,6 +27,7 @@ #include #include "unistr.h" +#define NO_MAIN_HERE #include "macros.h" static int diff --git a/tests/uninorm/test-u16-normcmp.c b/tests/uninorm/test-u16-normcmp.c index 96ca07160b..bf36d74bc4 100644 --- a/tests/uninorm/test-u16-normcmp.c +++ b/tests/uninorm/test-u16-normcmp.c @@ -112,5 +112,5 @@ main () test_ascii (u16_normcmp, UNINORM_NFD); test_nonascii (u16_normcmp); - return 0; + return test_exit_status; } diff --git a/tests/uninorm/test-u16-normcoll.c b/tests/uninorm/test-u16-normcoll.c index fe08a15d9f..540d327413 100644 --- a/tests/uninorm/test-u16-normcoll.c +++ b/tests/uninorm/test-u16-normcoll.c @@ -31,5 +31,5 @@ main () on ASCII strings should behave like strcmp as well. */ test_ascii (u16_normcoll, UNINORM_NFC); - return 0; + return test_exit_status; } diff --git a/tests/uninorm/test-u32-nfc-big.c b/tests/uninorm/test-u32-nfc-big.c index 317607a1ca..238f745645 100644 --- a/tests/uninorm/test-u32-nfc-big.c +++ b/tests/uninorm/test-u32-nfc-big.c @@ -26,6 +26,7 @@ #include "unistr.h" #include "test-u32-normalize-big.h" +#include "macros.h" static int check (const uint32_t *c1, size_t c1_length, @@ -108,7 +109,7 @@ main (int argc, char *argv[]) free_normalization_test_file (&file); - return 0; + return test_exit_status; } #else diff --git a/tests/uninorm/test-u32-nfc.c b/tests/uninorm/test-u32-nfc.c index d6589c5124..8f6b2747ce 100644 --- a/tests/uninorm/test-u32-nfc.c +++ b/tests/uninorm/test-u32-nfc.c @@ -27,6 +27,7 @@ #include #include "unistr.h" +#define NO_MAIN_HERE #include "macros.h" static int diff --git a/tests/uninorm/test-u32-nfd-big.c b/tests/uninorm/test-u32-nfd-big.c index 8a35cd0303..ca3120473d 100644 --- a/tests/uninorm/test-u32-nfd-big.c +++ b/tests/uninorm/test-u32-nfd-big.c @@ -26,6 +26,7 @@ #include "unistr.h" #include "test-u32-normalize-big.h" +#include "macros.h" static int check (const uint32_t *c1, size_t c1_length, @@ -108,7 +109,7 @@ main (int argc, char *argv[]) free_normalization_test_file (&file); - return 0; + return test_exit_status; } #else diff --git a/tests/uninorm/test-u32-nfd.c b/tests/uninorm/test-u32-nfd.c index 6b78772402..5efa180b67 100644 --- a/tests/uninorm/test-u32-nfd.c +++ b/tests/uninorm/test-u32-nfd.c @@ -27,6 +27,7 @@ #include #include "unistr.h" +#define NO_MAIN_HERE #include "macros.h" static int diff --git a/tests/uninorm/test-u32-nfkc-big.c b/tests/uninorm/test-u32-nfkc-big.c index 4195b97e5a..920c117e66 100644 --- a/tests/uninorm/test-u32-nfkc-big.c +++ b/tests/uninorm/test-u32-nfkc-big.c @@ -26,6 +26,7 @@ #include "unistr.h" #include "test-u32-normalize-big.h" +#include "macros.h" static int check (const uint32_t *c1, size_t c1_length, @@ -105,7 +106,7 @@ main (int argc, char *argv[]) free_normalization_test_file (&file); - return 0; + return test_exit_status; } #else diff --git a/tests/uninorm/test-u32-nfkc.c b/tests/uninorm/test-u32-nfkc.c index 2b310def45..6fc9d362d4 100644 --- a/tests/uninorm/test-u32-nfkc.c +++ b/tests/uninorm/test-u32-nfkc.c @@ -27,6 +27,7 @@ #include #include "unistr.h" +#define NO_MAIN_HERE #include "macros.h" static int diff --git a/tests/uninorm/test-u32-nfkd-big.c b/tests/uninorm/test-u32-nfkd-big.c index f9c264d3a1..10908726ee 100644 --- a/tests/uninorm/test-u32-nfkd-big.c +++ b/tests/uninorm/test-u32-nfkd-big.c @@ -26,6 +26,7 @@ #include "unistr.h" #include "test-u32-normalize-big.h" +#include "macros.h" static int check (const uint32_t *c1, size_t c1_length, @@ -105,7 +106,7 @@ main (int argc, char *argv[]) free_normalization_test_file (&file); - return 0; + return test_exit_status; } #else diff --git a/tests/uninorm/test-u32-nfkd.c b/tests/uninorm/test-u32-nfkd.c index 5093127cec..b352e87cf4 100644 --- a/tests/uninorm/test-u32-nfkd.c +++ b/tests/uninorm/test-u32-nfkd.c @@ -27,6 +27,7 @@ #include #include "unistr.h" +#define NO_MAIN_HERE #include "macros.h" static int diff --git a/tests/uninorm/test-u32-normalize-big.c b/tests/uninorm/test-u32-normalize-big.c index 20282cabc9..0faf680922 100644 --- a/tests/uninorm/test-u32-normalize-big.c +++ b/tests/uninorm/test-u32-normalize-big.c @@ -28,6 +28,7 @@ #include "xalloc.h" #include "unistr.h" +#define NO_MAIN_HERE #include "macros.h" #define ASSERT_WITH_LINE(expr, file, line) \ diff --git a/tests/uninorm/test-u32-normcmp.c b/tests/uninorm/test-u32-normcmp.c index 5052a237eb..84ef09fc32 100644 --- a/tests/uninorm/test-u32-normcmp.c +++ b/tests/uninorm/test-u32-normcmp.c @@ -112,5 +112,5 @@ main () test_ascii (u32_normcmp, UNINORM_NFD); test_nonascii (u32_normcmp); - return 0; + return test_exit_status; } diff --git a/tests/uninorm/test-u32-normcoll.c b/tests/uninorm/test-u32-normcoll.c index e5cce08000..7e7d2666d6 100644 --- a/tests/uninorm/test-u32-normcoll.c +++ b/tests/uninorm/test-u32-normcoll.c @@ -31,5 +31,5 @@ main () on ASCII strings should behave like strcmp as well. */ test_ascii (u32_normcoll, UNINORM_NFC); - return 0; + return test_exit_status; } diff --git a/tests/uninorm/test-u8-nfc.c b/tests/uninorm/test-u8-nfc.c index 1aedcd8551..298b23f77f 100644 --- a/tests/uninorm/test-u8-nfc.c +++ b/tests/uninorm/test-u8-nfc.c @@ -27,6 +27,7 @@ #include #include "unistr.h" +#define NO_MAIN_HERE #include "macros.h" static int diff --git a/tests/uninorm/test-u8-nfd.c b/tests/uninorm/test-u8-nfd.c index a6a5686bb4..b6b121aa2f 100644 --- a/tests/uninorm/test-u8-nfd.c +++ b/tests/uninorm/test-u8-nfd.c @@ -27,6 +27,7 @@ #include #include "unistr.h" +#define NO_MAIN_HERE #include "macros.h" static int diff --git a/tests/uninorm/test-u8-nfkc.c b/tests/uninorm/test-u8-nfkc.c index c2a17839ea..312b132b4d 100644 --- a/tests/uninorm/test-u8-nfkc.c +++ b/tests/uninorm/test-u8-nfkc.c @@ -27,6 +27,7 @@ #include #include "unistr.h" +#define NO_MAIN_HERE #include "macros.h" static int diff --git a/tests/uninorm/test-u8-nfkd.c b/tests/uninorm/test-u8-nfkd.c index 0a70a47747..413179bdf9 100644 --- a/tests/uninorm/test-u8-nfkd.c +++ b/tests/uninorm/test-u8-nfkd.c @@ -27,6 +27,7 @@ #include #include "unistr.h" +#define NO_MAIN_HERE #include "macros.h" static int diff --git a/tests/uninorm/test-u8-normcmp.c b/tests/uninorm/test-u8-normcmp.c index 6b9f68d49c..aee524d1e4 100644 --- a/tests/uninorm/test-u8-normcmp.c +++ b/tests/uninorm/test-u8-normcmp.c @@ -112,5 +112,5 @@ main () test_ascii (u8_normcmp, UNINORM_NFD); test_nonascii (u8_normcmp); - return 0; + return test_exit_status; } diff --git a/tests/uninorm/test-u8-normcoll.c b/tests/uninorm/test-u8-normcoll.c index e8d30949e7..9f7b2f3f45 100644 --- a/tests/uninorm/test-u8-normcoll.c +++ b/tests/uninorm/test-u8-normcoll.c @@ -31,5 +31,5 @@ main () on ASCII strings should behave like strcmp as well. */ test_ascii (u8_normcoll, UNINORM_NFC); - return 0; + return test_exit_status; } diff --git a/tests/uninorm/test-uninorm-filter-nfc.c b/tests/uninorm/test-uninorm-filter-nfc.c index 2e2ca2aaf5..3e28fe4260 100644 --- a/tests/uninorm/test-uninorm-filter-nfc.c +++ b/tests/uninorm/test-uninorm-filter-nfc.c @@ -105,5 +105,5 @@ main () ASSERT (check (decomposed, SIZEOF (decomposed), input, SIZEOF (input)) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u16-asnprintf1.c b/tests/unistdio/test-u16-asnprintf1.c index 67ce490a59..6eac3a3b44 100644 --- a/tests/unistdio/test-u16-asnprintf1.c +++ b/tests/unistdio/test-u16-asnprintf1.c @@ -42,5 +42,5 @@ int main (int argc, char *argv[]) { test_asnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u16-vasnprintf1.c b/tests/unistdio/test-u16-vasnprintf1.c index e39495c9cc..b99656836e 100644 --- a/tests/unistdio/test-u16-vasnprintf1.c +++ b/tests/unistdio/test-u16-vasnprintf1.c @@ -71,5 +71,5 @@ int main (int argc, char *argv[]) { test_vasnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u16-vasnprintf2.c b/tests/unistdio/test-u16-vasnprintf2.c index aee6758482..c0da1e00cf 100644 --- a/tests/unistdio/test-u16-vasnprintf2.c +++ b/tests/unistdio/test-u16-vasnprintf2.c @@ -115,5 +115,5 @@ main (int argc, char *argv[]) return 1; test_vasnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u16-vasnprintf3.c b/tests/unistdio/test-u16-vasnprintf3.c index 0efe198420..f1156791bc 100644 --- a/tests/unistdio/test-u16-vasnprintf3.c +++ b/tests/unistdio/test-u16-vasnprintf3.c @@ -115,5 +115,5 @@ main (int argc, char *argv[]) return 1; test_vasnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u16-vasprintf1.c b/tests/unistdio/test-u16-vasprintf1.c index 203d2edf93..43cc6e2246 100644 --- a/tests/unistdio/test-u16-vasprintf1.c +++ b/tests/unistdio/test-u16-vasprintf1.c @@ -58,5 +58,5 @@ int main (int argc, char *argv[]) { test_vasprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u16-vsnprintf1.c b/tests/unistdio/test-u16-vsnprintf1.c index 6859468a01..9cf40eac02 100644 --- a/tests/unistdio/test-u16-vsnprintf1.c +++ b/tests/unistdio/test-u16-vsnprintf1.c @@ -64,5 +64,5 @@ main (int argc, char *argv[]) { test_vsnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u16-vsprintf1.c b/tests/unistdio/test-u16-vsprintf1.c index b39a30564a..63f68a7912 100644 --- a/tests/unistdio/test-u16-vsprintf1.c +++ b/tests/unistdio/test-u16-vsprintf1.c @@ -64,5 +64,5 @@ main (int argc, char *argv[]) { test_vsprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u32-asnprintf1.c b/tests/unistdio/test-u32-asnprintf1.c index 5a16094bc7..428460fe41 100644 --- a/tests/unistdio/test-u32-asnprintf1.c +++ b/tests/unistdio/test-u32-asnprintf1.c @@ -42,5 +42,5 @@ int main (int argc, char *argv[]) { test_asnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u32-vasnprintf1.c b/tests/unistdio/test-u32-vasnprintf1.c index 43c115cf4e..7392294a17 100644 --- a/tests/unistdio/test-u32-vasnprintf1.c +++ b/tests/unistdio/test-u32-vasnprintf1.c @@ -71,5 +71,5 @@ int main (int argc, char *argv[]) { test_vasnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u32-vasnprintf2.c b/tests/unistdio/test-u32-vasnprintf2.c index 1ddab53f7f..64c91f0c46 100644 --- a/tests/unistdio/test-u32-vasnprintf2.c +++ b/tests/unistdio/test-u32-vasnprintf2.c @@ -115,5 +115,5 @@ main (int argc, char *argv[]) return 1; test_vasnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u32-vasnprintf3.c b/tests/unistdio/test-u32-vasnprintf3.c index cfc4674cd3..9e4eb11f92 100644 --- a/tests/unistdio/test-u32-vasnprintf3.c +++ b/tests/unistdio/test-u32-vasnprintf3.c @@ -115,5 +115,5 @@ main (int argc, char *argv[]) return 1; test_vasnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u32-vasprintf1.c b/tests/unistdio/test-u32-vasprintf1.c index 3ab5e89c32..d462472544 100644 --- a/tests/unistdio/test-u32-vasprintf1.c +++ b/tests/unistdio/test-u32-vasprintf1.c @@ -58,5 +58,5 @@ int main (int argc, char *argv[]) { test_vasprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u32-vsnprintf1.c b/tests/unistdio/test-u32-vsnprintf1.c index fa38f8db28..bb73ca80ba 100644 --- a/tests/unistdio/test-u32-vsnprintf1.c +++ b/tests/unistdio/test-u32-vsnprintf1.c @@ -64,5 +64,5 @@ main (int argc, char *argv[]) { test_vsnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u32-vsprintf1.c b/tests/unistdio/test-u32-vsprintf1.c index c857ca71cf..ae2ff722e4 100644 --- a/tests/unistdio/test-u32-vsprintf1.c +++ b/tests/unistdio/test-u32-vsprintf1.c @@ -64,5 +64,5 @@ main (int argc, char *argv[]) { test_vsprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u8-asnprintf1.c b/tests/unistdio/test-u8-asnprintf1.c index d5d256aa6f..2a8c9ce4f1 100644 --- a/tests/unistdio/test-u8-asnprintf1.c +++ b/tests/unistdio/test-u8-asnprintf1.c @@ -42,5 +42,5 @@ int main (int argc, char *argv[]) { test_asnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u8-vasnprintf1.c b/tests/unistdio/test-u8-vasnprintf1.c index 895faa93cf..b808b186cf 100644 --- a/tests/unistdio/test-u8-vasnprintf1.c +++ b/tests/unistdio/test-u8-vasnprintf1.c @@ -71,5 +71,5 @@ int main (int argc, char *argv[]) { test_vasnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u8-vasnprintf2.c b/tests/unistdio/test-u8-vasnprintf2.c index 30289688a0..aa11e47437 100644 --- a/tests/unistdio/test-u8-vasnprintf2.c +++ b/tests/unistdio/test-u8-vasnprintf2.c @@ -105,5 +105,5 @@ main (int argc, char *argv[]) return 1; test_vasnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u8-vasnprintf3.c b/tests/unistdio/test-u8-vasnprintf3.c index b5dc9ab6ff..98b851aa27 100644 --- a/tests/unistdio/test-u8-vasnprintf3.c +++ b/tests/unistdio/test-u8-vasnprintf3.c @@ -105,5 +105,5 @@ main (int argc, char *argv[]) return 1; test_vasnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u8-vasprintf1.c b/tests/unistdio/test-u8-vasprintf1.c index 611f139564..245122767d 100644 --- a/tests/unistdio/test-u8-vasprintf1.c +++ b/tests/unistdio/test-u8-vasprintf1.c @@ -58,5 +58,5 @@ int main (int argc, char *argv[]) { test_vasprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u8-vsnprintf1.c b/tests/unistdio/test-u8-vsnprintf1.c index 5de57fb1f2..7cd55288a0 100644 --- a/tests/unistdio/test-u8-vsnprintf1.c +++ b/tests/unistdio/test-u8-vsnprintf1.c @@ -64,5 +64,5 @@ main (int argc, char *argv[]) { test_vsnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-u8-vsprintf1.c b/tests/unistdio/test-u8-vsprintf1.c index 542cce323f..3300677fdb 100644 --- a/tests/unistdio/test-u8-vsprintf1.c +++ b/tests/unistdio/test-u8-vsprintf1.c @@ -64,5 +64,5 @@ main (int argc, char *argv[]) { test_vsprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-ulc-asnprintf1.c b/tests/unistdio/test-ulc-asnprintf1.c index 236cd3b236..ced342e365 100644 --- a/tests/unistdio/test-ulc-asnprintf1.c +++ b/tests/unistdio/test-ulc-asnprintf1.c @@ -40,5 +40,5 @@ int main (int argc, char *argv[]) { test_asnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-ulc-vasnprintf1.c b/tests/unistdio/test-ulc-vasnprintf1.c index d0d6f8583c..83557dbb4c 100644 --- a/tests/unistdio/test-ulc-vasnprintf1.c +++ b/tests/unistdio/test-ulc-vasnprintf1.c @@ -69,5 +69,5 @@ int main (int argc, char *argv[]) { test_vasnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-ulc-vasnprintf2.c b/tests/unistdio/test-ulc-vasnprintf2.c index 458ce4aa54..1904aa76f1 100644 --- a/tests/unistdio/test-ulc-vasnprintf2.c +++ b/tests/unistdio/test-ulc-vasnprintf2.c @@ -242,5 +242,5 @@ main (int argc, char *argv[]) return 1; test_vasnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-ulc-vasnprintf3.c b/tests/unistdio/test-ulc-vasnprintf3.c index 717e985067..12ef2bfc66 100644 --- a/tests/unistdio/test-ulc-vasnprintf3.c +++ b/tests/unistdio/test-ulc-vasnprintf3.c @@ -230,5 +230,5 @@ main (int argc, char *argv[]) return 1; test_vasnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-ulc-vasprintf1.c b/tests/unistdio/test-ulc-vasprintf1.c index c97909cce7..b91376ca15 100644 --- a/tests/unistdio/test-ulc-vasprintf1.c +++ b/tests/unistdio/test-ulc-vasprintf1.c @@ -56,5 +56,5 @@ int main (int argc, char *argv[]) { test_vasprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-ulc-vsnprintf1.c b/tests/unistdio/test-ulc-vsnprintf1.c index 899ad10b65..2c1e38d72c 100644 --- a/tests/unistdio/test-ulc-vsnprintf1.c +++ b/tests/unistdio/test-ulc-vsnprintf1.c @@ -57,5 +57,5 @@ main (int argc, char *argv[]) { test_vsnprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistdio/test-ulc-vsprintf1.c b/tests/unistdio/test-ulc-vsprintf1.c index 123397d7ab..1e3633a5d5 100644 --- a/tests/unistdio/test-ulc-vsprintf1.c +++ b/tests/unistdio/test-ulc-vsprintf1.c @@ -57,5 +57,5 @@ main (int argc, char *argv[]) { test_vsprintf (); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-chr.h b/tests/unistr/test-chr.h index f7bfc2baab..b5fe4adbcf 100644 --- a/tests/unistr/test-chr.h +++ b/tests/unistr/test-chr.h @@ -138,5 +138,5 @@ main (void) if (sizeof (UNIT) != sizeof (uint32_t)) free (input32); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-cmp2.h b/tests/unistr/test-cmp2.h index 3b9f756809..d054790484 100644 --- a/tests/unistr/test-cmp2.h +++ b/tests/unistr/test-cmp2.h @@ -52,5 +52,5 @@ main () ASSERT (U_CMP2 (input2, 4, input1, 5) > 0); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-cpy-alloc.h b/tests/unistr/test-cpy-alloc.h index 37b0735015..c380101d24 100644 --- a/tests/unistr/test-cpy-alloc.h +++ b/tests/unistr/test-cpy-alloc.h @@ -37,5 +37,5 @@ main () } } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-cpy.h b/tests/unistr/test-cpy.h index 05f1f5a88c..2dc66fa8eb 100644 --- a/tests/unistr/test-cpy.h +++ b/tests/unistr/test-cpy.h @@ -40,5 +40,5 @@ main () } } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-move.h b/tests/unistr/test-move.h index 8078493738..74acb9a64c 100644 --- a/tests/unistr/test-move.h +++ b/tests/unistr/test-move.h @@ -148,5 +148,5 @@ main () } } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-pcpy.h b/tests/unistr/test-pcpy.h index 92ae0d0ebe..a1572803be 100644 --- a/tests/unistr/test-pcpy.h +++ b/tests/unistr/test-pcpy.h @@ -40,5 +40,5 @@ main () } } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-set.h b/tests/unistr/test-set.h index c196667518..ca59422a07 100644 --- a/tests/unistr/test-set.h +++ b/tests/unistr/test-set.h @@ -40,5 +40,5 @@ main () #undef NMAX } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-stpcpy.h b/tests/unistr/test-stpcpy.h index e3fe8e5b49..a9d6031d4f 100644 --- a/tests/unistr/test-stpcpy.h +++ b/tests/unistr/test-stpcpy.h @@ -43,5 +43,5 @@ main () } } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-strcat.h b/tests/unistr/test-strcat.h index 12440c43d6..8faeb0c8d5 100644 --- a/tests/unistr/test-strcat.h +++ b/tests/unistr/test-strcat.h @@ -52,5 +52,5 @@ main () } } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-strcpy.h b/tests/unistr/test-strcpy.h index 9ff1f99222..6dffdace92 100644 --- a/tests/unistr/test-strcpy.h +++ b/tests/unistr/test-strcpy.h @@ -43,5 +43,5 @@ main () } } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-strdup.h b/tests/unistr/test-strdup.h index af19c4d6fe..ccc8b82498 100644 --- a/tests/unistr/test-strdup.h +++ b/tests/unistr/test-strdup.h @@ -37,5 +37,5 @@ main () } } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-check.c b/tests/unistr/test-u16-check.c index 0d83d6ac61..3573938d73 100644 --- a/tests/unistr/test-u16-check.c +++ b/tests/unistr/test-u16-check.c @@ -62,5 +62,5 @@ main () ASSERT (u16_check (input, SIZEOF (input)) == input + 2); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-cmp.c b/tests/unistr/test-u16-cmp.c index 03d6b4cddf..075c8c456b 100644 --- a/tests/unistr/test-u16-cmp.c +++ b/tests/unistr/test-u16-cmp.c @@ -43,5 +43,5 @@ main () ASSERT (U_CMP (input2, input1, 1) < 0); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-mblen.c b/tests/unistr/test-u16-mblen.c index a81a79a38f..d67980eaf4 100644 --- a/tests/unistr/test-u16-mblen.c +++ b/tests/unistr/test-u16-mblen.c @@ -80,5 +80,5 @@ main () ASSERT (ret == -1); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-mbsnlen.c b/tests/unistr/test-u16-mbsnlen.c index f3a249f9e2..76c479a149 100644 --- a/tests/unistr/test-u16-mbsnlen.c +++ b/tests/unistr/test-u16-mbsnlen.c @@ -64,5 +64,5 @@ main () } } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-mbtouc-unsafe.c b/tests/unistr/test-u16-mbtouc-unsafe.c index 7fd02f275e..da6a9057f3 100644 --- a/tests/unistr/test-u16-mbtouc-unsafe.c +++ b/tests/unistr/test-u16-mbtouc-unsafe.c @@ -29,5 +29,5 @@ main () { test_function (u16_mbtouc_unsafe); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-mbtouc.c b/tests/unistr/test-u16-mbtouc.c index b7a3e47cea..21a3918ae6 100644 --- a/tests/unistr/test-u16-mbtouc.c +++ b/tests/unistr/test-u16-mbtouc.c @@ -29,5 +29,5 @@ main () { test_function (u16_mbtouc); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-mbtoucr.c b/tests/unistr/test-u16-mbtoucr.c index 167a77e069..593ddb1111 100644 --- a/tests/unistr/test-u16-mbtoucr.c +++ b/tests/unistr/test-u16-mbtoucr.c @@ -86,5 +86,5 @@ main () ASSERT (uc == 0xFFFD); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-next.c b/tests/unistr/test-u16-next.c index 4d116e2582..57dcfa5830 100644 --- a/tests/unistr/test-u16-next.c +++ b/tests/unistr/test-u16-next.c @@ -87,5 +87,5 @@ main () ASSERT (uc == 0xFFFD); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-prev.c b/tests/unistr/test-u16-prev.c index bf05ea052b..11b3a1a441 100644 --- a/tests/unistr/test-u16-prev.c +++ b/tests/unistr/test-u16-prev.c @@ -169,5 +169,5 @@ main () ASSERT (check_invalid (input, SIZEOF (input)) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-stpncpy.c b/tests/unistr/test-u16-stpncpy.c index 35dd20d55a..1986fae30b 100644 --- a/tests/unistr/test-u16-stpncpy.c +++ b/tests/unistr/test-u16-stpncpy.c @@ -55,5 +55,5 @@ main () check (input, SIZEOF (input)); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-strchr.c b/tests/unistr/test-u16-strchr.c index e23df8c248..5047b7a5f0 100644 --- a/tests/unistr/test-u16-strchr.c +++ b/tests/unistr/test-u16-strchr.c @@ -38,5 +38,5 @@ main (void) { test_strchr (); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-strcmp.c b/tests/unistr/test-u16-strcmp.c index 4ee85078b9..d4b6311f62 100644 --- a/tests/unistr/test-u16-strcmp.c +++ b/tests/unistr/test-u16-strcmp.c @@ -30,5 +30,5 @@ main () { test_u16_strcmp (); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-strcoll.c b/tests/unistr/test-u16-strcoll.c index b49f4b66cf..5e3d6940fb 100644 --- a/tests/unistr/test-u16-strcoll.c +++ b/tests/unistr/test-u16-strcoll.c @@ -37,5 +37,5 @@ main () test_u16_strcmp (); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-strlen.c b/tests/unistr/test-u16-strlen.c index e9348b8177..8c7ca8583d 100644 --- a/tests/unistr/test-u16-strlen.c +++ b/tests/unistr/test-u16-strlen.c @@ -53,5 +53,5 @@ main () ASSERT (u16_strlen (input) == SIZEOF (input) - 1); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-strmblen.c b/tests/unistr/test-u16-strmblen.c index 88dd0f2767..c9f28096f6 100644 --- a/tests/unistr/test-u16-strmblen.c +++ b/tests/unistr/test-u16-strmblen.c @@ -74,5 +74,5 @@ main () ASSERT (ret == -1); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-strmbtouc.c b/tests/unistr/test-u16-strmbtouc.c index c4c76ca5c2..3fef03249f 100644 --- a/tests/unistr/test-u16-strmbtouc.c +++ b/tests/unistr/test-u16-strmbtouc.c @@ -87,5 +87,5 @@ main () ASSERT (uc == 0xBADFACE); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-strncat.c b/tests/unistr/test-u16-strncat.c index 6079cb71df..e69c314eac 100644 --- a/tests/unistr/test-u16-strncat.c +++ b/tests/unistr/test-u16-strncat.c @@ -55,5 +55,5 @@ main () check (input, SIZEOF (input)); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-strncmp.c b/tests/unistr/test-u16-strncmp.c index 45bc9fab1f..1424c02b28 100644 --- a/tests/unistr/test-u16-strncmp.c +++ b/tests/unistr/test-u16-strncmp.c @@ -43,5 +43,5 @@ main () ASSERT (U_STRNCMP (input2, input1, 1000000) < 0); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-strncpy.c b/tests/unistr/test-u16-strncpy.c index 837dac9c2e..4ac462d183 100644 --- a/tests/unistr/test-u16-strncpy.c +++ b/tests/unistr/test-u16-strncpy.c @@ -55,5 +55,5 @@ main () check (input, SIZEOF (input)); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-strnlen.c b/tests/unistr/test-u16-strnlen.c index 48604fee7c..cb4bcf3d1c 100644 --- a/tests/unistr/test-u16-strnlen.c +++ b/tests/unistr/test-u16-strnlen.c @@ -52,5 +52,5 @@ main () check (input, SIZEOF (input)); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-strstr.c b/tests/unistr/test-u16-strstr.c index 3ba2da2759..d74cddc070 100644 --- a/tests/unistr/test-u16-strstr.c +++ b/tests/unistr/test-u16-strstr.c @@ -45,5 +45,5 @@ main (void) test_u_strstr (); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-strtok.c b/tests/unistr/test-u16-strtok.c index ef9ffbb5b2..be09783dee 100644 --- a/tests/unistr/test-u16-strtok.c +++ b/tests/unistr/test-u16-strtok.c @@ -33,5 +33,5 @@ main (void) { test_u_strtok (); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-to-u32.c b/tests/unistr/test-u16-to-u32.c index 5b34045113..f00a913b47 100644 --- a/tests/unistr/test-u16-to-u32.c +++ b/tests/unistr/test-u16-to-u32.c @@ -152,5 +152,5 @@ main () #endif } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-to-u8.c b/tests/unistr/test-u16-to-u8.c index 71b9a02e90..919777335b 100644 --- a/tests/unistr/test-u16-to-u8.c +++ b/tests/unistr/test-u16-to-u8.c @@ -155,5 +155,5 @@ main () #endif } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u16-uctomb.c b/tests/unistr/test-u16-uctomb.c index 14338d6324..03b9eaa8c0 100644 --- a/tests/unistr/test-u16-uctomb.c +++ b/tests/unistr/test-u16-uctomb.c @@ -106,5 +106,5 @@ main () } } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-check.c b/tests/unistr/test-u32-check.c index fab64b235e..b64b8ed713 100644 --- a/tests/unistr/test-u32-check.c +++ b/tests/unistr/test-u32-check.c @@ -62,5 +62,5 @@ main () ASSERT (u32_check (input, SIZEOF (input)) == input + 2); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-cmp.c b/tests/unistr/test-u32-cmp.c index 57579eda77..f866ab04a3 100644 --- a/tests/unistr/test-u32-cmp.c +++ b/tests/unistr/test-u32-cmp.c @@ -41,5 +41,5 @@ main () ASSERT (U_CMP (input2, input1, 1) < 0); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-mblen.c b/tests/unistr/test-u32-mblen.c index 5e8e0e290c..513e2607f3 100644 --- a/tests/unistr/test-u32-mblen.c +++ b/tests/unistr/test-u32-mblen.c @@ -75,5 +75,5 @@ main () ASSERT (ret == -1); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-mbsnlen.c b/tests/unistr/test-u32-mbsnlen.c index e8f5c5daed..ed72229c91 100644 --- a/tests/unistr/test-u32-mbsnlen.c +++ b/tests/unistr/test-u32-mbsnlen.c @@ -25,7 +25,6 @@ int main () { - /* Simple string. */ { /* "Grüß Gott. Здравствуйте! x=(-b±sqrt(b²-4ac))/(2a) 日本語,中文,한글" */ static const uint32_t input[] = @@ -59,5 +58,6 @@ main () ASSERT (len == n); } } - return 0; + + return test_exit_status; } diff --git a/tests/unistr/test-u32-mbtouc-unsafe.c b/tests/unistr/test-u32-mbtouc-unsafe.c index 111768dbf1..25c9eafc03 100644 --- a/tests/unistr/test-u32-mbtouc-unsafe.c +++ b/tests/unistr/test-u32-mbtouc-unsafe.c @@ -29,5 +29,5 @@ main () { test_function (u32_mbtouc_unsafe); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-mbtouc.c b/tests/unistr/test-u32-mbtouc.c index 0804d8e414..63bc20d4d4 100644 --- a/tests/unistr/test-u32-mbtouc.c +++ b/tests/unistr/test-u32-mbtouc.c @@ -29,5 +29,5 @@ main () { test_function (u32_mbtouc); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-mbtoucr.c b/tests/unistr/test-u32-mbtoucr.c index 7d74a87a45..4267fe1e6d 100644 --- a/tests/unistr/test-u32-mbtoucr.c +++ b/tests/unistr/test-u32-mbtoucr.c @@ -79,5 +79,5 @@ main () ASSERT (uc == 0xFFFD); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-next.c b/tests/unistr/test-u32-next.c index 320d520ee3..ee3811f4d5 100644 --- a/tests/unistr/test-u32-next.c +++ b/tests/unistr/test-u32-next.c @@ -80,5 +80,5 @@ main () ASSERT (uc == 0xFFFD); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-prev.c b/tests/unistr/test-u32-prev.c index 7e648dd15c..d04b24aa8f 100644 --- a/tests/unistr/test-u32-prev.c +++ b/tests/unistr/test-u32-prev.c @@ -127,5 +127,5 @@ main () ASSERT (check_invalid (input, SIZEOF (input)) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-stpncpy.c b/tests/unistr/test-u32-stpncpy.c index a417fe0c7a..37d8abacad 100644 --- a/tests/unistr/test-u32-stpncpy.c +++ b/tests/unistr/test-u32-stpncpy.c @@ -55,5 +55,5 @@ main () check (input, SIZEOF (input)); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-strchr.c b/tests/unistr/test-u32-strchr.c index 075d1d669b..721f8903ba 100644 --- a/tests/unistr/test-u32-strchr.c +++ b/tests/unistr/test-u32-strchr.c @@ -38,5 +38,5 @@ main (void) { test_strchr (); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-strcmp.c b/tests/unistr/test-u32-strcmp.c index 71fd0b1e1f..ef9f319dc4 100644 --- a/tests/unistr/test-u32-strcmp.c +++ b/tests/unistr/test-u32-strcmp.c @@ -30,5 +30,5 @@ main () { test_u32_strcmp (); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-strcoll.c b/tests/unistr/test-u32-strcoll.c index bd3180e123..6f9f31d780 100644 --- a/tests/unistr/test-u32-strcoll.c +++ b/tests/unistr/test-u32-strcoll.c @@ -37,5 +37,5 @@ main () test_u32_strcmp (); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-strlen.c b/tests/unistr/test-u32-strlen.c index 6186fbdb65..d06ab615a5 100644 --- a/tests/unistr/test-u32-strlen.c +++ b/tests/unistr/test-u32-strlen.c @@ -53,5 +53,5 @@ main () ASSERT (u32_strlen (input) == SIZEOF (input) - 1); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-strmblen.c b/tests/unistr/test-u32-strmblen.c index 62a5a0b04d..8dfdf64f48 100644 --- a/tests/unistr/test-u32-strmblen.c +++ b/tests/unistr/test-u32-strmblen.c @@ -69,5 +69,5 @@ main () ASSERT (ret == -1); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-strmbtouc.c b/tests/unistr/test-u32-strmbtouc.c index 1900309839..591684d4c0 100644 --- a/tests/unistr/test-u32-strmbtouc.c +++ b/tests/unistr/test-u32-strmbtouc.c @@ -80,5 +80,5 @@ main () ASSERT (uc == 0xBADFACE); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-strncat.c b/tests/unistr/test-u32-strncat.c index 10b736d354..7a0863ee03 100644 --- a/tests/unistr/test-u32-strncat.c +++ b/tests/unistr/test-u32-strncat.c @@ -55,5 +55,5 @@ main () check (input, SIZEOF (input)); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-strncmp.c b/tests/unistr/test-u32-strncmp.c index e304a595d5..ba563debdc 100644 --- a/tests/unistr/test-u32-strncmp.c +++ b/tests/unistr/test-u32-strncmp.c @@ -43,5 +43,5 @@ main () ASSERT (U_STRNCMP (input2, input1, 1000000) < 0); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-strncpy.c b/tests/unistr/test-u32-strncpy.c index e78f0b25f1..5bdac73978 100644 --- a/tests/unistr/test-u32-strncpy.c +++ b/tests/unistr/test-u32-strncpy.c @@ -55,5 +55,5 @@ main () check (input, SIZEOF (input)); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-strnlen.c b/tests/unistr/test-u32-strnlen.c index 31b694092b..a800a66dbc 100644 --- a/tests/unistr/test-u32-strnlen.c +++ b/tests/unistr/test-u32-strnlen.c @@ -52,5 +52,5 @@ main () check (input, SIZEOF (input)); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-strstr.c b/tests/unistr/test-u32-strstr.c index 320ccfbe42..672c9cced8 100644 --- a/tests/unistr/test-u32-strstr.c +++ b/tests/unistr/test-u32-strstr.c @@ -45,5 +45,5 @@ main (void) test_u_strstr (); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-strtok.c b/tests/unistr/test-u32-strtok.c index 90aed3d601..b261b85550 100644 --- a/tests/unistr/test-u32-strtok.c +++ b/tests/unistr/test-u32-strtok.c @@ -33,5 +33,5 @@ main (void) { test_u_strtok (); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-to-u16.c b/tests/unistr/test-u32-to-u16.c index fbf1a03a2c..963e0fe757 100644 --- a/tests/unistr/test-u32-to-u16.c +++ b/tests/unistr/test-u32-to-u16.c @@ -152,5 +152,5 @@ main () #endif } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-to-u8.c b/tests/unistr/test-u32-to-u8.c index 831449210c..22691c6d34 100644 --- a/tests/unistr/test-u32-to-u8.c +++ b/tests/unistr/test-u32-to-u8.c @@ -155,5 +155,5 @@ main () #endif } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u32-uctomb.c b/tests/unistr/test-u32-uctomb.c index 913398c8f5..24d8341014 100644 --- a/tests/unistr/test-u32-uctomb.c +++ b/tests/unistr/test-u32-uctomb.c @@ -100,5 +100,5 @@ main () } } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-check.c b/tests/unistr/test-u8-check.c index d05c0fcb70..f3b3fc6112 100644 --- a/tests/unistr/test-u8-check.c +++ b/tests/unistr/test-u8-check.c @@ -184,5 +184,5 @@ main () ASSERT (u8_check (input, sizeof (input) - 1) == input + 4); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-cmp.c b/tests/unistr/test-u8-cmp.c index 47b0f2153e..920edf23e3 100644 --- a/tests/unistr/test-u8-cmp.c +++ b/tests/unistr/test-u8-cmp.c @@ -41,5 +41,5 @@ main () ASSERT (U_CMP (input2, input1, 4) < 0); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-mblen.c b/tests/unistr/test-u8-mblen.c index 69ac7e55cd..3048b4f3fc 100644 --- a/tests/unistr/test-u8-mblen.c +++ b/tests/unistr/test-u8-mblen.c @@ -151,5 +151,5 @@ main () ASSERT (ret == -1); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-mbsnlen.c b/tests/unistr/test-u8-mbsnlen.c index ca31d85695..9793dc31a4 100644 --- a/tests/unistr/test-u8-mbsnlen.c +++ b/tests/unistr/test-u8-mbsnlen.c @@ -140,5 +140,5 @@ main () ASSERT (u8_mbsnlen (input, 5) == 5); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-mbtouc-unsafe.c b/tests/unistr/test-u8-mbtouc-unsafe.c index 8b471ea4b6..a4727a40c5 100644 --- a/tests/unistr/test-u8-mbtouc-unsafe.c +++ b/tests/unistr/test-u8-mbtouc-unsafe.c @@ -29,5 +29,5 @@ main () { test_function (u8_mbtouc_unsafe); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-mbtouc.c b/tests/unistr/test-u8-mbtouc.c index c063c9ab96..f3779b02dd 100644 --- a/tests/unistr/test-u8-mbtouc.c +++ b/tests/unistr/test-u8-mbtouc.c @@ -265,5 +265,5 @@ main () test_function (u8_mbtouc); test_safe_function (u8_mbtouc); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-mbtoucr.c b/tests/unistr/test-u8-mbtoucr.c index 6a4a74a2fd..aae840de4a 100644 --- a/tests/unistr/test-u8-mbtoucr.c +++ b/tests/unistr/test-u8-mbtoucr.c @@ -183,5 +183,5 @@ main () ASSERT (uc == 0xFFFD); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-next.c b/tests/unistr/test-u8-next.c index cdc1f763ba..d46e1fbac6 100644 --- a/tests/unistr/test-u8-next.c +++ b/tests/unistr/test-u8-next.c @@ -184,5 +184,5 @@ main () ASSERT (uc == 0xFFFD); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-prev.c b/tests/unistr/test-u8-prev.c index 5bbb5ce173..418bdaedd4 100644 --- a/tests/unistr/test-u8-prev.c +++ b/tests/unistr/test-u8-prev.c @@ -311,5 +311,5 @@ main () ASSERT (check_invalid (input, SIZEOF (input)) == 0); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-stpncpy.c b/tests/unistr/test-u8-stpncpy.c index 873b1abd0d..c51e218457 100644 --- a/tests/unistr/test-u8-stpncpy.c +++ b/tests/unistr/test-u8-stpncpy.c @@ -48,5 +48,5 @@ main () check (input, SIZEOF (input)); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-strchr.c b/tests/unistr/test-u8-strchr.c index 69e21a6658..e404ea7904 100644 --- a/tests/unistr/test-u8-strchr.c +++ b/tests/unistr/test-u8-strchr.c @@ -145,5 +145,5 @@ main (void) } } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-strcmp.c b/tests/unistr/test-u8-strcmp.c index a0d3d7fc9f..e60b861114 100644 --- a/tests/unistr/test-u8-strcmp.c +++ b/tests/unistr/test-u8-strcmp.c @@ -30,5 +30,5 @@ main () { test_u8_strcmp (); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-strcoll.c b/tests/unistr/test-u8-strcoll.c index b86ea40378..de67daf477 100644 --- a/tests/unistr/test-u8-strcoll.c +++ b/tests/unistr/test-u8-strcoll.c @@ -37,5 +37,5 @@ main () test_u8_strcmp (); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-strlen.c b/tests/unistr/test-u8-strlen.c index a13a24fd3c..02a38b8936 100644 --- a/tests/unistr/test-u8-strlen.c +++ b/tests/unistr/test-u8-strlen.c @@ -46,5 +46,5 @@ main () ASSERT (u8_strlen (input) == SIZEOF (input) - 1); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-strmblen.c b/tests/unistr/test-u8-strmblen.c index 2fdef5cf50..a18637e8d7 100644 --- a/tests/unistr/test-u8-strmblen.c +++ b/tests/unistr/test-u8-strmblen.c @@ -145,5 +145,5 @@ main () ASSERT (ret == -1); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-strmbtouc.c b/tests/unistr/test-u8-strmbtouc.c index a9db79fad9..9eac79f1ff 100644 --- a/tests/unistr/test-u8-strmbtouc.c +++ b/tests/unistr/test-u8-strmbtouc.c @@ -184,5 +184,5 @@ main () ASSERT (uc == 0xBADFACE); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-strncat.c b/tests/unistr/test-u8-strncat.c index 166952a27b..eef95ad4cf 100644 --- a/tests/unistr/test-u8-strncat.c +++ b/tests/unistr/test-u8-strncat.c @@ -48,5 +48,5 @@ main () check (input, SIZEOF (input)); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-strncmp.c b/tests/unistr/test-u8-strncmp.c index 78aac0c941..a45be4adf9 100644 --- a/tests/unistr/test-u8-strncmp.c +++ b/tests/unistr/test-u8-strncmp.c @@ -49,5 +49,5 @@ main () ASSERT (U_STRNCMP (input2, input1, 1000000) < 0); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-strncpy.c b/tests/unistr/test-u8-strncpy.c index 22bb35a48b..f6f9c05d11 100644 --- a/tests/unistr/test-u8-strncpy.c +++ b/tests/unistr/test-u8-strncpy.c @@ -48,5 +48,5 @@ main () check (input, SIZEOF (input)); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-strnlen.c b/tests/unistr/test-u8-strnlen.c index c409fc90df..8d799c5b53 100644 --- a/tests/unistr/test-u8-strnlen.c +++ b/tests/unistr/test-u8-strnlen.c @@ -45,5 +45,5 @@ main () check (input, SIZEOF (input)); } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-strstr.c b/tests/unistr/test-u8-strstr.c index 670a182d0c..12da0fb50b 100644 --- a/tests/unistr/test-u8-strstr.c +++ b/tests/unistr/test-u8-strstr.c @@ -48,5 +48,5 @@ main (void) test_u_strstr (); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-strtok.c b/tests/unistr/test-u8-strtok.c index 8d425c401f..02d4b93d74 100644 --- a/tests/unistr/test-u8-strtok.c +++ b/tests/unistr/test-u8-strtok.c @@ -33,5 +33,5 @@ main (void) { test_u_strtok (); - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-to-u16.c b/tests/unistr/test-u8-to-u16.c index ec104ace15..546ad22176 100644 --- a/tests/unistr/test-u8-to-u16.c +++ b/tests/unistr/test-u8-to-u16.c @@ -154,5 +154,5 @@ main () #endif } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-to-u32.c b/tests/unistr/test-u8-to-u32.c index 5ab9752c46..2180b6bdb8 100644 --- a/tests/unistr/test-u8-to-u32.c +++ b/tests/unistr/test-u8-to-u32.c @@ -154,5 +154,5 @@ main () #endif } - return 0; + return test_exit_status; } diff --git a/tests/unistr/test-u8-uctomb.c b/tests/unistr/test-u8-uctomb.c index 2948eb0951..0d030a7de9 100644 --- a/tests/unistr/test-u8-uctomb.c +++ b/tests/unistr/test-u8-uctomb.c @@ -153,5 +153,5 @@ main () } } - return 0; + return test_exit_status; } diff --git a/tests/uniwbrk/test-u16-wordbreaks.c b/tests/uniwbrk/test-u16-wordbreaks.c index 002668c3b8..601ccb9c7f 100644 --- a/tests/uniwbrk/test-u16-wordbreaks.c +++ b/tests/uniwbrk/test-u16-wordbreaks.c @@ -124,5 +124,5 @@ main () free (p); } - return 0; + return test_exit_status; } diff --git a/tests/uniwbrk/test-u32-wordbreaks.c b/tests/uniwbrk/test-u32-wordbreaks.c index ac9c1e36c1..1d272b7994 100644 --- a/tests/uniwbrk/test-u32-wordbreaks.c +++ b/tests/uniwbrk/test-u32-wordbreaks.c @@ -124,5 +124,5 @@ main () free (p); } - return 0; + return test_exit_status; } diff --git a/tests/uniwbrk/test-u8-wordbreaks.c b/tests/uniwbrk/test-u8-wordbreaks.c index 2aaa0e9223..ecf7ba79c0 100644 --- a/tests/uniwbrk/test-u8-wordbreaks.c +++ b/tests/uniwbrk/test-u8-wordbreaks.c @@ -114,5 +114,5 @@ main () free (p); } - return 0; + return test_exit_status; } diff --git a/tests/uniwbrk/test-ulc-wordbreaks.c b/tests/uniwbrk/test-ulc-wordbreaks.c index bb4b3343ec..b86a195d4e 100644 --- a/tests/uniwbrk/test-ulc-wordbreaks.c +++ b/tests/uniwbrk/test-ulc-wordbreaks.c @@ -58,5 +58,5 @@ main () } #endif - return 0; + return test_exit_status; } diff --git a/tests/uniwidth/test-u16-strwidth.c b/tests/uniwidth/test-u16-strwidth.c index ecf7f1784e..a3c55f3b68 100644 --- a/tests/uniwidth/test-u16-strwidth.c +++ b/tests/uniwidth/test-u16-strwidth.c @@ -54,5 +54,5 @@ main () ASSERT (u16_strwidth (input, "GB2312") == 6); } - return 0; + return test_exit_status; } diff --git a/tests/uniwidth/test-u16-width.c b/tests/uniwidth/test-u16-width.c index 8b25ccf850..609aa9a6ad 100644 --- a/tests/uniwidth/test-u16-width.c +++ b/tests/uniwidth/test-u16-width.c @@ -60,5 +60,5 @@ main () ASSERT (u16_width (input + INPUT4_OFFSET, INPUT4_LENGTH, "GB2312") == 6); } - return 0; + return test_exit_status; } diff --git a/tests/uniwidth/test-u32-strwidth.c b/tests/uniwidth/test-u32-strwidth.c index e3f2d0278d..8101b026cb 100644 --- a/tests/uniwidth/test-u32-strwidth.c +++ b/tests/uniwidth/test-u32-strwidth.c @@ -54,5 +54,5 @@ main () ASSERT (u32_strwidth (input, "GB2312") == 6); } - return 0; + return test_exit_status; } diff --git a/tests/uniwidth/test-u32-width.c b/tests/uniwidth/test-u32-width.c index caa35ca965..a09d087317 100644 --- a/tests/uniwidth/test-u32-width.c +++ b/tests/uniwidth/test-u32-width.c @@ -60,5 +60,5 @@ main () ASSERT (u32_width (input + INPUT4_OFFSET, INPUT4_LENGTH, "GB2312") == 6); } - return 0; + return test_exit_status; } diff --git a/tests/uniwidth/test-u8-strwidth.c b/tests/uniwidth/test-u8-strwidth.c index 8f54953f03..1652516f5f 100644 --- a/tests/uniwidth/test-u8-strwidth.c +++ b/tests/uniwidth/test-u8-strwidth.c @@ -49,5 +49,5 @@ main () ASSERT (u8_strwidth (input, "GB2312") == 6); } - return 0; + return test_exit_status; } diff --git a/tests/uniwidth/test-u8-width.c b/tests/uniwidth/test-u8-width.c index 75ce8e82fb..cb783b797e 100644 --- a/tests/uniwidth/test-u8-width.c +++ b/tests/uniwidth/test-u8-width.c @@ -58,5 +58,5 @@ main () ASSERT (u8_width (input + INPUT4_OFFSET, INPUT4_LENGTH, "GB2312") == 6); } - return 0; + return test_exit_status; } diff --git a/tests/uniwidth/test-uc_width.c b/tests/uniwidth/test-uc_width.c index 5f0e793fa5..23269d3ec0 100644 --- a/tests/uniwidth/test-uc_width.c +++ b/tests/uniwidth/test-uc_width.c @@ -52,5 +52,5 @@ main () ASSERT (uc_width (0x20369, "UTF-8") == 2); ASSERT (uc_width (0x2F876, "UTF-8") == 2); - return 0; + return test_exit_status; } diff --git a/tests/uniwidth/test-uc_width2.c b/tests/uniwidth/test-uc_width2.c index a07a11f81f..26b1809a4b 100644 --- a/tests/uniwidth/test-uc_width2.c +++ b/tests/uniwidth/test-uc_width2.c @@ -82,5 +82,5 @@ main () } finish_interval (); - return 0; + return test_exit_status; }