shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Add utiltest target to Makefile."

--- a/build/make/Makefile

+++ b/build/make/Makefile

@@ -22,6 +22,7 @@

 install:: .DEFAULT

 test:: .DEFAULT

 testdata:: .DEFAULT

+utiltest: .DEFAULT

 # Note: md5sum is not installed on OS X, but openssl is. Openssl may not be

@@ -52,8 +53,6 @@

                 | sed -e 's/MD5(\(.*\))= \([0-9a-f]\{32\}\)/\2  \1/' \

                 > md5sums.txt;\

         fi

-

-

 endif

 ifneq ($(target),)

@@ -112,6 +111,8 @@

 test::

 .PHONY: testdata

 testdata::

+.PHONY: utiltest

+utiltest:

 # Add compiler flags for intrinsic files

 $(BUILD_PFX)%_mmx.c.d: CFLAGS += -mmmx

--- a/libs.mk

+++ b/libs.mk

@@ -531,3 +531,28 @@

 ## Update the global src list

 SRCS += $(CODEC_SRCS) $(LIBVPX_TEST_SRCS) $(GTEST_SRCS)

+

+##

+## vpxdec/vpxenc tests.

+##

+ifeq ($(CONFIG_UNIT_TESTS),yes)

+TEST_BIN_PATH = .

+ifeq ($(CONFIG_MSVS),yes)

+# MSVC will build both Debug and Release configurations of tools in a

+# sub directory named for the current target. Assume the user wants to

+# run the Release tools, and assign TEST_BIN_PATH accordingly.

+# TODO(tomfinegan): Is this adequate for ARM?

+# TODO(tomfinegan): Support running the debug versions of tools?

+TEST_BIN_PATH := $(addsuffix /$(TGT_OS:win64=x64)/Release, $(TEST_BIN_PATH))

+endif

+utiltest: testdata

+	$(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)

+else

+utiltest:

+	@echo Unit tests must be enabled to make the utiltest target.

+endif