Avoid test failures on AIX and OSF/1.

diff --git a/ChangeLog b/ChangeLog
index 946f400..d08ee3a 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 b7befe0..3f4f633 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 e0bf740..406e45a 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 792cc93..3839c90 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 e47a0a1..ed9fd6b 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 1deaf08..d48e8dc 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 626d749..a431878 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 8daae7c..82c4b0f 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 252013c..dbc1619 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 7c5530f..225b997 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 4a8c3a9..1b43a1b 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 540fc27..c2506ac 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 952ecc9..41e536b 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 70767df..1bf9a94 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 161abd4..34789b8 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 df64804..4ac8f7e 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 587a704..6dfa39f 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 3aafb96..0d8311c 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 426ad9d..f7b2d8d 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 831e490..75f7e82 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 408c593..d3de7f7 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 5a86e59..52baa68 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 2338e8f..d1d840a 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 1d9f0e1..0ea4636 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 498f42e..2d883a0 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;