From 484c86ac6569363e539ad2729409ece4f161b802 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Fri, 19 Jan 2024 15:08:48 -0500 Subject: test: gstreamer: Use env instead of registry edit Instead of editing the registry, use gst_env variable provided by the plugin and already used as part of the devenv shell. This reduces the complexity of the C++ test code. Signed-off-by: Nicolas Dufresne Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- test/gstreamer/gstreamer_test.cpp | 17 ----------------- test/gstreamer/meson.build | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/test/gstreamer/gstreamer_test.cpp b/test/gstreamer/gstreamer_test.cpp index 091f7bf7..e8119b85 100644 --- a/test/gstreamer/gstreamer_test.cpp +++ b/test/gstreamer/gstreamer_test.cpp @@ -51,23 +51,6 @@ GstreamerTest::GstreamerTest(unsigned int numStreams) return; } - /* - * Remove the system libcamera plugin, if any, and add the plugin from - * the build directory. - */ - GstRegistry *registry = gst_registry_get(); - g_autoptr(GstPlugin) plugin = gst_registry_lookup(registry, "libgstlibcamera.so"); - if (plugin) - gst_registry_remove_plugin(registry, plugin); - - std::string path = libcamera::utils::libcameraBuildPath() + "src/gstreamer"; - if (!gst_registry_scan_path(registry, path.c_str())) { - g_printerr("Failed to add plugin to registry\n"); - - status_ = TestFail; - return; - } - /* * Atleast one camera should be available with numStreams streams, * otherwise skip the test entirely. diff --git a/test/gstreamer/meson.build b/test/gstreamer/meson.build index a5c003b6..f3ba5a23 100644 --- a/test/gstreamer/meson.build +++ b/test/gstreamer/meson.build @@ -17,5 +17,5 @@ foreach test : gstreamer_tests link_with : test_libraries, include_directories : test_includes_internal) - test(test['name'], exe, suite : 'gstreamer', is_parallel : false) + test(test['name'], exe, suite : 'gstreamer', is_parallel : false, env : gst_env) endforeach -- cgit v1.2.1