Merge "Add make target for running example tests."

This commit is contained in:
Tom Finegan 2014-05-20 15:48:04 -07:00 committed by Gerrit Code Review
commit ca5d96315e
3 changed files with 27 additions and 0 deletions

View File

@ -19,6 +19,7 @@ ifeq ($(target),)
done done
all: .DEFAULT all: .DEFAULT
clean:: .DEFAULT clean:: .DEFAULT
exampletest: .DEFAULT
install:: .DEFAULT install:: .DEFAULT
test:: .DEFAULT test:: .DEFAULT
testdata:: .DEFAULT testdata:: .DEFAULT
@ -105,6 +106,8 @@ distclean: clean
.PHONY: dist .PHONY: dist
dist: dist:
.PHONY: exampletest
exampletest:
.PHONY: install .PHONY: install
install:: install::
.PHONY: test .PHONY: test

23
libs.mk
View File

@ -556,3 +556,26 @@ else
utiltest: utiltest:
@echo Unit tests must be enabled to make the utiltest target. @echo Unit tests must be enabled to make the utiltest target.
endif endif
##
## Example tests.
##
ifeq ($(CONFIG_UNIT_TESTS),yes)
# All non-MSVC targets output example targets in a sub dir named examples.
EXAMPLES_BIN_PATH = examples
ifeq ($(CONFIG_MSVS),yes)
# MSVC will build both Debug and Release configurations of the examples in a
# sub directory named for the current target. Assume the user wants to
# run the Release tools, and assign EXAMPLES_BIN_PATH accordingly.
# TODO(tomfinegan): Is this adequate for ARM?
# TODO(tomfinegan): Support running the debug versions of tools?
EXAMPLES_BIN_PATH := $(TGT_OS:win64=x64)/Release
endif
exampletest: examples testdata
$(qexec)$(SRC_PATH_BARE)/test/examples.sh \
--test-data-path $(LIBVPX_TEST_DATA_PATH) \
--bin-path $(EXAMPLES_BIN_PATH)
else
exampletest:
@echo Unit tests must be enabled to make the exampletest target.
endif

View File

@ -24,5 +24,6 @@ done
for test in ${example_tests}; do for test in ${example_tests}; do
# Source each test script so that exporting variables can be avoided. # Source each test script so that exporting variables can be avoided.
VPX_TEST_NAME="$(basename ${test%.*})"
. "${test}" . "${test}"
done done