1 files changed, 18 insertions, 16 deletions

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
index 568e38cb..456f0762 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
+++ b/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
@@ -1,4 +1,4 @@
-From 08b1aaff972a7f6349373fc1ad4cc23081adb52c Mon Sep 17 00:00:00 2001
+From 330e15374bb30ac29ee72c4b3de79c17b1157112 Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <quaresma.jose@gmail.com>
 Date: Sun, 11 Apr 2021 19:48:13 +0100
 Subject: [PATCH] tests: add support for install the tests
@@ -14,16 +14,16 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
 ---
  meson.build                  |  4 ++++
  meson_options.txt            |  1 +
- tests/check/meson.build      | 22 +++++++++++++++++++++-
+ tests/check/meson.build      | 21 ++++++++++++++++++++-
  tests/check/template.test.in |  3 +++
- 4 files changed, 29 insertions(+), 1 deletion(-)
+ 4 files changed, 28 insertions(+), 1 deletion(-)
  create mode 100644 tests/check/template.test.in
 
 diff --git a/meson.build b/meson.build
-index f9f591d..3906fb3 100644
+index 540d6d290e10..0267f22a79ea 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -606,6 +606,10 @@ if bashcomp_dep.found()
+@@ -624,6 +624,10 @@ if bashcomp_dep.found()
    endif
  endif
  
@@ -35,10 +35,10 @@ index f9f591d..3906fb3 100644
  
  pkgconfig = import('pkgconfig')
 diff --git a/meson_options.txt b/meson_options.txt
-index 7363bdb..a34ba37 100644
+index 340fb5801d02..5b87f68e8d7f 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -15,6 +15,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso
+@@ -16,6 +16,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso
  option('memory-alignment', type: 'combo',
         choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'],
         value: 'malloc')
@@ -47,14 +47,14 @@ index 7363bdb..a34ba37 100644
  # Feature options
  option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries')
 diff --git a/tests/check/meson.build b/tests/check/meson.build
-index 16caac7..f2d400f 100644
+index e9501feb2af5..fd5a99611e3d 100644
 --- a/tests/check/meson.build
 +++ b/tests/check/meson.build
-@@ -124,10 +124,16 @@ test_defines = [
+@@ -125,10 +125,16 @@ test_defines = [
    '-UG_DISABLE_ASSERT',
    '-UG_DISABLE_CAST_CHECKS',
    '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"',
--  '-DTESTFILE="' + meson.current_source_dir() + '/meson.build"',
+-  '-DTESTFILE="' + fsmod.as_posix(meson.current_source_dir()) + '/meson.build"',
    '-DGST_DISABLE_DEPRECATED',
  ]
  
@@ -68,7 +68,7 @@ index 16caac7..f2d400f 100644
  # sanity checking
  if get_option('check').disabled()
    if get_option('tests').enabled()
-@@ -150,6 +156,8 @@ foreach t : core_tests
+@@ -151,6 +157,8 @@ foreach t : core_tests
        include_directories : [configinc],
        link_with : link_with_libs,
        dependencies : gst_deps + test_deps,
@@ -77,10 +77,10 @@ index 16caac7..f2d400f 100644
      )
  
      env = environment()
-@@ -161,6 +169,18 @@ foreach t : core_tests
+@@ -161,6 +169,17 @@ foreach t : core_tests
+     env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name))
      env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner')
      env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer')
- 
 +    if installed_tests_enabled
 +      test_conf = configuration_data()
 +      test_conf.set('installed_tests_dir', join_paths(prefix, installed_tests_execdir))
@@ -92,16 +92,18 @@ index 16caac7..f2d400f 100644
 +        configuration: test_conf
 +      )
 +    endif
-+
+ 
      test(test_name, exe, env: env, timeout : 3 * 60)
    endif
- endforeach
 diff --git a/tests/check/template.test.in b/tests/check/template.test.in
 new file mode 100644
-index 0000000..f701627
+index 000000000000..f701627f87a6
 --- /dev/null
 +++ b/tests/check/template.test.in
 @@ -0,0 +1,3 @@
 +[Test]
 +Type=session
 +Exec=@installed_tests_dir@/@program@
+-- 
+2.39.2
+