From 340f95a4a89d33b7fb595f146953e3baf8a5a397 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Fri, 24 Aug 2018 23:31:35 +0200 Subject: [PATCH] Remove redundant use of OBJDIR --- tests/grub.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/grub.sh b/tests/grub.sh index 21144f5..b143752 100755 --- a/tests/grub.sh +++ b/tests/grub.sh @@ -62,15 +62,15 @@ _grub() case "$ARCH" in amd64|i?86) _info "Testing multiboot conformance ($ARCH)" - $GRUBFILE --is-x86-multiboot "$OBJDIR$UKERNELBIN" + $GRUBFILE --is-x86-multiboot "$UKERNELBIN" #FIXME look for multiboot2 instead? - #$GRUBFILE --is-x86-multiboot2 "$OBJDIR$UKERNELBIN" + #$GRUBFILE --is-x86-multiboot2 "$UKERNELBIN" ret=$? if [ $ret -eq 127 ]; then _error "Cannot test: $GRUBFILE not available (ignored)" ret=0 elif [ $ret -ne 0 ]; then - _error "$OBJDIR$UKERNELBIN: Not compliant with multiboot" + _error "$UKERNELBIN: Not compliant with multiboot" ret=$? fi ;;