test: move the MODULE_STRING usage after vlc_plugin.h

So it can be deduced from MODULE_NAME.
alexpiezo · Mar 7, 2023 · 96d2232 · 96d2232
1 parent e18c1e8
commit 96d2232
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 14 deletions.
diff --git a/test/modules/lua/extension.c b/test/modules/lua/extension.c
@@ -28,7 +28,6 @@
 #define MODULE_NAME test_lua_extension
 #define MODULE_STRING "test_lua_extension"
 #undef VLC_DYNAMIC_PLUGIN
-const char vlc_module_name[] = MODULE_STRING;
 
 #include "../../libvlc/test.h"
 
@@ -45,6 +44,8 @@ const char vlc_module_name[] = MODULE_STRING;
 
 #include <limits.h>
 
+const char vlc_module_name[] = MODULE_STRING;
+
 static int exitcode = 0;
 
 static int OnLuaEventTriggered(vlc_object_t *obj, const char *name,

diff --git a/test/modules/misc/medialibrary.c b/test/modules/misc/medialibrary.c
@@ -28,7 +28,6 @@
 #define MODULE_NAME test_misc_medialibrary
 #define MODULE_STRING "test_misc_medialibrary"
 #undef VLC_DYNAMIC_PLUGIN
-const char vlc_module_name[] = MODULE_STRING;
 
 #include "../../libvlc/test.h"
 
@@ -45,6 +44,8 @@ const char vlc_module_name[] = MODULE_STRING;
 #include <vlc_media_library.h>
 #include <ftw.h>
 
+const char vlc_module_name[] = MODULE_STRING;
+
 static int exitcode = 0;
 
 static void ValidateThumbnail(void *data, const vlc_ml_event_t *event)

diff --git a/test/modules/stream_out/transcode.c b/test/modules/stream_out/transcode.c
@@ -29,10 +29,6 @@
 #define MODULE_STRING "test_transcode_mock"
 #undef VLC_DYNAMIC_PLUGIN
 
-static const char dec_dev_arg[] = "--dec-dev=" MODULE_STRING;
-
-const char vlc_module_name[] = MODULE_STRING;
-
 #include "../../libvlc/test.h"
 #include <vlc_common.h>
 #include <vlc_plugin.h>
@@ -50,6 +46,11 @@ const char vlc_module_name[] = MODULE_STRING;
 #include <limits.h>
 
 #include "transcode.h"
+
+static const char dec_dev_arg[] = "--dec-dev=" MODULE_STRING;
+
+const char vlc_module_name[] = MODULE_STRING;
+
 static size_t current_scenario = 0;
 
 static vlc_cond_t player_cond = VLC_STATIC_COND;

diff --git a/test/src/input/decoder/input_decoder.c b/test/src/input/decoder/input_decoder.c
@@ -29,8 +29,6 @@
 #define MODULE_STRING "test_input_decoder_mock"
 #undef VLC_DYNAMIC_PLUGIN
 
-const char vlc_module_name[] = MODULE_STRING;
-
 #include "../../../libvlc/test.h"
 #include <vlc_common.h>
 #include <vlc_plugin.h>
@@ -48,6 +46,9 @@ const char vlc_module_name[] = MODULE_STRING;
 #include <limits.h>
 
 #include "input_decoder.h"
+
+const char vlc_module_name[] = MODULE_STRING;
+
 static size_t current_scenario = 0;
 
 static vlc_cond_t player_cond = VLC_STATIC_COND;

diff --git a/test/src/misc/image.c b/test/src/misc/image.c
@@ -28,7 +28,6 @@
 #define MODULE_NAME test_misc_image
 #define MODULE_STRING "test_misc_image"
 #undef VLC_DYNAMIC_PLUGIN
-const char vlc_module_name[] = MODULE_STRING;
 
 #include "../../libvlc/test.h"
 
@@ -44,6 +43,8 @@ const char vlc_module_name[] = MODULE_STRING;
 
 #include <limits.h>
 
+const char vlc_module_name[] = MODULE_STRING;
+
 static atomic_bool encoder_opened = false;
 
 static int OpenIntf(vlc_object_t *root)

diff --git a/test/src/misc/image_cvpx.c b/test/src/misc/image_cvpx.c
@@ -28,7 +28,6 @@
 #define MODULE_NAME test_misc_image_cvpx
 #define MODULE_STRING "test_misc_image_cvpx"
 #undef VLC_DYNAMIC_PLUGIN
-const char vlc_module_name[] = MODULE_STRING;
 
 #include "../../libvlc/test.h"
 #include "../../../modules/codec/vt_utils.h"
@@ -43,6 +42,8 @@ const char vlc_module_name[] = MODULE_STRING;
 
 #include <limits.h>
 
+const char vlc_module_name[] = MODULE_STRING;
+
 static int OpenIntf(vlc_object_t *root)
 {
     image_handler_t *ih = image_HandlerCreate(root);

diff --git a/test/src/video_output/video_output.c b/test/src/video_output/video_output.c
@@ -29,10 +29,6 @@
 #define MODULE_STRING "test_vout_mock"
 #undef VLC_DYNAMIC_PLUGIN
 
-static const char dec_dev_arg[] = "--dec-dev=" MODULE_STRING;
-
-const char vlc_module_name[] = MODULE_STRING;
-
 #include "../../libvlc/test.h"
 #include <vlc_common.h>
 #include <vlc_plugin.h>
@@ -48,6 +44,11 @@ const char vlc_module_name[] = MODULE_STRING;
 #include <limits.h>
 
 #include "video_output.h"
+
+static const char dec_dev_arg[] = "--dec-dev=" MODULE_STRING;
+
+const char vlc_module_name[] = MODULE_STRING;
+
 static size_t current_scenario;
 
 static void DecoderDeviceClose(struct vlc_decoder_device *device)