X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Futil%2Fmeson.build;h=7ea125e5ac8442c4dfc2c0924e29805a6324d446;hb=492d664be06ca538d4e5c1e380ab7966714a12a9;hp=3b2ac083a145960c8fc8979f97912f7522e85842;hpb=65610ec774ae095cfee3602b3f06d51d0a199791;p=mesa.git diff --git a/src/util/meson.build b/src/util/meson.build index 3b2ac083a14..7ea125e5ac8 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -34,6 +34,7 @@ files_mesa_util = files( 'blob.h', 'build_id.c', 'build_id.h', + 'compiler.h', 'crc32.c', 'crc32.h', 'dag.c', @@ -109,10 +110,12 @@ files_mesa_util = files( 'u_vector.h', 'u_math.c', 'u_math.h', + 'u_memset.h', 'u_mm.c', 'u_mm.h', 'u_debug.c', 'u_debug.h', + 'u_debug_memory.c', 'u_cpu_detect.c', 'u_cpu_detect.h', 'vma.c', @@ -166,7 +169,7 @@ endif _libmesa_util = static_library( 'mesa_util', [files_mesa_util, format_srgb], - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : deps_for_libmesa_util, link_with: libmesa_format, c_args : [c_msvc_compat_args, c_vis_args], @@ -182,7 +185,7 @@ idep_mesautil = declare_dependency( _libxmlconfig = static_library( 'xmlconfig', files_xmlconfig, - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [idep_mesautil, dep_expat, dep_m], c_args : [ c_msvc_compat_args, c_vis_args, @@ -207,7 +210,7 @@ if with_tests executable( 'u_atomic_test', files('u_atomic_test.c'), - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : idep_mesautil, c_args : [c_msvc_compat_args], ), @@ -219,7 +222,7 @@ if with_tests executable( 'blob_test', files('blob_test.c'), - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : idep_mesautil, c_args : [c_msvc_compat_args], ), @@ -231,7 +234,7 @@ if with_tests executable( 'rb_tree_test', files('rb_tree_test.c'), - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : idep_mesautil, c_args : [c_msvc_compat_args], ), @@ -243,7 +246,7 @@ if with_tests executable( 'roundeven_test', files('roundeven_test.c'), - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], c_args : [c_msvc_compat_args], dependencies : [dep_m], ), @@ -258,7 +261,7 @@ if with_tests executable( 'mesa-sha1_test', files('mesa-sha1_test.c'), - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], link_with : _libmesa_util, c_args : [c_msvc_compat_args], ), @@ -271,12 +274,38 @@ if with_tests executable( 'bitset_test', files('bitset_test.cpp'), - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [idep_mesautil, idep_gtest], ), suite : ['util'], ) + process_test_exe = executable( + 'process_test', + files('process_test.c'), + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + dependencies : idep_mesautil, + c_args : [c_msvc_compat_args], + ) + if (host_machine.system() == 'windows' and build_machine.system() != 'windows') + # This conversion is only required on mingw crosscompilers, otherwise we hit at least one of these issues + # https://gitlab.freedesktop.org/mesa/mesa/-/issues/2690 + # https://gitlab.freedesktop.org/mesa/mesa/-/issues/2788 + prog_winepath = find_program('winepath') + process_test_exe_full_path = run_command( + prog_winepath, '-w', process_test_exe.full_path() + ).stdout().strip() + else + process_test_exe_full_path = process_test_exe.full_path() + endif + + test( + 'process', + process_test_exe, + suite : ['util'], + env: ['BUILD_FULL_PATH='+process_test_exe_full_path] + ) + subdir('tests/fast_idiv_by_const') subdir('tests/fast_urem_by_const') subdir('tests/hash_table')