Remove test string dependence on C library

royhills · Sep 15, 2024 · e9c831a · e9c831a
1 parent d5737c9
commit e9c831a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2024-09-15 Roy Hills <[email protected]>
+
+	* check-error: Change invalid option test string from
+	  "ike-scan: unrecognized option", to "^Usage: ike-scan".
+	  This fixes a test failure on cygwin because it's newlib based C
+	  library outputs "ike-scan: unknown option" instead of
+	  "ike-scan: unrecognized option" that is used by glibc and BSD libc.
+
 2022-10-02 Roy Hills <[email protected]>
 
 	* acinclude.m4: Replaced obsolete autoconf macros AC_TRY_COMPILE with

diff --git a/check-error b/check-error
@@ -119,7 +119,7 @@ if test $? -eq 0; then
    echo "FAILED"
    exit 1
 fi
-grep 'ike-scan: unrecognized option ' $TMPFILE >/dev/null
+grep '^Usage: ike-scan ' $TMPFILE >/dev/null
 if test $? -ne 0; then
    rm -f $TMPFILE
    echo "FAILED"