From 0d246fb8b0c5712294524e698007f29817f02572 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Tue, 4 Aug 2020 07:11:54 -0400
Subject: [PATCH] Meson: find_program() will return gst-tester from subproject

gstreamer now use override_find_program() so it won't return the system
version.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/776>
---
 tests/validate/meson.build | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/tests/validate/meson.build b/tests/validate/meson.build
index f49b91be8b..c336df4f83 100644
--- a/tests/validate/meson.build
+++ b/tests/validate/meson.build
@@ -1,22 +1,6 @@
-if gst_dep.type_name() == 'internal'
-   if meson.version().version_compare('>= 0.51')
-    gst_tester = gst_proj.get_variable('gst_tester', disabler())
-    if is_disabler(gst_tester)
-        if get_option('tests').enabled()
-            error('Tests are enabled for gst-plugins-base but were not enabled for the gstreamer subproject')
-        endif
-        subdir_done()
-    endif
-  else
-    # Workaround for meson < 0.51. Remove once we bump the requirement.
-    # If you hit this, disable tests in gst-plugins-base.
-    gst_tester = gst_proj.get_variable('gst_tester')
-  endif
-else
-    gst_tester = find_program('gst-tester-@0@'.format(api_version), required: get_option('tests'))
-    if not gst_tester.found()
-        subdir_done()
-    endif
+gst_tester = find_program('gst-tester-@0@'.format(api_version), required: get_option('tests'))
+if not gst_tester.found()
+    subdir_done()
 endif
 
 tests = [