From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Tue, 25 Oct 2016 05:21:08 +0000 (+0530)
Subject: Revert "meson: move gstreamer-check-1.0 dependency to tests/check"
X-Git-Tag: 1.19.3~505^2~273
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c64165fb002892a7ccd981c09badf3db3c57ca3f;p=platform%2Fupstream%2Fgstreamer.git

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
---

diff --git a/meson.build b/meson.build
index 0d2166e..accedf2 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 38dc803..921110d 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 cd3aa67..0e2c887 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,3 +1 @@
-if host_machine.system() != 'windows'
-  subdir('check')
-endif
+subdir('check')