From 0c716e762fc99d56c81a3bdd4c01420d905469a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Wed, 22 May 2024 03:40:05 +0200 Subject: [PATCH] test/meson: remove unneded sources --- meson.build | 11 +++++------ test/meson.build | 11 ++--------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index ae1eb9cfd9..319e4c356f 100644 --- a/meson.build +++ b/meson.build @@ -412,9 +412,9 @@ endif if posix path_source = files('osdep/path-unix.c') if cc.has_function('fork', prefix : '#include ') - subprocess_source = files('osdep/subprocess-posix.c') + sources += files('osdep/subprocess-posix.c') else - subprocess_source = files('osdep/subprocess-dummy.c') + sources += files('osdep/subprocess-dummy.c') endif sources += files('input/ipc-unix.c', 'osdep/poll_wrapper.c', @@ -486,7 +486,6 @@ features += {'uwp': uwp.found()} if features['uwp'] dependencies += uwp path_source = files('osdep/path-uwp.c') - subprocess_source = [] endif features += {'win32-executable': win32 and get_option('cplayer')} @@ -514,9 +513,9 @@ if features['win32-desktop'] cc.find_library('version')] dependencies += win32_desktop_libs path_source = files('osdep/path-win.c') - subprocess_source = files('osdep/subprocess-win.c') sources += files('input/ipc-win.c', 'osdep/language-win.c', + 'osdep/subprocess-win.c', 'osdep/terminal-win.c', 'video/out/w32_common.c', 'video/out/win32/displayconfig.c', @@ -526,8 +525,8 @@ if features['win32-desktop'] endif if not posix and not features['win32-desktop'] - subprocess_source = files('osdep/subprocess-dummy.c') sources += files('input/ipc-dummy.c', + 'osdep/subprocess-dummy.c', 'osdep/terminal-dummy.c') endif @@ -573,7 +572,7 @@ vector = get_option('vector').require( ) features += {'vector': vector.allowed()} -sources += path_source + subprocess_source + timer_source +sources += path_source + timer_source # various file generations diff --git a/test/meson.build b/test/meson.build index a7dcf46f3e..d7a5839747 100644 --- a/test/meson.build +++ b/test/meson.build @@ -4,10 +4,8 @@ outdir = join_paths(build_root, 'test', 'out') refdir = '' # Convenient testing libraries. An adhoc collection of -# mpv objects that test_utils.c needs. Paths and subprocesses -# are required in order to run a diff command when comparing -# different files. Stuff will probably break if core things are -# carelessly moved around. +# mpv objects that test_utils.c needs. Stuff will probably +# break if core things are carelessly moved around. test_utils_args = [] test_utils_files = [ 'audio/chmap.c', @@ -24,13 +22,9 @@ test_utils_files = [ 'options/m_config_core.c', 'options/m_config_frontend.c', 'options/m_option.c', - 'options/path.c', 'osdep/io.c', - 'osdep/subprocess.c', 'osdep/timer.c', timer_source, - path_source, - subprocess_source, 'ta/ta.c', 'ta/ta_talloc.c', 'ta/ta_utils.c' @@ -70,7 +64,6 @@ img_utils_files = [ 'video/fmt-conversion.c', 'video/img_format.c', 'video/mp_image.c', - 'video/out/placebo/utils.c', 'video/sws_utils.c' ] if features['zimg']