From 859d66fabf8b673904a70e1f603e82b230092692 Mon Sep 17 00:00:00 2001 From: James Zern Date: Thu, 23 Jul 2020 11:48:54 -0700 Subject: [PATCH] libs.mk: quiet curl output + fix error return Change-Id: I48a9ed70fe05df603a49b3c11f813119906fc4fb --- libs.mk | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libs.mk b/libs.mk index 39f11d4bc87..6362418e50c 100644 --- a/libs.mk +++ b/libs.mk @@ -490,16 +490,17 @@ libvpx_test_srcs.txt: @echo $(LIBVPX_TEST_SRCS) | xargs -n1 echo | LC_ALL=C sort -u > $@ CLEAN-OBJS += libvpx_test_srcs.txt +# Attempt to download the file using curl, retrying once if it fails for a +# partial file (18). $(LIBVPX_TEST_DATA): $(SRC_PATH_BARE)/test/test-data.sha1 @echo " [DOWNLOAD] $@" - # Attempt to download the file using curl, retrying once if it fails for a - # partial file (18). $(qexec)( \ trap 'rm -f $@' INT TERM; \ - curl="curl --retry 1 -L -o $@ $(call libvpx_test_data_url,$(@F))"; \ - $$curl; \ - case "$$?" in \ - 18) $$curl -C -;; \ + curl="curl -S -s --retry 1 -L -o $@ $(call libvpx_test_data_url,$(@F))"; \ + $$curl; ret=$$?; \ + case "$$ret" in \ + 18) $$curl -C - ;; \ + *) exit $$ret ;; \ esac \ )