diff options
| -rw-r--r-- | test/chmap.c | 6 | ||||
| -rw-r--r-- | test/chmap_sel.c | 30 | ||||
| -rw-r--r-- | test/gl_video.c | 12 | ||||
| -rw-r--r-- | wscript | 2 |
4 files changed, 25 insertions, 25 deletions
diff --git a/test/chmap.c b/test/chmap.c index 365c15be52..395b716b74 100644 --- a/test/chmap.c +++ b/test/chmap.c @@ -16,8 +16,8 @@ static void test_mp_chmap_diff(void **state) { } int main(void) { - const UnitTest tests[] = { - unit_test(test_mp_chmap_diff), + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_mp_chmap_diff), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/test/chmap_sel.c b/test/chmap_sel.c index 928320058c..f4299e1146 100644 --- a/test/chmap_sel.c +++ b/test/chmap_sel.c @@ -102,20 +102,20 @@ static void test_mp_chmap_sel_fallback_more_replacements(void **state) { } int main(void) { - const UnitTest tests[] = { - unit_test(test_mp_chmap_sel_fallback_upmix), - unit_test(test_mp_chmap_sel_fallback_downmix), - unit_test(test_mp_chmap_sel_fallback_incompatible), - unit_test(test_mp_chmap_sel_fallback_prefer_compatible), - unit_test(test_mp_chmap_sel_fallback_prefer_closest_upmix), - unit_test(test_mp_chmap_sel_fallback_use_replacements), - unit_test(test_mp_chmap_sel_fallback_works_on_alsa_chmaps), - unit_test(test_mp_chmap_sel_fallback_mono_to_stereo), - unit_test(test_mp_chmap_sel_fallback_stereo_to_stereo), - unit_test(test_mp_chmap_sel_fallback_no_downmix), - unit_test(test_mp_chmap_sel_fallback_minimal_downmix), - unit_test(test_mp_chmap_sel_fallback_reject_unknown), - unit_test(test_mp_chmap_sel_fallback_more_replacements), + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_mp_chmap_sel_fallback_upmix), + cmocka_unit_test(test_mp_chmap_sel_fallback_downmix), + cmocka_unit_test(test_mp_chmap_sel_fallback_incompatible), + cmocka_unit_test(test_mp_chmap_sel_fallback_prefer_compatible), + cmocka_unit_test(test_mp_chmap_sel_fallback_prefer_closest_upmix), + cmocka_unit_test(test_mp_chmap_sel_fallback_use_replacements), + cmocka_unit_test(test_mp_chmap_sel_fallback_works_on_alsa_chmaps), + cmocka_unit_test(test_mp_chmap_sel_fallback_mono_to_stereo), + cmocka_unit_test(test_mp_chmap_sel_fallback_stereo_to_stereo), + cmocka_unit_test(test_mp_chmap_sel_fallback_no_downmix), + cmocka_unit_test(test_mp_chmap_sel_fallback_minimal_downmix), + cmocka_unit_test(test_mp_chmap_sel_fallback_reject_unknown), + cmocka_unit_test(test_mp_chmap_sel_fallback_more_replacements), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/test/gl_video.c b/test/gl_video.c index 543ff2e295..253ab35d81 100644 --- a/test/gl_video.c +++ b/test/gl_video.c @@ -31,12 +31,12 @@ static void test_scale_ambient_lux_log10_midpoint(void **state) { } int main(void) { - const UnitTest tests[] = { - unit_test(test_scale_ambient_lux_limits), - unit_test(test_scale_ambient_lux_sign), - unit_test(test_scale_ambient_lux_clamping), - unit_test(test_scale_ambient_lux_log10_midpoint), + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_scale_ambient_lux_limits), + cmocka_unit_test(test_scale_ambient_lux_sign), + cmocka_unit_test(test_scale_ambient_lux_clamping), + cmocka_unit_test(test_scale_ambient_lux_log10_midpoint), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } @@ -83,7 +83,7 @@ build_options = [ }, { 'name': '--test', 'desc': 'test suite (using cmocka)', - 'func': check_pkg_config('cmocka', '>= 0.4.1'), + 'func': check_pkg_config('cmocka', '>= 1.0.0'), 'default': 'disable', }, { 'name': '--clang-database', |