diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-01-12 07:49:47 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-01-15 00:40:45 +0530 |
| commit | 300af83b6997f8ffe6c779cf3f36c0d8adde299a (patch) | |
| tree | 0cfdcfba5638fdb9e2d14f39fb9e2a56320a25d3 | |
| parent | 870dbc5ef990df70afa51665d11bb719e91f7fe2 (diff) | |
| download | gstreamer-plugins-bad-300af83b6997f8ffe6c779cf3f36c0d8adde299a.tar.gz | |
tests: Fix minor bugs in usage of config.h
| -rw-r--r-- | tests/check/meson.build | 4 | ||||
| -rw-r--r-- | tests/examples/ipcpipeline/ipcpipeline1.c | 4 | ||||
| -rw-r--r-- | tests/examples/mpegts/meson.build | 2 | ||||
| -rw-r--r-- | tests/examples/opencv/meson.build | 2 | ||||
| -rw-r--r-- | tests/examples/waylandsink/meson.build | 4 | ||||
| -rw-r--r-- | tests/examples/webrtc/meson.build | 2 |
6 files changed, 11 insertions, 7 deletions
diff --git a/tests/check/meson.build b/tests/check/meson.build index cd77fb4b3..85a733045 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -139,8 +139,8 @@ foreach t : base_tests if not skip_test exe = executable(test_name, fnames, include_directories : [configinc], - c_args : ['-DHAVE_CONFIG_H=1' ] + test_defines, - cpp_args : gst_plugins_bad_args, + c_args : gst_plugins_bad_args + test_defines, + cpp_args : gst_plugins_bad_args + test_defines, dependencies : [libm] + test_deps + extra_deps, ) diff --git a/tests/examples/ipcpipeline/ipcpipeline1.c b/tests/examples/ipcpipeline/ipcpipeline1.c index df45c4a53..29ba11226 100644 --- a/tests/examples/ipcpipeline/ipcpipeline1.c +++ b/tests/examples/ipcpipeline/ipcpipeline1.c @@ -26,6 +26,10 @@ * running in a different process than videotestsrc. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #define _GNU_SOURCE #include <unistd.h> #include <fcntl.h> diff --git a/tests/examples/mpegts/meson.build b/tests/examples/mpegts/meson.build index 4fb2c5536..4174bda5c 100644 --- a/tests/examples/mpegts/meson.build +++ b/tests/examples/mpegts/meson.build @@ -3,5 +3,5 @@ executable('tsparser', install: false, include_directories : [configinc], dependencies : [gstmpegts_dep], - c_args : ['-DHAVE_CONFIG_H=1', '-DGST_USE_UNSTABLE_API' ], + c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'], ) diff --git a/tests/examples/opencv/meson.build b/tests/examples/opencv/meson.build index e00227c8e..889ea51a7 100644 --- a/tests/examples/opencv/meson.build +++ b/tests/examples/opencv/meson.build @@ -8,6 +8,6 @@ foreach example : examples src_file, include_directories: [configinc], dependencies: [glib_dep, gst_dep, gstbase_dep], - c_args: ['-DHAVE_CONFIG_H=1'], + c_args : gst_plugins_bad_args, install: false) endforeach diff --git a/tests/examples/waylandsink/meson.build b/tests/examples/waylandsink/meson.build index 5918063d4..f5a4e4f8d 100644 --- a/tests/examples/waylandsink/meson.build +++ b/tests/examples/waylandsink/meson.build @@ -9,7 +9,7 @@ if use_wayland install: false, include_directories : [configinc], dependencies : [gtk_dep, gtk_wayland_dep, gst_dep, gstwayland_dep], - c_args : ['-DHAVE_CONFIG_H=1', '-DGST_USE_UNSTABLE_API=1'], + c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'], ) endif executable('wayland_threads', @@ -17,6 +17,6 @@ if use_wayland install: false, include_directories : [configinc], dependencies : [gst_dep, gstwayland_dep, wl_client_dep], - c_args : ['-DHAVE_CONFIG_H=1', '-DGST_USE_UNSTABLE_API=1'], + c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'], ) endif diff --git a/tests/examples/webrtc/meson.build b/tests/examples/webrtc/meson.build index 716bcf399..4bb2c9f82 100644 --- a/tests/examples/webrtc/meson.build +++ b/tests/examples/webrtc/meson.build @@ -9,7 +9,7 @@ foreach example : examples install: false, include_directories : [configinc], dependencies : [glib_dep, gst_dep, gstwebrtc_dep], - c_args : ['-DHAVE_CONFIG_H=1', '-DGST_USE_UNSTABLE_API'], + c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'], ) endforeach |