From 1cacbc0d7b672e30b41fd3a422bf274501233339 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Tue, 7 Apr 2009 02:59:43 +0200
Subject: [PATCH] Avoid test failures on AIX and OSF/1.

---
 ChangeLog                         | 29 +++++++++++++++++++++++++++++
 tests/unicase/test-u16-casefold.c |  2 +-
 tests/unicase/test-u16-tolower.c  |  2 +-
 tests/unicase/test-u16-totitle.c  |  2 +-
 tests/unicase/test-u16-toupper.c  |  2 +-
 tests/unicase/test-u32-casefold.c |  2 +-
 tests/unicase/test-u32-tolower.c  |  2 +-
 tests/unicase/test-u32-totitle.c  |  2 +-
 tests/unicase/test-u32-toupper.c  |  2 +-
 tests/unicase/test-u8-casefold.c  |  2 +-
 tests/unicase/test-u8-tolower.c   |  2 +-
 tests/unicase/test-u8-totitle.c   |  2 +-
 tests/unicase/test-u8-toupper.c   |  2 +-
 tests/uninorm/test-u16-nfc.c      |  2 +-
 tests/uninorm/test-u16-nfd.c      |  2 +-
 tests/uninorm/test-u16-nfkc.c     |  2 +-
 tests/uninorm/test-u16-nfkd.c     |  2 +-
 tests/uninorm/test-u32-nfc.c      |  2 +-
 tests/uninorm/test-u32-nfd.c      |  2 +-
 tests/uninorm/test-u32-nfkc.c     |  2 +-
 tests/uninorm/test-u32-nfkd.c     |  2 +-
 tests/uninorm/test-u8-nfc.c       |  2 +-
 tests/uninorm/test-u8-nfd.c       |  2 +-
 tests/uninorm/test-u8-nfkc.c      |  2 +-
 tests/uninorm/test-u8-nfkd.c      |  2 +-
 25 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 946f4006ae..d08ee3ae4d 100644
--- 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 b7befe04b3..3f4f633a9b 100644
--- 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 e0bf7408fc..406e45a70c 100644
--- 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 792cc93fa1..3839c90792 100644
--- 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 e47a0a1521..ed9fd6b17e 100644
--- 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 1deaf08598..d48e8dc88f 100644
--- 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 626d749c46..a4318787b2 100644
--- 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 8daae7c096..82c4b0f199 100644
--- 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 252013cb1d..dbc1619bcc 100644
--- 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 7c5530f70b..225b9979df 100644
--- 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 4a8c3a9b05..1b43a1b746 100644
--- 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 540fc27d28..c2506ac557 100644
--- 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 952ecc921c..41e536bd04 100644
--- 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 70767df5af..1bf9a94d7e 100644
--- 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 161abd4740..34789b8df5 100644
--- 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 df64804482..4ac8f7edfe 100644
--- 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 587a704ae6..6dfa39f31e 100644
--- 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 3aafb96a8a..0d8311cc4f 100644
--- 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 426ad9dd56..f7b2d8dfb5 100644
--- 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 831e490a45..75f7e82564 100644
--- 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 408c593b0b..d3de7f7636 100644
--- 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 5a86e59f26..52baa68bc9 100644
--- 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 2338e8f8f6..d1d840acb9 100644
--- 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 1d9f0e1a98..0ea463630d 100644
--- 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 498f42e4bd..2d883a057d 100644
--- 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;
-- 
2.30.2