test: make invalid-option parsing checks portable across platforms

Author: psumbera

test/tool-option-parsing.py

@@ -7,6 +7,7 @@
 import itertools
 import logging
 import os
+import re
 import resource
 import subprocess
 import sys
@@ -39,6 +40,10 @@
     )
 
 TIMEOUT = 10.0  # seconds
+INVALID_OPTION_ERROR_RE = re.compile(
+    r"(unrecognized|unknown|illegal|invalid) option|usage|try --help",
+    re.IGNORECASE,
+)
 
 # Unset some environment variables, so that testing --enable-environment-names
 # does not actually depend on the current environment.
@@ -242,9 +247,15 @@ def run_command_invalid(
 
     def run_command_unrecognized_option(self, args):
         rc, stdout, stderr = self.run_command(args)
-        assert rc == 2, (rc, stdout, stderr)
+        assert rc != 0, (rc, stdout, stderr)
         assert stdout.startswith("Usage") or stdout == ""
-        assert "unrecognized option" in stderr
+        # getopt/argument parsing diagnostics vary across libc/platforms
+        # (for example GNU/Linux vs. Solaris), even when the option is rejected.
+        assert INVALID_OPTION_ERROR_RE.search(f"{stdout}\n{stderr}"), (
+            rc,
+            stdout,
+            stderr,
+        )
 
     def run_command_missing_arg(self, args):
         rc, stdout, stderr = self.run_command(args)