Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
5c02f88a
Commit
5c02f88a
authored
May 12, 2015
by
James Zern
Committed by
Gerrit Code Review
May 12, 2015
Browse files
Options
Browse Files
Download
Plain Diff
Merge "libs.mk: simplify test_libvpx target"
parents
f2378498
b0789cd2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
18 deletions
+15
-18
libs.mk
libs.mk
+15
-18
No files found.
libs.mk
View file @
5c02f88a
...
...
@@ -354,7 +354,7 @@ LIBVPX_TEST_DATA_PATH ?= .
include
$(SRC_PATH_BARE)/test/test.mk
LIBVPX_TEST_SRCS
=
$(
addprefix
test
/,
$(
call
enabled,LIBVPX_TEST_SRCS
))
LIBVPX_TEST_BIN
S
=
./test_libvpx
$(EXE_SFX)
LIBVPX_TEST_BIN
=
./test_libvpx
$(EXE_SFX)
LIBVPX_TEST_DATA
=
$(
addprefix
$(LIBVPX_TEST_DATA_PATH)
/,
\
$(
call
enabled,LIBVPX_TEST_DATA
))
libvpx_test_data_url
=
http://downloads.webmproject.org/test_data/libvpx/
$(1)
...
...
@@ -422,7 +422,7 @@ test_libvpx.$(VCPROJ_SFX): $(LIBVPX_TEST_SRCS) vpx.$(VCPROJ_SFX) gtest.$(VCPROJ_
PROJECTS-$(CONFIG_MSVS)
+=
test_libvpx.
$(VCPROJ_SFX)
LIBVPX_TEST_BIN
S
:=
$(
addprefix
$(TGT_OS:win64=x64)
/Release/,
$(
notdir
$(LIBVPX_TEST_BIN
S
)
))
LIBVPX_TEST_BIN
:=
$(
addprefix
$(TGT_OS:win64=x64)
/Release/,
$(
notdir
$(LIBVPX_TEST_BIN)
))
endif
else
...
...
@@ -443,20 +443,19 @@ LIBVPX_TEST_OBJS=$(sort $(call objs,$(LIBVPX_TEST_SRCS)))
$(LIBVPX_TEST_OBJS) $(LIBVPX_TEST_OBJS
:
.o=.d): CXXFLAGS += -I$(SRC_PATH_BARE)/third_party/googletest/src
$(LIBVPX_TEST_OBJS) $(LIBVPX_TEST_OBJS
:
.o=.d): CXXFLAGS += -I$(SRC_PATH_BARE)/third_party/googletest/src/include
OBJS-$(BUILD_LIBVPX)
+=
$(LIBVPX_TEST_OBJS)
BINS-$(BUILD_LIBVPX)
+=
$(LIBVPX_TEST_BIN
S
)
BINS-$(BUILD_LIBVPX)
+=
$(LIBVPX_TEST_BIN)
CODEC_LIB
=
$(
if
$(CONFIG_DEBUG_LIBS)
,vpx_g,vpx
)
CODEC_LIB_SUF
=
$(
if
$(CONFIG_SHARED)
,.so,.a
)
$(foreach
bin,$(LIBVPX_TEST_BINS),\
$(if $(BUILD_LIBVPX),$(eval $(bin)
:
\
lib$(CODEC_LIB)$(CODEC_LIB_SUF) libgtest.a ))
\
$(if $(BUILD_LIBVPX)
,
$(eval $(call linkerxx_template
,
$(bin)
,
\
$(LIBVPX_TEST_OBJS)
\
-L. -lvpx -lgtest $(extralibs) -lm)
\
)))
\
$(if $(LIPO_LIBS)
,
$(eval $(call lipo_bin_template
,
$(bin))))
\
ifeq
($(BUILD_LIBVPX),yes)
$(LIBVPX_TEST_BIN)
:
lib$(CODEC_LIB)$(CODEC_LIB_SUF) libgtest.a
$(eval
$(call
linkerxx_template,$(LIBVPX_TEST_BIN),
\
$(LIBVPX_TEST_OBJS)
\
-L.
-lvpx
-lgtest
$(extralibs)
-lm))
$(if
$(LIPO_LIBS),$(eval
$(call
lipo_bin_template,$(LIBVPX_TEST_BIN))))
endif
# BUILD_LIBVPX=yes
endif
endif
# CONFIG_UNIT_TESTS
# Install test sources only if codec source is included
INSTALL-SRCS-$(CONFIG_CODEC_SRCS)
+=
$(
patsubst
$(SRC_PATH_BARE)
/%,%,
\
...
...
@@ -465,13 +464,11 @@ INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(LIBVPX_TEST_SRCS)
define
test_shard_template
test
::
test_shard.$(1)
test_shard.$(1)
:
$(LIBVPX_TEST_BIN
S
) testdata
test_shard.$(1)
:
$(LIBVPX_TEST_BIN) testdata
@
set
-e
;
\
for
t
in
$(LIBVPX_TEST_BINS)
;
do
\
export
GTEST_SHARD_INDEX
=
$(1)
;
\
export
GTEST_TOTAL_SHARDS
=
$(2)
;
\
$$$$
t
;
\
done
export
GTEST_SHARD_INDEX
=
$(1)
;
\
export
GTEST_TOTAL_SHARDS
=
$(2)
;
\
$(LIBVPX_TEST_BIN)
.PHONY
:
test_shard.$(1)
endef
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment