From f58ebbdfb5f48089bb3df088654d5bf735dab2c2 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 21 Aug 2015 15:41:35 +0100 Subject: [test] Allow self-tests to report exit status when running under Linux Allow the return status from an embedded image to propagate out to the eventual return status from main(). When running under Linux, this allows the pass/fail result of unit tests to be observable without having to visually inspect the console output. Signed-off-by: Michael Brown --- src/interface/efi/efi_snp.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/interface') diff --git a/src/interface/efi/efi_snp.c b/src/interface/efi/efi_snp.c index 1b21c40c4..3dfcc5e16 100644 --- a/src/interface/efi/efi_snp.c +++ b/src/interface/efi/efi_snp.c @@ -871,6 +871,7 @@ efi_snp_load_file ( EFI_LOAD_FILE_PROTOCOL *load_file, struct efi_snp_device *snpdev = container_of ( load_file, struct efi_snp_device, load_file ); struct net_device *netdev = snpdev->netdev; + int rc; /* Fail unless this is a boot attempt */ if ( ! booting ) { @@ -886,16 +887,13 @@ efi_snp_load_file ( EFI_LOAD_FILE_PROTOCOL *load_file, efi_watchdog_start(); /* Boot from network device */ - ipxe ( netdev ); + if ( ( rc = ipxe ( netdev ) ) != 0 ) + goto err_ipxe; - /* Stop watchdog holdoff timer */ + err_ipxe: efi_watchdog_stop(); - - /* Release network devices for use via SNP */ efi_snp_release(); - - /* Assume boot process was aborted */ - return EFI_ABORTED; + return EFIRC ( rc ); } /** Load file protocol */ -- cgit v1.2.3-55-g7522