build: add *test-no-data-check targets

skips testdata verification; useful with slow media or if the data was
retrieved via a separate call to testdata

Change-Id: Ifd97892cee6c04b0111874cc8071675e90ec852b

diff --git a/build/make/Makefile b/build/make/Makefile
index b56b4902cfb5d01bfa07bdcba88c552003140483..f1b1cca33bf4c2c4a8823d87cb95dd83f4771bb6 100644 (file)
--- a/build/make/Makefile
+++ b/build/make/Makefile
@@ -22,8 +22,10 @@ clean:: .DEFAULT
 exampletest: .DEFAULT
 install:: .DEFAULT
 test:: .DEFAULT
+test-no-data-check:: .DEFAULT
 testdata:: .DEFAULT
 utiltest: .DEFAULT
+exampletest-no-data-check utiltest-no-data-check: .DEFAULT
 
 
 # Note: md5sum is not installed on OS X, but openssl is. Openssl may not be
@@ -113,6 +115,9 @@ test::
 testdata::
 .PHONY: utiltest
 utiltest:
+.PHONY: test-no-data-check exampletest-no-data-check utiltest-no-data-check
+test-no-data-check::
+exampletest-no-data-check utiltest-no-data-check:
 
 # Add compiler flags for intrinsic files
 ifeq ($(TOOLCHAIN), x86-os2-gcc)

diff --git a/libs.mk b/libs.mk
index 0ca837928f97c4e2205491bdcd3b3dcda15ad21e..6215990c9bf1e1b237650ca1f530a9da699f77dd 100644 (file)
--- a/libs.mk
+++ b/libs.mk
@@ -508,11 +508,13 @@ INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(TEST_INTRA_PRED_SPEED_SRCS)
 
 define test_shard_template
 test:: test_shard.$(1)
-test_shard.$(1): $(LIBVPX_TEST_BIN) testdata
+test-no-data-check:: test_shard_ndc.$(1)
+test_shard.$(1) test_shard_ndc.$(1): $(LIBVPX_TEST_BIN)
        @set -e; \
         export GTEST_SHARD_INDEX=$(1); \
         export GTEST_TOTAL_SHARDS=$(2); \
         $(LIBVPX_TEST_BIN)
+test_shard.$(1): testdata
 .PHONY: test_shard.$(1)
 endef
 
@@ -557,15 +559,16 @@ ifeq ($(CONFIG_MSVS),yes)
 # TODO(tomfinegan): Support running the debug versions of tools?
 TEST_BIN_PATH := $(addsuffix /$(TGT_OS:win64=x64)/Release, $(TEST_BIN_PATH))
 endif
-utiltest: testdata
+utiltest utiltest-no-data-check:
        $(qexec)$(SRC_PATH_BARE)/test/vpxdec.sh \
                --test-data-path $(LIBVPX_TEST_DATA_PATH) \
                --bin-path $(TEST_BIN_PATH)
        $(qexec)$(SRC_PATH_BARE)/test/vpxenc.sh \
                --test-data-path $(LIBVPX_TEST_DATA_PATH) \
                --bin-path $(TEST_BIN_PATH)
+utiltest: testdata
 else
-utiltest:
+utiltest utiltest-no-data-check:
        @echo Unit tests must be enabled to make the utiltest target.
 endif
 
@@ -583,11 +586,12 @@ ifeq ($(CONFIG_MSVS),yes)
 # TODO(tomfinegan): Support running the debug versions of tools?
 EXAMPLES_BIN_PATH := $(TGT_OS:win64=x64)/Release
 endif
-exampletest: examples testdata
+exampletest exampletest-no-data-check: examples
        $(qexec)$(SRC_PATH_BARE)/test/examples.sh \
                --test-data-path $(LIBVPX_TEST_DATA_PATH) \
                --bin-path $(EXAMPLES_BIN_PATH)
+exampletest: testdata
 else
-exampletest:
+exampletest exampletest-no-data-check:
        @echo Unit tests must be enabled to make the exampletest target.
 endif