mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pipewire: use RUNNING_ON_VALGRIND to determine if we're in valgrind

Browse source 
This removes the use of the VALGRIND environment variable
This commit is contained in:
Peter Hutterer 2021-06-07 16:02:58 +10:00 • committed by Wim Taymans
parent d9cc1a25f1
commit b6e27822e5
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.in
View file

@ -36,7 +36,7 @@ gdb:
$(MAKE) run DBG=gdb $(MAKE) run DBG=gdb
valgrind: valgrind:
$(MAKE) run DBG="DISABLE_RTKIT=1 VALGRIND=1 valgrind --trace-children=yes" $(MAKE) run DBG="DISABLE_RTKIT=1 valgrind --trace-children=yes"
test: all test: all
ninja -C $(BUILD_ROOT) test ninja -C $(BUILD_ROOT) test

2
src/pipewire/meson.build
View file

@ -100,7 +100,7 @@ libpipewire = shared_library(pipewire_name, pipewire_sources,
version : libversion, version : libversion,
soversion : soversion, soversion : soversion,
c_args : libpipewire_c_args, c_args : libpipewire_c_args,
include_directories : [pipewire_inc, configinc, spa_inc], include_directories : [pipewire_inc, configinc, spa_inc, includes_inc],
install : true, install : true,
dependencies : [dl_lib, mathlib, pthread_lib, libintl_dep, atomic_dep, ], dependencies : [dl_lib, mathlib, pthread_lib, libintl_dep, atomic_dep, ],
) )

5
src/pipewire/pipewire.c
View file

@ -39,6 +39,8 @@
#include <locale.h> #include <locale.h>
#include <libintl.h> #include <libintl.h>
#include <valgrind/valgrind.h>
#include <spa/utils/names.h> #include <spa/utils/names.h>
#include <spa/utils/string.h> #include <spa/utils/string.h>
#include <spa/support/cpu.h> #include <spa/support/cpu.h>
@ -489,8 +491,7 @@ void pw_init(int *argc, char **argv[])
if (support->registry != NULL) if (support->registry != NULL)
return; return;
if ((str = getenv("VALGRIND")) != NULL) support->in_valgrind = RUNNING_ON_VALGRIND;
support->in_valgrind = pw_properties_parse_bool(str);
if ((str = getenv("NO_COLOR")) != NULL) if ((str = getenv("NO_COLOR")) != NULL)
support->no_color = true; support->no_color = true;