New upstream version 1.3upstream/1.3upstream

86 files changed, 93 insertions, 90 deletions

diff --git a/tests/unistr/test-chr.h b/tests/unistr/test-chr.h
index f7bfc2ba..b5fe4adb 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 3b9f7568..d0547904 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 37b07350..c380101d 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 05f1f5a8..2dc66fa8 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 80784937..74acb9a6 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 92ae0d0e..a1572803 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 c1966675..ca59422a 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 e3fe8e5b..a9d6031d 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 12440c43..8faeb0c8 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 9ff1f992..6dffdace 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 af19c4d6..ccc8b824 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 0d83d6ac..3573938d 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 03d6b4cd..075c8c45 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 a81a79a3..d67980ea 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 f3a249f9..76c479a1 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 7fd02f27..da6a9057 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 b7a3e47c..21a3918a 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 167a77e0..593ddb11 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 4d116e25..57dcfa58 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 bf05ea05..11b3a1a4 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 35dd20d5..1986fae3 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 e23df8c2..5047b7a5 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 4ee85078..d4b6311f 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 b49f4b66..5e3d6940 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 e9348b81..8c7ca858 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 88dd0f27..c9f28096 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 c4c76ca5..3fef0324 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 6079cb71..e69c314e 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 45bc9fab..1424c02b 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 837dac9c..4ac462d1 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 48604fee..cb4bcf3d 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 4906a96f..d74cddc0 100644
--- a/tests/unistr/test-u16-strstr.c
+++ b/tests/unistr/test-u16-strstr.c
@@ -38,11 +38,12 @@ main (void)
 #if HAVE_DECL_ALARM
   /* Declare failure if test takes too long, by using default abort
      caused by SIGALRM.  */
+  int alarm_value = 50;
   signal (SIGALRM, SIG_DFL);
-  alarm (10);
+  alarm (alarm_value);
 #endif
 
   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 ef9ffbb5..be09783d 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 5b340451..f00a913b 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 71b9a02e..91977733 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 14338d63..03b9eaa8 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 fab64b23..b64b8ed7 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 57579eda..f866ab04 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 5e8e0e29..513e2607 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 e8f5c5da..ed72229c 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 111768db..25c9eafc 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 0804d8e4..63bc20d4 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 7d74a87a..4267fe1e 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 320d520e..ee3811f4 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 7e648dd1..d04b24aa 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 a417fe0c..37d8abac 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 075d1d66..721f8903 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 71fd0b1e..ef9f319d 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 bd3180e1..6f9f31d7 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 6186fbdb..d06ab615 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 62a5a0b0..8dfdf64f 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 19003098..591684d4 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 10b736d3..7a0863ee 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 e304a595..ba563deb 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 e78f0b25..5bdac739 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 31b69409..a800a66d 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 21caa784..672c9cce 100644
--- a/tests/unistr/test-u32-strstr.c
+++ b/tests/unistr/test-u32-strstr.c
@@ -38,11 +38,12 @@ main (void)
 #if HAVE_DECL_ALARM
   /* Declare failure if test takes too long, by using default abort
      caused by SIGALRM.  */
+  int alarm_value = 50;
   signal (SIGALRM, SIG_DFL);
-  alarm (10);
+  alarm (alarm_value);
 #endif
 
   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 90aed3d6..b261b855 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 fbf1a03a..963e0fe7 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 83144921..22691c6d 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 913398c8..24d83410 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 d05c0fcb..f3b3fc61 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 47b0f215..920edf23 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 69ac7e55..3048b4f3 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 ca31d856..9793dc31 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 8b471ea4..a4727a40 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 c063c9ab..f3779b02 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 6a4a74a2..aae840de 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 cdc1f763..d46e1fba 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 5bbb5ce1..418bdaed 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 873b1abd..c51e2184 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 69e21a66..e404ea79 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 a0d3d7fc..e60b8611 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 b86ea403..de67daf4 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 a13a24fd..02a38b89 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 2fdef5cf..a18637e8 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 a9db79fa..9eac79f1 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 166952a2..eef95ad4 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 78aac0c9..a45be4ad 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 22bb35a4..f6f9c05d 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 c409fc90..8d799c5b 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 791e1c97..12da0fb5 100644
--- a/tests/unistr/test-u8-strstr.c
+++ b/tests/unistr/test-u8-strstr.c
@@ -41,11 +41,12 @@ main (void)
      case, we're assuming that we're running this test on the
      same system that we did the check to ensure it has linear
      performance characteristics.  */
+  int alarm_value = 50;
   signal (SIGALRM, SIG_DFL);
-  alarm (5);
+  alarm (alarm_value);
 #endif
 
   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 8d425c40..02d4b93d 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 ec104ace..546ad221 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 5ab9752c..2180b6bd 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 2948eb09..0d030a7d 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;
 }