Re: [kvm-unit-tests PATCH] scripts: Search the entire string for the correct accelerator

[Sean Christopherson <seanjc@google.com>]

On Fri, May 02, 2025, Andrew Jones wrote:
> On Thu, May 01, 2025 at 03:35:08PM -0700, Sean Christopherson wrote:
> > On Sat, Apr 26, 2025, Andrew Jones wrote:
> > > On Fri, Apr 25, 2025 at 03:05:57PM -0700, Sean Christopherson wrote:
> > > > Search the entire ACCEL string for the required accelerator as searching
> > > > for an exact match incorrectly rejects ACCEL when additional accelerator
> > > > specific options are provided, e.g.
> > > > 
> > > >   SKIP pmu (kvm only, but ACCEL=kvm,kernel_irqchip=on)
> > > > 
> > > > Signed-off-by: Sean Christopherson <seanjc@google.com>
> > > > ---
> > > >  scripts/runtime.bash | 2 +-
> > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > > 
> > > > diff --git a/scripts/runtime.bash b/scripts/runtime.bash
> > > > index 4b9c7d6b..59d1727c 100644
> > > > --- a/scripts/runtime.bash
> > > > +++ b/scripts/runtime.bash
> > > > @@ -126,7 +126,7 @@ function run()
> > > >          machine="$MACHINE"
> > > >      fi
> > > >  
> > > > -    if [ -n "$accel" ] && [ -n "$ACCEL" ] && [ "$accel" != "$ACCEL" ]; then
> > > > +    if [ -n "$accel" ] && [ -n "$ACCEL" ] && [[ ! "$ACCEL" =~ $accel ]]; then
> > > 
> > > Let's use
> > > 
> > >  [[ ! $ACCEL =~ ^$accel(,.*|$) ]]
> > > 
> > > to be a bit more precise.
> > 
> > Sadist.  :-)
> 
> Hehe
> 
> > 
> > Why the ".*"?  Isn't that the same as:
> > 
> >   [[ ! "$ACCEL" =~ ^$accel(,|$) ]]
> > 
> > Or are my regex skills worse than I realize (and I fully realize they're really,
> > really bad)?
> 
> Oops, that ".*" should have been a ".+" since the intention was to avoid
> accepting 'kvm,', but, of course you're right, that .* still allows it,
> making it equivalent to nothing at all.
> 
> We can either just drop the .* and accept 'kvm,' (because why not) or
> change that * to +.

I'll drop the .*, as QEMU accepts "kvm,", i.e. it actually works.