Avoid test failures on AIX and OSF/1.

diff --git a/ChangeLog b/ChangeLog
index 946f4006aef9543f49291c2f801f2d7b1d38001e..d08ee3ae4d46d93fae6b2595a2a4887f73a80007 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2009-04-06  Bruno Haible  <bruno@clisp.org>
+
+       Avoid test failures on AIX and OSF/1.
+       * tests/unicase/test-u8-casefold.c (check): Account for the possibility
+       that malloc(0) = NULL.
+       * tests/unicase/test-u8-tolower.c (check): Likewise.
+       * tests/unicase/test-u8-totitle.c (check): Likewise.
+       * tests/unicase/test-u8-toupper.c (check): Likewise.
+       * tests/unicase/test-u16-casefold.c (check): Likewise.
+       * tests/unicase/test-u16-tolower.c (check): Likewise.
+       * tests/unicase/test-u16-totitle.c (check): Likewise.
+       * tests/unicase/test-u16-toupper.c (check): Likewise.
+       * tests/unicase/test-u32-casefold.c (check): Likewise.
+       * tests/unicase/test-u32-tolower.c (check): Likewise.
+       * tests/unicase/test-u32-totitle.c (check): Likewise.
+       * tests/unicase/test-u32-toupper.c (check): Likewise.
+       * tests/uninorm/test-u8-nfc.c (check): Likewise.
+       * tests/uninorm/test-u8-nfd.c (check): Likewise.
+       * tests/uninorm/test-u8-nfkc.c (check): Likewise.
+       * tests/uninorm/test-u8-nfkd.c (check): Likewise.
+       * tests/uninorm/test-u16-nfc.c (check): Likewise.
+       * tests/uninorm/test-u16-nfd.c (check): Likewise.
+       * tests/uninorm/test-u16-nfkc.c (check): Likewise.
+       * tests/uninorm/test-u16-nfkd.c (check): Likewise.
+       * tests/uninorm/test-u32-nfc.c (check): Likewise.
+       * tests/uninorm/test-u32-nfd.c (check): Likewise.
+       * tests/uninorm/test-u32-nfkc.c (check): Likewise.
+       * tests/uninorm/test-u32-nfkd.c (check): Likewise.
+
 2009-04-05  Bruno Haible  <bruno@clisp.org>
 
        Work around an autoconf limitation.

diff --git a/tests/unicase/test-u16-casefold.c b/tests/unicase/test-u16-casefold.c
index b7befe04b3ba3e134b06a00fa65fea1ac53c04c5..3f4f633a9b2297e30ab567d0f92ed8fc449a86d9 100644 (file)
--- a/tests/unicase/test-u16-casefold.c
+++ b/tests/unicase/test-u16-casefold.c
@@ -86,7 +86,7 @@ check (const uint16_t *input, size_t input_length,
     result = u16_casefold (input, input_length, iso639_language, nf, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/unicase/test-u16-tolower.c b/tests/unicase/test-u16-tolower.c
index e0bf7408fc80e0592712340a6d0c2594afb2ba27..406e45a70c63c924c65f381f369821df7f0908e1 100644 (file)
--- a/tests/unicase/test-u16-tolower.c
+++ b/tests/unicase/test-u16-tolower.c
@@ -86,7 +86,7 @@ check (const uint16_t *input, size_t input_length,
     result = u16_tolower (input, input_length, iso639_language, nf, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/unicase/test-u16-totitle.c b/tests/unicase/test-u16-totitle.c
index 792cc93fa1577135ecd4bef9e0699d49181987d0..3839c90792930600089b10f7899f80713619adf4 100644 (file)
--- a/tests/unicase/test-u16-totitle.c
+++ b/tests/unicase/test-u16-totitle.c
@@ -86,7 +86,7 @@ check (const uint16_t *input, size_t input_length,
     result = u16_totitle (input, input_length, iso639_language, nf, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/unicase/test-u16-toupper.c b/tests/unicase/test-u16-toupper.c
index e47a0a1521648efdb5c873516a50b6b478e2ba60..ed9fd6b17e0e22db7828e6618043513d2d92d971 100644 (file)
--- a/tests/unicase/test-u16-toupper.c
+++ b/tests/unicase/test-u16-toupper.c
@@ -86,7 +86,7 @@ check (const uint16_t *input, size_t input_length,
     result = u16_toupper (input, input_length, iso639_language, nf, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/unicase/test-u32-casefold.c b/tests/unicase/test-u32-casefold.c
index 1deaf08598e3092a1a64c0bc29fe12d6e4a8b570..d48e8dc88f117e112e086607157800cb515486f3 100644 (file)
--- a/tests/unicase/test-u32-casefold.c
+++ b/tests/unicase/test-u32-casefold.c
@@ -86,7 +86,7 @@ check (const uint32_t *input, size_t input_length,
     result = u32_casefold (input, input_length, iso639_language, nf, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/unicase/test-u32-tolower.c b/tests/unicase/test-u32-tolower.c
index 626d749c46118d03291269c51fbcaa681aa6344e..a4318787b20629ed98fcfc9dd7a73a9631a92fd4 100644 (file)
--- a/tests/unicase/test-u32-tolower.c
+++ b/tests/unicase/test-u32-tolower.c
@@ -86,7 +86,7 @@ check (const uint32_t *input, size_t input_length,
     result = u32_tolower (input, input_length, iso639_language, nf, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/unicase/test-u32-totitle.c b/tests/unicase/test-u32-totitle.c
index 8daae7c096003cc2be4e7f3940aa9ededa4e20fc..82c4b0f199c764098574cfe2ab07116ca6375da1 100644 (file)
--- a/tests/unicase/test-u32-totitle.c
+++ b/tests/unicase/test-u32-totitle.c
@@ -86,7 +86,7 @@ check (const uint32_t *input, size_t input_length,
     result = u32_totitle (input, input_length, iso639_language, nf, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/unicase/test-u32-toupper.c b/tests/unicase/test-u32-toupper.c
index 252013cb1df7e81b68eb0b62366aa9142ffdfba9..dbc1619bcca8c65725cfce4eaaeb63a3b8afcf79 100644 (file)
--- a/tests/unicase/test-u32-toupper.c
+++ b/tests/unicase/test-u32-toupper.c
@@ -86,7 +86,7 @@ check (const uint32_t *input, size_t input_length,
     result = u32_toupper (input, input_length, iso639_language, nf, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/unicase/test-u8-casefold.c b/tests/unicase/test-u8-casefold.c
index 7c5530f70b3ea4a740047f73cc35ef2a62f559de..225b9979df89420739a875cfc5dc28b3797bb52f 100644 (file)
--- a/tests/unicase/test-u8-casefold.c
+++ b/tests/unicase/test-u8-casefold.c
@@ -86,7 +86,7 @@ check (const uint8_t *input, size_t input_length,
     result = u8_casefold (input, input_length, iso639_language, nf, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/unicase/test-u8-tolower.c b/tests/unicase/test-u8-tolower.c
index 4a8c3a9b05b9f2612766666f5841fb54fbcedb4a..1b43a1b7464c45b836c0434e80175592f985f632 100644 (file)
--- a/tests/unicase/test-u8-tolower.c
+++ b/tests/unicase/test-u8-tolower.c
@@ -86,7 +86,7 @@ check (const uint8_t *input, size_t input_length,
     result = u8_tolower (input, input_length, iso639_language, nf, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/unicase/test-u8-totitle.c b/tests/unicase/test-u8-totitle.c
index 540fc27d287cd17ac0b2d1fabf00d15a69954f00..c2506ac5574604ee6342393894d9f6a77ba2ad15 100644 (file)
--- a/tests/unicase/test-u8-totitle.c
+++ b/tests/unicase/test-u8-totitle.c
@@ -86,7 +86,7 @@ check (const uint8_t *input, size_t input_length,
     result = u8_totitle (input, input_length, iso639_language, nf, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/unicase/test-u8-toupper.c b/tests/unicase/test-u8-toupper.c
index 952ecc921c96d4319057c872f6a791e23df1948a..41e536bd04cb8e90b10ff6cc55130a6730049d77 100644 (file)
--- a/tests/unicase/test-u8-toupper.c
+++ b/tests/unicase/test-u8-toupper.c
@@ -86,7 +86,7 @@ check (const uint8_t *input, size_t input_length,
     result = u8_toupper (input, input_length, iso639_language, nf, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/uninorm/test-u16-nfc.c b/tests/uninorm/test-u16-nfc.c
index 70767df5af5b31ad26baa1baa794509c3784236d..1bf9a94d7ee4f3f8a27326902f3852db20597b0f 100644 (file)
--- a/tests/uninorm/test-u16-nfc.c
+++ b/tests/uninorm/test-u16-nfc.c
@@ -88,7 +88,7 @@ check (const uint16_t *input, size_t input_length,
     result = u16_normalize (UNINORM_NFC, input, input_length, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/uninorm/test-u16-nfd.c b/tests/uninorm/test-u16-nfd.c
index 161abd47408255f0c24b58ae532c1b691d95a851..34789b8df51e65c6fc47a720ac266f54ec566871 100644 (file)
--- a/tests/uninorm/test-u16-nfd.c
+++ b/tests/uninorm/test-u16-nfd.c
@@ -88,7 +88,7 @@ check (const uint16_t *input, size_t input_length,
     result = u16_normalize (UNINORM_NFD, input, input_length, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/uninorm/test-u16-nfkc.c b/tests/uninorm/test-u16-nfkc.c
index df648044824cf1311014b37e362d67ff0e1fd002..4ac8f7edfe3b7e6cc2aff6c2a9e74aeb3f0284f4 100644 (file)
--- a/tests/uninorm/test-u16-nfkc.c
+++ b/tests/uninorm/test-u16-nfkc.c
@@ -88,7 +88,7 @@ check (const uint16_t *input, size_t input_length,
     result = u16_normalize (UNINORM_NFKC, input, input_length, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/uninorm/test-u16-nfkd.c b/tests/uninorm/test-u16-nfkd.c
index 587a704ae687dc3731cc7558a59b90486e37ced3..6dfa39f31e0afcc3ff4bce876d7def24da581a12 100644 (file)
--- a/tests/uninorm/test-u16-nfkd.c
+++ b/tests/uninorm/test-u16-nfkd.c
@@ -88,7 +88,7 @@ check (const uint16_t *input, size_t input_length,
     result = u16_normalize (UNINORM_NFKD, input, input_length, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/uninorm/test-u32-nfc.c b/tests/uninorm/test-u32-nfc.c
index 3aafb96a8a6d398f2006058d8ff4f4733967cc11..0d8311cc4f2d5b62ef21e6c5a1dff647c7262519 100644 (file)
--- a/tests/uninorm/test-u32-nfc.c
+++ b/tests/uninorm/test-u32-nfc.c
@@ -88,7 +88,7 @@ check (const uint32_t *input, size_t input_length,
     result = u32_normalize (UNINORM_NFC, input, input_length, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/uninorm/test-u32-nfd.c b/tests/uninorm/test-u32-nfd.c
index 426ad9dd56394dc7f3640bc62e0f84cb379654ec..f7b2d8dfb50a914122ad8576007ccd13ce99d3ac 100644 (file)
--- a/tests/uninorm/test-u32-nfd.c
+++ b/tests/uninorm/test-u32-nfd.c
@@ -88,7 +88,7 @@ check (const uint32_t *input, size_t input_length,
     result = u32_normalize (UNINORM_NFD, input, input_length, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/uninorm/test-u32-nfkc.c b/tests/uninorm/test-u32-nfkc.c
index 831e490a45ab03b5ca7693d10434320b911559af..75f7e8256458edcde4fe1c9e26450dc7a7ca8698 100644 (file)
--- a/tests/uninorm/test-u32-nfkc.c
+++ b/tests/uninorm/test-u32-nfkc.c
@@ -88,7 +88,7 @@ check (const uint32_t *input, size_t input_length,
     result = u32_normalize (UNINORM_NFKC, input, input_length, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/uninorm/test-u32-nfkd.c b/tests/uninorm/test-u32-nfkd.c
index 408c593b0b0b055089a31013ac0c0a01e2a73b03..d3de7f763609be6a4b22819784a5b789d57bf3bc 100644 (file)
--- a/tests/uninorm/test-u32-nfkd.c
+++ b/tests/uninorm/test-u32-nfkd.c
@@ -88,7 +88,7 @@ check (const uint32_t *input, size_t input_length,
     result = u32_normalize (UNINORM_NFKD, input, input_length, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/uninorm/test-u8-nfc.c b/tests/uninorm/test-u8-nfc.c
index 5a86e59f26aa9e982f6c1d979639a6b4e44b7630..52baa68bc96e21ebb0b69757154bfc17b3275b9f 100644 (file)
--- a/tests/uninorm/test-u8-nfc.c
+++ b/tests/uninorm/test-u8-nfc.c
@@ -88,7 +88,7 @@ check (const uint8_t *input, size_t input_length,
     result = u8_normalize (UNINORM_NFC, input, input_length, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/uninorm/test-u8-nfd.c b/tests/uninorm/test-u8-nfd.c
index 2338e8f8f608dd9898eebf6659670628020237ba..d1d840acb96d7e37a4de7ee5de2b07112160bfbd 100644 (file)
--- a/tests/uninorm/test-u8-nfd.c
+++ b/tests/uninorm/test-u8-nfd.c
@@ -88,7 +88,7 @@ check (const uint8_t *input, size_t input_length,
     result = u8_normalize (UNINORM_NFD, input, input_length, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/uninorm/test-u8-nfkc.c b/tests/uninorm/test-u8-nfkc.c
index 1d9f0e1a98a8e62cb83951785d50191bec348f19..0ea463630dea7b413c6bb55dcfefc09e345e041a 100644 (file)
--- a/tests/uninorm/test-u8-nfkc.c
+++ b/tests/uninorm/test-u8-nfkc.c
@@ -88,7 +88,7 @@ check (const uint8_t *input, size_t input_length,
     result = u8_normalize (UNINORM_NFKC, input, input_length, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;

diff --git a/tests/uninorm/test-u8-nfkd.c b/tests/uninorm/test-u8-nfkd.c
index 498f42e4bd2e85af7c6178b62260620ed2c535e9..2d883a057d0ff1548308f36095e369586f590a8d 100644 (file)
--- a/tests/uninorm/test-u8-nfkd.c
+++ b/tests/uninorm/test-u8-nfkd.c
@@ -88,7 +88,7 @@ check (const uint8_t *input, size_t input_length,
     result = u8_normalize (UNINORM_NFKD, input, input_length, preallocated, &length);
     if (!(result != NULL))
       return 8;
-    if (!(result == preallocated))
+    if (!(preallocated == NULL || result == preallocated))
       return 9;
     if (!(length == expected_length))
       return 10;