diff --git a/libs.mk b/libs.mk index 1e01639c7..25fbc2cb9 100644 --- a/libs.mk +++ b/libs.mk @@ -409,12 +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\ diff --git a/test/test-data.sha1 b/test/test-data.sha1 index 98ac0e670..ee6289f1e 100644 --- a/test/test-data.sha1 +++ b/test/test-data.sha1 @@ -679,4 +679,5 @@ edd86a1f5e62fd9da9a9d46078247759c2638009 tacomasmallcameramovement_640_480_30.y 9a70e8b7d14fba9234d0e51dce876635413ce444 thaloundeskmtg_640_480_30.yuv e7d315dbf4f3928779e0dc624311196d44491d32 niklas_1280_720_30.yuv c77e4a26616add298a05dd5d12397be22c0e40c5 vp90-2-18-resize.ivf -c77e4a26616add298a05dd5d12397be22c0e40c5 vp90-2-18-resize.ivf +c12918cf0a716417fba2de35c3fc5ab90e52dfce vp90-2-18-resize.ivf.md5 +717da707afcaa1f692ff1946f291054eb75a4f06 screendata.y4m