From c95e2e9b567a1c3ca22b2de4fdcdfe4b99ba2a03 Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Wed, 14 Apr 2021 21:13:11 -0500 Subject: [PATCH] Use shell "case" for pattern matching in dejagnu auxiliary launcher --- ChangeLog | 7 +++++++ dejagnu | 8 ++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0050ce9..51b8a3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2021-04-14 Jacob Bachmeyer + + PR47382 + + * dejagnu: Replace use of "expr :" with shell "case" pattern + match to avoid limitations of Solaris 10 expr(1). + 2021-04-08 Jacob Bachmeyer * configure: Regenerate. diff --git a/dejagnu b/dejagnu index 44c8962..9f6ae4b 100755 --- a/dejagnu +++ b/dejagnu @@ -152,9 +152,7 @@ command=`basename "$0" | sed -e 's/^.*-\?dejagnu-\?//'` while expr $# \> 0 > /dev/null do if test -z "${command}" ; then - if expr "$1" : - > /dev/null ; then - break - fi + case $1 in -*) break;; esac command="$1" shift fi @@ -167,9 +165,7 @@ do break 2 fi done - if expr "$1" : - > /dev/null ; then - break - fi + case $1 in -*) break;; esac if test -n "$1" ; then command="${command}-$1" shift -- 2.11.4.GIT