shithub: libvpx

Download patch

ref: c71b8a72f2a3d80573f77d9bd7592a5611207165
parent: 583ed8562bb5b6bbf71be8e32f592b10100e7daf
parent: d6fd2293ead0bf9831adcc9ea2b6b7c085482491
author: James Zern <[email protected]>
date: Wed Jul 30 07:04:26 EDT 2014 

Merge changes I3513ae17,Ia0b51165,I461d8b3d

* changes:
  make testdata: look for other variants of sha1sum
  make testdata: fail if a sha1 fails or is missing
  test-data.sha1: add missing checksums


--- a/libs.mk
+++ b/libs.mk
@@ -409,12 +409,16 @@
             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\
--- a/test/test-data.sha1
+++ b/test/test-data.sha1
@@ -679,4 +679,5 @@
 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