From d6fd2293ead0bf9831adcc9ea2b6b7c085482491 Mon Sep 17 00:00:00 2001 From: James Zern <jzern@google.com> Date: Tue, 29 Jul 2014 20:43:56 -0700 Subject: [PATCH] make testdata: look for other variants of sha1sum it's shasum / sha1 on osx, bsd variants Change-Id: I3513ae1740adfb05e9b5777d27d445dafbd22413 --- libs.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs.mk b/libs.mk index 187a4ef39a..25fbc2cb99 100644 --- a/libs.mk +++ b/libs.mk @@ -409,13 +409,16 @@ $(LIBVPX_TEST_DATA): $(SRC_PATH_BARE)/test/test-data.sha1 curl -L -o $@ $(call libvpx_test_data_url,$(@F)) testdata:: $(LIBVPX_TEST_DATA) - $(qexec)if [ -x "$$(which sha1sum)" ]; then\ + $(qexec)[ -x "$$(which sha1sum)" ] && sha1sum=sha1sum;\ + [ -x "$$(which shasum)" ] && sha1sum=shasum;\ + [ -x "$$(which sha1)" ] && sha1sum=sha1;\ + if [ -n "$${sha1sum}" ]; then\ set -e;\ echo "Checking test data:";\ if [ -n "$(LIBVPX_TEST_DATA)" ]; then\ for f in $(call enabled,LIBVPX_TEST_DATA); do\ grep $$f $(SRC_PATH_BARE)/test/test-data.sha1 |\ - (cd $(LIBVPX_TEST_DATA_PATH); sha1sum -c);\ + (cd $(LIBVPX_TEST_DATA_PATH); $${sha1sum} -c);\ done; \ fi; \ else\ -- GitLab