From: Bruno Haible <bruno@clisp.org>
Date: Tue, 9 Sep 2025 10:49:41 +0000 (+0200)
Subject: tests: Remove support for OSF/1.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c0efc93abbd5399e7431a0a91afa23f804b9833;p=thirdparty%2Fgnulib.git

tests: Remove support for OSF/1.

* tests/test-mbmemcasecmp.h (test_iso_8859_1): Remove code for OSF/1.
* tests/test-nonblocking-pipe.h (PIPE_DATA_BLOCK_SIZE): Likewise.
* tests/test-select.h (test_bad_fd): Likewise.
* tests/test-striconveha.c (main): Likewise.
* tests/uniconv/test-u8-conv-from-enc.c (main): Likewise.
* tests/uniconv/test-u8-strconv-from-enc.c (main): Likewise.
* tests/uniconv/test-u16-conv-from-enc.c (main): Likewise.
* tests/uniconv/test-u16-strconv-from-enc.c (main): Likewise.
* tests/uniconv/test-u32-conv-from-enc.c (main): Likewise.
* tests/uniconv/test-u32-strconv-from-enc.c (main): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 9f711d0ec9..6d5607f850 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2025-09-09  Bruno Haible  <bruno@clisp.org>
 
+	tests: Remove support for OSF/1.
+	* tests/test-mbmemcasecmp.h (test_iso_8859_1): Remove code for OSF/1.
+	* tests/test-nonblocking-pipe.h (PIPE_DATA_BLOCK_SIZE): Likewise.
+	* tests/test-select.h (test_bad_fd): Likewise.
+	* tests/test-striconveha.c (main): Likewise.
+	* tests/uniconv/test-u8-conv-from-enc.c (main): Likewise.
+	* tests/uniconv/test-u8-strconv-from-enc.c (main): Likewise.
+	* tests/uniconv/test-u16-conv-from-enc.c (main): Likewise.
+	* tests/uniconv/test-u16-strconv-from-enc.c (main): Likewise.
+	* tests/uniconv/test-u32-conv-from-enc.c (main): Likewise.
+	* tests/uniconv/test-u32-strconv-from-enc.c (main): Likewise.
+
 	wcsrtombs: Remove support for OSF/1.
 	* m4/wcsrtombs.m4 (gl_WCSRTOMBS_TERMINATION): Remove macro.
 	(gl_FUNC_WCSRTOMBS): Don't invoke it. Don't define
diff --git a/tests/test-mbmemcasecmp.h b/tests/test-mbmemcasecmp.h
index 0d18d75d51..d1e5b174ff 100644
--- a/tests/test-mbmemcasecmp.h
+++ b/tests/test-mbmemcasecmp.h
@@ -73,7 +73,6 @@ test_ascii (int (*my_casecmp) (const char *, size_t, const char *, size_t))
 static void
 test_iso_8859_1 (int (*my_casecmp) (const char *, size_t, const char *, size_t), bool assume_byte_values)
 {
-  #if ! defined __osf__ /* This test fails on OSF/1 5.1.  */
   {
     static const char input1[] = { 'H', 0xF6, 'h', 'l', 'e' };
     static const char input2[] = { 'H', 0xD6, 'h', 'L', 'e' };
@@ -104,7 +103,6 @@ test_iso_8859_1 (int (*my_casecmp) (const char *, size_t, const char *, size_t),
         ASSERT (my_casecmp (input2, SIZEOF (input2), input5, SIZEOF (input5)) > 0);
       }
   }
-  #endif
 
   #if 0 /* This functionality requires ulc_casecmp.  */
   /* Uppercasing can increase the number of Unicode characters.  */
diff --git a/tests/test-nonblocking-pipe.h b/tests/test-nonblocking-pipe.h
index db4e59a31f..7015d91668 100644
--- a/tests/test-nonblocking-pipe.h
+++ b/tests/test-nonblocking-pipe.h
@@ -28,14 +28,13 @@
      AIX                             >= 32769
      HP-UX                           >= 8193
      IRIX                            >= 10241
-     OSF/1                           >= 262145
      Solaris <= 7                    >= 10241
      Solaris >= 8                    >= 20481
      z/OS                            >= 131073
      Cygwin                          >= 65537
      native Windows                  >= 4097 (depends on the _pipe argument)
  */
-#if defined __MVS__ || defined __osf__ || (defined __linux__ && (defined __ia64__ || defined __mips__))
+#if defined __MVS__ || (defined __linux__ && (defined __ia64__ || defined __mips__))
 # define PIPE_DATA_BLOCK_SIZE 270000
 #elif defined __linux__ && defined __sparc
 # define PIPE_DATA_BLOCK_SIZE 140000
diff --git a/tests/test-select.h b/tests/test-select.h
index 3f7142c1f6..7123ef6b4c 100644
--- a/tests/test-select.h
+++ b/tests/test-select.h
@@ -285,8 +285,8 @@ do_select_bad_fd_nowait (int fd, int ev, select_fn my_select)
 static void
 test_bad_fd (select_fn my_select)
 {
-  /* This tests fails on OSF/1 and native Windows, even with fd = 16.  */
-#if !(defined __osf__ || defined WINDOWS_NATIVE)
+  /* This tests fails on native Windows, even with fd = 16.  */
+#if !defined WINDOWS_NATIVE
   int fd;
 
   /* On Linux, Mac OS X, *BSD, values of fd like 99 or 399 are discarded
diff --git a/tests/test-striconveha.c b/tests/test-striconveha.c
index 49f42e8779..d32ed7223b 100644
--- a/tests/test-striconveha.c
+++ b/tests/test-striconveha.c
@@ -309,7 +309,7 @@ main ()
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
 # if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \
-     || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun)
+     || !(defined _AIX || defined __sgi || defined __hpux || defined __sun)
   if (iconv_supports_encoding ("ISO-2022-JP-2"))
     {
       /* Test conversions from autodetect_jp to UTF-8.  */
@@ -549,7 +549,7 @@ main ()
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
 # if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \
-     || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun)
+     || !(defined _AIX || defined __sgi || defined __hpux || defined __sun)
   if (iconv_supports_encoding ("ISO-2022-JP-2"))
     {
       /* Test conversions from autodetect_jp to UTF-8.  */
diff --git a/tests/uniconv/test-u16-conv-from-enc.c b/tests/uniconv/test-u16-conv-from-enc.c
index 7465531ce9..9a6db116be 100644
--- a/tests/uniconv/test-u16-conv-from-enc.c
+++ b/tests/uniconv/test-u16-conv-from-enc.c
@@ -118,7 +118,7 @@ main ()
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
 # if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \
-     || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun)
+     || !(defined _AIX || defined __sgi || defined __hpux || defined __sun)
   if (iconv_supports_encoding ("ISO-2022-JP-2"))
     {
       /* Test conversions from autodetect_jp to UTF-16.  */
diff --git a/tests/uniconv/test-u16-strconv-from-enc.c b/tests/uniconv/test-u16-strconv-from-enc.c
index 214f55e8be..7481f48621 100644
--- a/tests/uniconv/test-u16-strconv-from-enc.c
+++ b/tests/uniconv/test-u16-strconv-from-enc.c
@@ -72,7 +72,7 @@ main ()
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
 # if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \
-     || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun)
+     || !(defined _AIX || defined __sgi || defined __hpux || defined __sun)
   if (iconv_supports_encoding ("ISO-2022-JP-2"))
     {
       /* Test conversions from autodetect_jp to UTF-16.  */
diff --git a/tests/uniconv/test-u32-conv-from-enc.c b/tests/uniconv/test-u32-conv-from-enc.c
index 7465ce8f52..53c1618640 100644
--- a/tests/uniconv/test-u32-conv-from-enc.c
+++ b/tests/uniconv/test-u32-conv-from-enc.c
@@ -118,7 +118,7 @@ main ()
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
 # if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \
-     || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun)
+     || !(defined _AIX || defined __sgi || defined __hpux || defined __sun)
   if (iconv_supports_encoding ("ISO-2022-JP-2"))
     {
       /* Test conversions from autodetect_jp to UTF-16.  */
diff --git a/tests/uniconv/test-u32-strconv-from-enc.c b/tests/uniconv/test-u32-strconv-from-enc.c
index d6409c608c..7c50029d95 100644
--- a/tests/uniconv/test-u32-strconv-from-enc.c
+++ b/tests/uniconv/test-u32-strconv-from-enc.c
@@ -72,7 +72,7 @@ main ()
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
 # if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \
-     || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun)
+     || !(defined _AIX || defined __sgi || defined __hpux || defined __sun)
   if (iconv_supports_encoding ("ISO-2022-JP-2"))
     {
       /* Test conversions from autodetect_jp to UTF-16.  */
diff --git a/tests/uniconv/test-u8-conv-from-enc.c b/tests/uniconv/test-u8-conv-from-enc.c
index 9b676a0389..53bf0cf9c9 100644
--- a/tests/uniconv/test-u8-conv-from-enc.c
+++ b/tests/uniconv/test-u8-conv-from-enc.c
@@ -113,7 +113,7 @@ main ()
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
 # if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \
-     || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun)
+     || !(defined _AIX || defined __sgi || defined __hpux || defined __sun)
   if (iconv_supports_encoding ("ISO-2022-JP-2"))
     {
       /* Test conversions from autodetect_jp to UTF-8.  */
diff --git a/tests/uniconv/test-u8-strconv-from-enc.c b/tests/uniconv/test-u8-strconv-from-enc.c
index 610681c6d0..b118bd6f0e 100644
--- a/tests/uniconv/test-u8-strconv-from-enc.c
+++ b/tests/uniconv/test-u8-strconv-from-enc.c
@@ -63,7 +63,7 @@ main ()
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
 # if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \
-     || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun)
+     || !(defined _AIX || defined __sgi || defined __hpux || defined __sun)
   if (iconv_supports_encoding ("ISO-2022-JP-2"))
     {
       /* Test conversions from autodetect_jp to UTF-8.  */