path: root/
diff options
authorwm4 <wm4@nowhere>2019-11-07 22:42:14 +0100
committerwm4 <wm4@nowhere>2019-11-08 00:26:37 +0100
commitfb568963199312c7970ebc3bd7f89ae85ea43648 (patch)
treecac54fb7ff53e2aeda9281f132823df5e7245dfa /
parent17dde8eeb6516b8000248c3bcce293d695232865 (diff)
test: make tests part of the mpv binary
Until now, each .c file in test/ was built as separate, self-contained binary. Each binary could be run to execute the tests it contained. Change this and make them part of the normal mpv binary. Now the tests have to be invoked via the --unittest option. Do this for two reasons: - Tests now run within a "properly" initialized mpv instance, so all services are available. - Possibly simplifying the situation for future build systems. The first point is the main motivation. The mpv code is entangled with mp_log and the option system. It feels like a bad idea to duplicate some of the initialization of this just so you can call code using them. I'm also getting rid of cmocka. There wouldn't be any problem to keep it (it's a perfectly sane set of helpers), but NIH calls. I would have had to aggregate all tests into a CMUnitTest list, and I don't see how I'd get different types of entry points easily. Probably easily solvable, but since we made only pretty basic use of this library, NIH-ing this is actually easier (I needed a list of tests with custom metadata anyway, so all what was left was reimplement the assert_* helpers). Unit tests now don't output anything, and if they fail, they'll simply crash and leave a message that typically requires inspecting the test code to figure out what went wrong (and probably editing the test code to get more information). I even merged the various test functions into single ones. Sucks, but here you go. chmap_sel.c is merged into chmap.c, because I didn't see the point of this being separate. json.c drops the print_message() to go along with the new silent-by-default idea, also there's a memory leak fix unrelated to the rest of this commit. The new code is enabled with --enable-tests (--enable-test goes away). Due to waf's option parser, --enable-test still works, because it's a unique prefix to --enable-tests.
Diffstat (limited to '')
1 files changed, 9 insertions, 12 deletions
diff --git a/ b/
index 951584ec9d..547d0968fe 100644
--- a/
+++ b/
@@ -394,6 +394,14 @@ def build(ctx):
( "sub/sd_ass.c", "libass" ),
( "sub/sd_lavc.c" ),
+ ## Tests
+ ( "test/chmap.c", "tests" ),
+ ( "test/gl_video.c", "tests" ),
+ ( "test/index.c", "tests" ),
+ ( "test/json.c", "tests" ),
+ ( "test/linked_list.c", "tests" ),
+ ( "test/test_helpers.c", "tests" ),
## Video
( "video/csputils.c" ),
( "video/d3d.c", "d3d-hwaccel" ),
@@ -581,7 +589,7 @@ def build(ctx):
- if ctx.dependency_satisfied('cplayer') or ctx.dependency_satisfied('test'):
+ if ctx.dependency_satisfied('cplayer'):
target = "objects",
source = ctx.filtered_sources(sources),
@@ -628,17 +636,6 @@ def build(ctx):
wrapctx.env.CFLAGS = ctx.env.CFLAGS + wrapflags
wrapctx.env.LAST_LINKFLAGS = ctx.env.LAST_LINKFLAGS + wrapflags
- if ctx.dependency_satisfied('test'):
- for test in ctx.path.ant_glob("test/*.c"):
- ctx(
- target = os.path.splitext(test.srcpath())[0],
- source = test.srcpath(),
- use = ctx.dependencies_use() + ['objects'],
- includes = _all_includes(ctx),
- features = "c cprogram",
- install_path = None,
- )
build_shared = ctx.dependency_satisfied('libmpv-shared')
build_static = ctx.dependency_satisfied('libmpv-static')
if build_shared or build_static: