diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-25 10:51:08 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-25 11:47:51 +0530 |
| commit | c64165fb002892a7ccd981c09badf3db3c57ca3f (patch) | |
| tree | d517fb182a53ffd6cb05b11f58200db57ad231d2 | |
| parent | db793e6cce50028adf7754e64b075a497473e4da (diff) | |
Revert "meson: move gstreamer-check-1.0 dependency to tests/check"
This reverts commit 0555c09607e548b6c45d029ab31dbb3042195ae3.
Does not actually work. See:
https://bugzilla.gnome.org/show_bug.cgi?id=773114#c31
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | tests/check/meson.build | 3 | ||||
| -rw-r--r-- | tests/meson.build | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/meson.build b/meson.build index 0d2166ec..accedf24 100644 --- a/meson.build +++ b/meson.build @@ -113,6 +113,8 @@ gstsdp_dep = dependency('gstreamer-sdp-1.0', version : gst_req, fallback : ['gst-plugins-base', 'sdp_dep']) gstrtsp_dep = dependency('gstreamer-rtsp-1.0', version : gst_req, fallback : ['gst-plugins-base', 'rtsp_dep']) +gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req, + fallback : ['gstreamer', 'gst_check_dep']) gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req, fallback : ['gstreamer', 'gst_controller_dep']) diff --git a/tests/check/meson.build b/tests/check/meson.build index 38dc8039..921110d8 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -1,6 +1,3 @@ -gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req, - fallback : ['gstreamer', 'gst_check_dep']) - # name, condition when to skip the test and extra dependencies ugly_tests = [ [ 'elements/amrnbenc', not amrnb_dep.found() ], diff --git a/tests/meson.build b/tests/meson.build index cd3aa67d..0e2c8874 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,3 +1 @@ -if host_machine.system() != 'windows' - subdir('check') -endif +subdir('check') |