From: Bruno Haible <bruno@clisp.org>
Date: Mon, 11 Aug 2025 10:04:17 +0000 (+0200)
Subject: nlcanon tests: Fix test failure on Solaris.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b65a8d11a79bd72224deb06cf379bcbbd713fe36;p=thirdparty%2Fgnulib.git

nlcanon tests: Fix test failure on Solaris.

* tests/test-nlcanon.sh: Handle the --no-reexec option (from init.sh).
---

diff --git a/ChangeLog b/ChangeLog
index 7a62d7129b..0a44bca695 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2025-08-11  Bruno Haible  <bruno@clisp.org>
+
+	nlcanon tests: Fix test failure on Solaris.
+	* tests/test-nlcanon.sh: Handle the --no-reexec option (from init.sh).
+
 2025-08-11  Bruno Haible  <bruno@clisp.org>
 
 	nlcanon: Make it work on OpenBSD.
diff --git a/tests/test-nlcanon.sh b/tests/test-nlcanon.sh
index ddcfc1cd9f..9ef2c49c8e 100755
--- a/tests/test-nlcanon.sh
+++ b/tests/test-nlcanon.sh
@@ -1,11 +1,6 @@
 #!/bin/sh
 
-if test $# != 0; then
-  # Callee.
-  printf 'stdout-contents\r\n'
-  printf 'stderr-contents\r\n' 1>&2
-  exit $1
-else
+if test $# = 0 || { test $# = 1 && test "x$1" = "x--no-reexec"; }; then
   # Unit test.
   . "${srcdir=.}/init.sh"; path_prepend_ .
 
@@ -64,4 +59,9 @@ else
   test $? != 0 || Exit 37
 
   Exit 0
+else
+  # Callee.
+  printf 'stdout-contents\r\n'
+  printf 'stderr-contents\r\n' 1>&2
+  exit $1
 fi