| Message ID | 20230607185905.32810-4-andrew.jones@linux.dev (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | EFI runtime fixes | expand |
On 07/06/2023 19:59, Andrew Jones wrote: > EFI built tests use $TEST_DIR/efi/run, not $TEST_DIR/run. > Also, now that we may be using the link, rather than the > script directly, make sure we use an absolute path to the > EFI source rather than assuming it's the parent directory. > TEST_DIR already points there, so we can just use that. > > Signed-off-by: Andrew Jones <andrew.jones@linux.dev> Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com> > --- > arm/efi/run | 2 +- > configure | 5 ++++- > x86/efi/run | 2 +- > 3 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/arm/efi/run b/arm/efi/run > index f75ef157acf3..6872c337c945 100755 > --- a/arm/efi/run > +++ b/arm/efi/run > @@ -21,7 +21,7 @@ elif [ -f /usr/share/edk2/aarch64/QEMU_EFI.silent.fd ]; then > DEFAULT_UEFI=/usr/share/edk2/aarch64/QEMU_EFI.silent.fd > fi > > -: "${EFI_SRC:=$(realpath "$(dirname "$0")/../")}" > +: "${EFI_SRC:=$TEST_DIR}" > : "${EFI_UEFI:=$DEFAULT_UEFI}" > : "${EFI_TEST:=efi-tests}" > : "${EFI_CASE:=$(basename $1 .efi)}" > diff --git a/configure b/configure > index b665f7d586c2..6ee9b27a6af2 100755 > --- a/configure > +++ b/configure > @@ -313,7 +313,10 @@ if [ ! -d "$srcdir/$testdir" ]; then > echo "$testdir does not exist!" > exit 1 > fi > -if [ -f "$srcdir/$testdir/run" ]; then > + > +if [ "$efi" = "y" ] && [ -f "$srcdir/$testdir/efi/run" ]; then > + ln -fs "$srcdir/$testdir/efi/run" $testdir-run > +elif [ -f "$srcdir/$testdir/run" ]; then > ln -fs "$srcdir/$testdir/run" $testdir-run > fi > > diff --git a/x86/efi/run b/x86/efi/run > index 322cb7567fdc..85aeb94fe605 100755 > --- a/x86/efi/run > +++ b/x86/efi/run > @@ -13,7 +13,7 @@ if [ ! -f config.mak ]; then > fi > source config.mak > > -: "${EFI_SRC:=$(realpath "$(dirname "$0")/../")}" > +: "${EFI_SRC:=$TEST_DIR}" > : "${EFI_UEFI:=/usr/share/ovmf/OVMF.fd}" > : "${EFI_TEST:=efi-tests}" > : "${EFI_SMP:=1}"
diff --git a/arm/efi/run b/arm/efi/run index f75ef157acf3..6872c337c945 100755 --- a/arm/efi/run +++ b/arm/efi/run @@ -21,7 +21,7 @@ elif [ -f /usr/share/edk2/aarch64/QEMU_EFI.silent.fd ]; then DEFAULT_UEFI=/usr/share/edk2/aarch64/QEMU_EFI.silent.fd fi -: "${EFI_SRC:=$(realpath "$(dirname "$0")/../")}" +: "${EFI_SRC:=$TEST_DIR}" : "${EFI_UEFI:=$DEFAULT_UEFI}" : "${EFI_TEST:=efi-tests}" : "${EFI_CASE:=$(basename $1 .efi)}" diff --git a/configure b/configure index b665f7d586c2..6ee9b27a6af2 100755 --- a/configure +++ b/configure @@ -313,7 +313,10 @@ if [ ! -d "$srcdir/$testdir" ]; then echo "$testdir does not exist!" exit 1 fi -if [ -f "$srcdir/$testdir/run" ]; then + +if [ "$efi" = "y" ] && [ -f "$srcdir/$testdir/efi/run" ]; then + ln -fs "$srcdir/$testdir/efi/run" $testdir-run +elif [ -f "$srcdir/$testdir/run" ]; then ln -fs "$srcdir/$testdir/run" $testdir-run fi diff --git a/x86/efi/run b/x86/efi/run index 322cb7567fdc..85aeb94fe605 100755 --- a/x86/efi/run +++ b/x86/efi/run @@ -13,7 +13,7 @@ if [ ! -f config.mak ]; then fi source config.mak -: "${EFI_SRC:=$(realpath "$(dirname "$0")/../")}" +: "${EFI_SRC:=$TEST_DIR}" : "${EFI_UEFI:=/usr/share/ovmf/OVMF.fd}" : "${EFI_TEST:=efi-tests}" : "${EFI_SMP:=1}"
EFI built tests use $TEST_DIR/efi/run, not $TEST_DIR/run. Also, now that we may be using the link, rather than the script directly, make sure we use an absolute path to the EFI source rather than assuming it's the parent directory. TEST_DIR already points there, so we can just use that. Signed-off-by: Andrew Jones <andrew.jones@linux.dev> --- arm/efi/run | 2 +- configure | 5 ++++- x86/efi/run | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-)