Re: [kvm-unit-tests PATCH v3 2/8] arch-run: Clean up initrd cleanup

Nicholas Piggin
2024-02-09T08:27:42Z

On Fri Feb 9, 2024 at 5:32 PM AEST, Thomas Huth wrote:
> On 09/02/2024 08.01, Nicholas Piggin wrote:
> > Rather than put a big script into the trap handler, have it call
> > a function.
> >
> > Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> > ---
> > scripts/arch-run.bash | 13 ++++++++++++-
> > 1 file changed, 12 insertions(+), 1 deletion(-)
> >
> > diff --git a/scripts/arch-run.bash b/scripts/arch-run.bash
> > index 11d47a85..1e903e83 100644
> > --- a/scripts/arch-run.bash
> > +++ b/scripts/arch-run.bash
> > @@ -269,10 +269,21 @@ search_qemu_binary ()
> > export PATH=$save_path
> > }
> >
> > +initrd_cleanup ()
> > +{
> > + rm -f $KVM_UNIT_TESTS_ENV
> > + if [ "$KVM_UNIT_TESTS_ENV_OLD" ]; then
> > + export KVM_UNIT_TESTS_ENV="$KVM_UNIT_TESTS_ENV_OLD"
> > + else
> > + unset KVM_UNIT_TESTS_ENV
> > + unset KVM_UNIT_TESTS_ENV_OLD
> > + fi
> > +}
>
> Looking at the original code below, shouldn't this rather unset
> KVM_UNIT_TESTS_ENV_OLD after the "fi" statement?

Yes good catch.

Thanks,
Nick