On Wed, Jan 04, 2023 at 01:52:21PM +0100, Thomas Huth wrote:
> On 26/12/2022 19.36, Andrew Jones wrote:
> > On Tue, Dec 20, 2022 at 06:55:08PM +0100, Claudio Imbrenda wrote:
> > > A recent patch broke make standalone. The function find_word is not
> > > available when running make standalone, replace it with a simple grep.
> > >
> > > Reported-by: Nina Schoetterl-Glausch <nsg@xxxxxxxxxxxxx>
> > > Fixes: 743cacf7 ("s390x: don't run migration tests under PV")
> > > Signed-off-by: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx>
> > > ---
> > > scripts/s390x/func.bash | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/scripts/s390x/func.bash b/scripts/s390x/func.bash
> > > index 2a941bbb..6c75e89a 100644
> > > --- a/scripts/s390x/func.bash
> > > +++ b/scripts/s390x/func.bash
> > > @@ -21,7 +21,7 @@ function arch_cmd_s390x()
> > > "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
> > > # run PV test case
> > > - if [ "$ACCEL" = 'tcg' ] || find_word "migration" "$groups"; then
> > > + if [ "$ACCEL" = 'tcg' ] || grep -q "migration" <<< "$groups"; then
> >
> > What about the '-F' that find_word has?
>
> "migration" is only one string without regular expressions in it, so I
> assume the -F does not matter here, does it?
You're right. I got carried away at checking equivalence.
Thanks,
drew
