[vlc-commits] tests: rename log() to test_log()
Thomas Guillem
git at videolan.org
Wed Oct 3 13:30:08 CEST 2018
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Oct 3 13:26:19 2018 +0200| [b0cd7eb6fa52bc607a317b0369de3839d617b030] | committer: Thomas Guillem
tests: rename log() to test_log()
This fixes conflict with math.h:
"A macro called log was already defined when <math.h> was included.
This will cause compilation problems."
This will happen with the new player test, that includes vlc_viewpoint.h that
includes math.h
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b0cd7eb6fa52bc607a317b0369de3839d617b030
---
test/libvlc/core.c | 4 ++--
test/libvlc/equalizer.c | 22 +++++++++++-----------
test/libvlc/media.c | 24 ++++++++++++------------
test/libvlc/media_discoverer.c | 18 +++++++++---------
test/libvlc/media_list.c | 2 +-
test/libvlc/media_list_player.c | 22 +++++++++++-----------
test/libvlc/media_player.c | 10 +++++-----
test/libvlc/meta.c | 4 ++--
test/libvlc/renderer_discoverer.c | 20 ++++++++++----------
test/libvlc/test.h | 2 +-
test/src/config/chain.c | 8 ++++----
test/src/input/stream.c | 14 +++++++-------
test/src/misc/variables.c | 24 ++++++++++++------------
13 files changed, 87 insertions(+), 87 deletions(-)
diff --git a/test/libvlc/core.c b/test/libvlc/core.c
index b7fe646cd3..2e37a57ac5 100644
--- a/test/libvlc/core.c
+++ b/test/libvlc/core.c
@@ -29,7 +29,7 @@ static void test_core (const char ** argv, int argc)
{
libvlc_instance_t *vlc;
- log ("Testing core\n");
+ test_log ("Testing core\n");
vlc = libvlc_new (argc, argv);
assert (vlc != NULL);
@@ -57,7 +57,7 @@ static void test_audiovideofilterlists (const char ** argv, int argc)
{
libvlc_instance_t *vlc;
- log ("Testing libvlc_(audio|video)_filter_list_get()\n");
+ test_log ("Testing libvlc_(audio|video)_filter_list_get()\n");
vlc = libvlc_new (argc, argv);
assert (vlc != NULL);
diff --git a/test/libvlc/equalizer.c b/test/libvlc/equalizer.c
index d260230bc0..09c496853f 100644
--- a/test/libvlc/equalizer.c
+++ b/test/libvlc/equalizer.c
@@ -14,7 +14,7 @@ static void test_equalizer (const char ** argv, int argc)
libvlc_equalizer_t *equalizer;
unsigned u_presets, u_bands;
- log ("Testing equalizer\n");
+ test_log ("Testing equalizer\n");
vlc = libvlc_new (argc, argv);
assert (NULL != vlc);
@@ -24,7 +24,7 @@ static void test_equalizer (const char ** argv, int argc)
// presets
- log ("Testing equalizer presets\n");
+ test_log ("Testing equalizer presets\n");
u_presets = libvlc_audio_equalizer_get_preset_count();
assert (u_presets > 0);
@@ -46,7 +46,7 @@ static void test_equalizer (const char ** argv, int argc)
// bands
- log ("Testing equalizer bands\n");
+ test_log ("Testing equalizer bands\n");
u_bands = libvlc_audio_equalizer_get_band_count();
assert (u_bands > 0);
@@ -60,7 +60,7 @@ static void test_equalizer (const char ** argv, int argc)
// initialisation
- log ("Testing equalizer initialisation\n");
+ test_log ("Testing equalizer initialisation\n");
equalizer = libvlc_audio_equalizer_new();
assert (equalizer);
@@ -72,7 +72,7 @@ static void test_equalizer (const char ** argv, int argc)
// preamp (range -20.0 to 20.0)
- log ("Testing equalizer preamp\n");
+ test_log ("Testing equalizer preamp\n");
assert (0 == libvlc_audio_equalizer_set_preamp (equalizer, 19.9f));
assert (libvlc_audio_equalizer_get_preamp(equalizer) == 19.9f);
@@ -94,7 +94,7 @@ static void test_equalizer (const char ** argv, int argc)
// amp at index (range -20.0 to 20.0)
- log ("Testing equalizer amp at index\n");
+ test_log ("Testing equalizer amp at index\n");
for (unsigned i = 0; i < u_bands; i++)
{
@@ -124,20 +124,20 @@ static void test_equalizer (const char ** argv, int argc)
// no equalizer
- log ("Testing release NULL\n");
+ test_log ("Testing release NULL\n");
libvlc_audio_equalizer_release (NULL);
// media player
- log ("Testing set equalizer\n");
+ test_log ("Testing set equalizer\n");
assert (0 == libvlc_media_player_set_equalizer(mp, NULL));
assert (0 == libvlc_media_player_set_equalizer(mp, equalizer));
// maximum string length (test string concatenation)
- log ("Testing equalizer-bands string limit\n");
+ test_log ("Testing equalizer-bands string limit\n");
for (unsigned i = 0; i < u_bands; i++)
assert (0 == libvlc_audio_equalizer_set_amp_at_index (equalizer, -19.1234567f, i));
@@ -146,11 +146,11 @@ static void test_equalizer (const char ** argv, int argc)
// cleanup
- log ("Testing equalizer cleanup\n");
+ test_log ("Testing equalizer cleanup\n");
libvlc_audio_equalizer_release (equalizer);
- log ("Finished testing equalizer\n");
+ test_log ("Finished testing equalizer\n");
libvlc_media_player_release (mp);
diff --git a/test/libvlc/media.c b/test/libvlc/media.c
index 5e20177a6a..90d4584127 100644
--- a/test/libvlc/media.c
+++ b/test/libvlc/media.c
@@ -49,7 +49,7 @@ static void print_media(libvlc_media_t *media)
for (unsigned i = 0; i < i_count; ++i)
{
libvlc_media_track_t *p_track = pp_tracks[i];
- log("\ttrack(%d/%d): codec: %4.4s/%4.4s, ", i, p_track->i_id,
+ test_log("\ttrack(%d/%d): codec: %4.4s/%4.4s, ", i, p_track->i_id,
(const char *)&p_track->i_codec,
(const char *)&p_track->i_original_fourcc);
switch (p_track->i_type)
@@ -77,14 +77,14 @@ static void print_media(libvlc_media_t *media)
libvlc_media_tracks_release(pp_tracks, i_count);
}
else
- log("\tmedia doesn't have any tracks\n");
+ test_log("\tmedia doesn't have any tracks\n");
for (enum libvlc_meta_t i = libvlc_meta_Title;
i <= libvlc_meta_DiscTotal; ++i)
{
char *psz_meta = libvlc_media_get_meta(media, i);
if (psz_meta != NULL)
- log("\tmeta(%d): '%s'\n", i, psz_meta);
+ test_log("\tmeta(%d): '%s'\n", i, psz_meta);
free(psz_meta);
}
}
@@ -94,8 +94,8 @@ static void test_media_preparsed(libvlc_instance_t *vlc, const char *path,
libvlc_media_parse_flag_t parse_flags,
libvlc_media_parsed_status_t i_expected_status)
{
- log ("test_media_preparsed: %s, expected: %d\n", path ? path : location,
- i_expected_status);
+ test_log ("test_media_preparsed: %s, expected: %d\n", path ? path : location,
+ i_expected_status);
libvlc_media_t *media;
if (path != NULL)
@@ -141,7 +141,7 @@ static void input_item_preparse_timeout( input_item_t *item,
static void test_input_metadata_timeout(libvlc_instance_t *vlc, int timeout,
int wait_and_cancel)
{
- log ("test_input_metadata_timeout: timeout: %d, wait_and_cancel: %d ms\n",
+ test_log ("test_input_metadata_timeout: timeout: %d, wait_and_cancel: %d ms\n",
timeout, wait_and_cancel);
int i_ret, p_pipe[2];
@@ -217,7 +217,7 @@ static void subitem_added(const libvlc_event_t *event, void *user_data)
const char *file = strrchr (mrl, FILE_SEPARATOR);
assert (file);
file++;
- log ("subitem_added, file: %s\n", file);
+ test_log ("subitem_added, file: %s\n", file);
for (unsigned i = 0; i < TEST_SUBITEMS_COUNT; ++i)
{
@@ -274,7 +274,7 @@ static void test_media_subitems_media(libvlc_media_t *media, bool play,
for (unsigned i = 0; i < TEST_SUBITEMS_COUNT; ++i)
{
- log ("test if %s was added\n", test_media_subitems_list[i].file);
+ test_log ("test if %s was added\n", test_media_subitems_list[i].file);
assert (subitems_found[i]);
}
}
@@ -285,7 +285,7 @@ static void test_media_subitems(libvlc_instance_t *vlc)
libvlc_media_t *media;
- log ("Testing media_subitems: path: '%s'\n", subitems_path);
+ test_log ("Testing media_subitems: path: '%s'\n", subitems_path);
media = libvlc_media_new_path (vlc, subitems_path);
assert (media != NULL);
test_media_subitems_media (media, false, true);
@@ -299,7 +299,7 @@ static void test_media_subitems(libvlc_instance_t *vlc)
{
char *location;
assert (asprintf (&location, "%s%s", schemes[i], subitems_realpath) != -1);
- log ("Testing media_subitems: location: '%s'\n", location);
+ test_log ("Testing media_subitems: location: '%s'\n", location);
media = libvlc_media_new_location (vlc, location);
assert (media != NULL);
test_media_subitems_media (media, false, true);
@@ -311,7 +311,7 @@ static void test_media_subitems(libvlc_instance_t *vlc)
#ifdef HAVE_OPENAT
/* listing directory via a fd works only if HAVE_OPENAT is defined */
int fd = open (subitems_path, O_RDONLY);
- log ("Testing media_subitems: fd: '%d'\n", fd);
+ test_log ("Testing media_subitems: fd: '%d'\n", fd);
assert (fd >= 0);
media = libvlc_media_new_fd (vlc, fd);
assert (media != NULL);
@@ -322,7 +322,7 @@ static void test_media_subitems(libvlc_instance_t *vlc)
#warning not testing subitems list via a fd location
#endif
- log ("Testing media_subitems failure\n");
+ test_log ("Testing media_subitems failure\n");
media = libvlc_media_new_location (vlc, "wrongfile://test");
assert (media != NULL);
test_media_subitems_media (media, false, false);
diff --git a/test/libvlc/media_discoverer.c b/test/libvlc/media_discoverer.c
index 3ab3d82549..dde3b94a16 100644
--- a/test/libvlc/media_discoverer.c
+++ b/test/libvlc/media_discoverer.c
@@ -28,8 +28,8 @@ ml_item_event(const struct libvlc_event_t *p_ev, const char *psz_event)
char *psz_mrl = libvlc_media_get_mrl(p_ev->u.media_list_item_added.item);
assert(psz_mrl);
- log("item %s(%d): '%s'\n", psz_event, p_ev->u.media_list_item_added.index,
- psz_mrl);
+ test_log("item %s(%d): '%s'\n", psz_event,
+ p_ev->u.media_list_item_added.index, psz_mrl);
free(psz_mrl);
}
@@ -50,7 +50,7 @@ ml_item_deleted(const struct libvlc_event_t *p_ev, void *p_data)
static void
test_discoverer(libvlc_instance_t *p_vlc, const char *psz_name, bool b_wait)
{
- log("creating and starting discoverer %s\n", psz_name);
+ test_log("creating and starting discoverer %s\n", psz_name);
libvlc_media_discoverer_t *p_md =
libvlc_media_discoverer_new(p_vlc, psz_name);
@@ -72,14 +72,14 @@ test_discoverer(libvlc_instance_t *p_vlc, const char *psz_name, bool b_wait)
if (libvlc_media_discoverer_start(p_md) == -1)
{
- log("warn: could not start md (not critical)\n");
+ test_log("warn: could not start md (not critical)\n");
}
else
{
assert(libvlc_media_discoverer_is_running(p_md));
if (b_wait)
{
- log("Press any keys to stop\n");
+ test_log("Press any keys to stop\n");
getchar();
}
libvlc_media_discoverer_stop(p_md);
@@ -117,14 +117,14 @@ main(int i_argc, char *ppsz_argv[])
for(libvlc_media_discoverer_category_t i_cat = libvlc_media_discoverer_devices;
i_cat <= libvlc_media_discoverer_localdirs; i_cat ++)
{
- log("== getting list of media_discoverer for %d category ==\n", i_cat);
+ test_log("== getting list of media_discoverer for %d category ==\n", i_cat);
libvlc_media_discoverer_description_t **pp_services;
ssize_t i_count =
libvlc_media_discoverer_list_get(p_vlc, i_cat, &pp_services);
if (i_count <= 0)
{
- log("warn: no discoverers (not critical)\n");
+ test_log("warn: no discoverers (not critical)\n");
continue;
}
assert(pp_services != NULL);
@@ -134,8 +134,8 @@ main(int i_argc, char *ppsz_argv[])
libvlc_media_discoverer_description_t *p_service = pp_services[i];
assert(i_cat == p_service->i_cat);
- log("= discoverer: name: '%s', longname: '%s' =\n",
- p_service->psz_name, p_service->psz_longname);
+ test_log("= discoverer: name: '%s', longname: '%s' =\n",
+ p_service->psz_name, p_service->psz_longname);
#if 0
if (!strncasecmp(p_service->psz_name, "podcast", 7)
diff --git a/test/libvlc/media_list.c b/test/libvlc/media_list.c
index 743390a2c8..59376c6e2a 100644
--- a/test/libvlc/media_list.c
+++ b/test/libvlc/media_list.c
@@ -30,7 +30,7 @@ static void test_media_list (const char ** argv, int argc)
libvlc_media_list_t *ml;
int ret;
- log ("Testing media_list\n");
+ test_log ("Testing media_list\n");
vlc = libvlc_new (argc, argv);
assert (vlc != NULL);
diff --git a/test/libvlc/media_list_player.c b/test/libvlc/media_list_player.c
index 7156212a59..9cb814e8f6 100644
--- a/test/libvlc/media_list_player.c
+++ b/test/libvlc/media_list_player.c
@@ -90,18 +90,18 @@ static void check_items_order_callback(const libvlc_event_t * p_event, void * us
if (checks->items[checks->index] != md)
{
char *title = libvlc_media_get_meta(md, libvlc_meta_Title);
- log ("Got items %s\n", title);
+ test_log ("Got items %s\n", title);
free(title);
}
assert(checks->items[checks->index] == md);
char *title = libvlc_media_get_meta(md, libvlc_meta_Title);
- log ("Item %d '%s' was correctly queued\n", checks->index, title);
+ test_log ("Item %d '%s' was correctly queued\n", checks->index, title);
free(title);
if (checks->index == (checks->count - 1))
{
- log ("Done playing with success\n");
+ test_log ("Done playing with success\n");
checks->done_playing = true;
}
checks->index++;
@@ -116,7 +116,7 @@ static void test_media_list_player_items_queue(const char** argv, int argc)
const char * file = test_default_sample;
- log ("Testing media player item queue-ing\n");
+ test_log ("Testing media player item queue-ing\n");
vlc = libvlc_new (argc, argv);
assert (vlc != NULL);
@@ -181,7 +181,7 @@ static void test_media_list_player_previous(const char** argv, int argc)
const char * file = test_default_sample;
- log ("Testing media player previous()\n");
+ test_log ("Testing media player previous()\n");
vlc = libvlc_new (argc, argv);
assert (vlc != NULL);
@@ -240,7 +240,7 @@ static void test_media_list_player_next(const char** argv, int argc)
const char * file = test_default_sample;
- log ("Testing media player next()\n");
+ test_log ("Testing media player next()\n");
vlc = libvlc_new (argc, argv);
assert (vlc != NULL);
@@ -299,7 +299,7 @@ static void test_media_list_player_pause_stop(const char** argv, int argc)
const char * file = test_default_sample;
- log ("Testing play and pause of %s using the media list.\n", file);
+ test_log ("Testing play and pause of %s using the media list.\n", file);
vlc = libvlc_new (argc, argv);
assert (vlc != NULL);
@@ -339,7 +339,7 @@ static void test_media_list_player_play_item_at_index(const char** argv, int arg
const char * file = test_default_sample;
- log ("Testing play_item_at_index of %s using the media list.\n", file);
+ test_log ("Testing play_item_at_index of %s using the media list.\n", file);
vlc = libvlc_new (argc, argv);
assert (vlc != NULL);
@@ -386,7 +386,7 @@ static void test_media_list_player_playback_options (const char** argv, int argc
const char * file = test_default_sample;
- log ("Testing media player playback options()\n");
+ test_log ("Testing media player playback options()\n");
vlc = libvlc_new (argc, argv);
assert (vlc != NULL);
@@ -490,7 +490,7 @@ static void test_media_list_player_playback_options (const char** argv, int argc
sched_yield();
// Test looping playback mode
- log ("Testing media player playback option - Loop\n");
+ test_log ("Testing media player playback option - Loop\n");
libvlc_media_list_player_set_playback_mode(mlp, libvlc_playback_mode_loop);
libvlc_media_list_player_play_item (mlp, md);
@@ -500,7 +500,7 @@ static void test_media_list_player_playback_options (const char** argv, int argc
stop_and_wait (mlp);
// Test repeat playback mode
- log ("Testing media player playback option - Repeat\n");
+ test_log ("Testing media player playback option - Repeat\n");
libvlc_media_list_player_set_playback_mode(mlp, libvlc_playback_mode_repeat);
libvlc_media_list_player_play_item (mlp, md);
diff --git a/test/libvlc/media_player.c b/test/libvlc/media_player.c
index f3198b5bcf..29b8c72c0c 100644
--- a/test/libvlc/media_player.c
+++ b/test/libvlc/media_player.c
@@ -97,7 +97,7 @@ static void test_media_player_set_media(const char** argv, int argc)
{
const char * file = test_default_sample;
- log ("Testing set_media\n");
+ test_log ("Testing set_media\n");
libvlc_instance_t *vlc = libvlc_new (argc, argv);
assert (vlc != NULL);
@@ -128,7 +128,7 @@ static void test_media_player_play_stop(const char** argv, int argc)
libvlc_media_player_t *mi;
const char * file = test_default_sample;
- log ("Testing play and pause of %s\n", file);
+ test_log ("Testing play and pause of %s\n", file);
vlc = libvlc_new (argc, argv);
assert (vlc != NULL);
@@ -157,7 +157,7 @@ static void test_media_player_pause_stop(const char** argv, int argc)
libvlc_media_player_t *mi;
const char * file = test_default_sample;
- log ("Testing pause and stop of %s\n", file);
+ test_log ("Testing pause and stop of %s\n", file);
vlc = libvlc_new (argc, argv);
assert (vlc != NULL);
@@ -174,12 +174,12 @@ static void test_media_player_pause_stop(const char** argv, int argc)
test_role(mi);
libvlc_media_player_play (mi);
- log ("Waiting for playing\n");
+ test_log ("Waiting for playing\n");
wait_playing (mi);
test_audio_video(mi);
libvlc_media_player_set_pause (mi, true);
- log ("Waiting for pause\n");
+ test_log ("Waiting for pause\n");
wait_paused (mi);
test_audio_video(mi);
diff --git a/test/libvlc/meta.c b/test/libvlc/meta.c
index aa29c98406..911577fa78 100644
--- a/test/libvlc/meta.c
+++ b/test/libvlc/meta.c
@@ -32,7 +32,7 @@ static void test_meta (const char ** argv, int argc)
libvlc_media_t *media;
char * artist;
- log ("Testing meta\n");
+ test_log ("Testing meta\n");
vlc = libvlc_new (argc, argv);
assert (vlc != NULL);
@@ -47,7 +47,7 @@ static void test_meta (const char ** argv, int argc)
const char *expected_artist = "mike";
assert (artist);
- log ("+ got '%s' as Artist, expecting %s\n", artist, expected_artist);
+ test_log ("+ got '%s' as Artist, expecting %s\n", artist, expected_artist);
int string_compare = strcmp (artist, expected_artist);
assert (!string_compare);
diff --git a/test/libvlc/renderer_discoverer.c b/test/libvlc/renderer_discoverer.c
index aa60d99b8e..286198db70 100644
--- a/test/libvlc/renderer_discoverer.c
+++ b/test/libvlc/renderer_discoverer.c
@@ -25,9 +25,9 @@
static void
item_event(const libvlc_renderer_item_t *p_item, const char *psz_event)
{
- log("item %s: name: '%s', type: '%s', flags: 0x%X\n", psz_event,
- libvlc_renderer_item_name(p_item), libvlc_renderer_item_type(p_item),
- libvlc_renderer_item_flags(p_item));
+ test_log("item %s: name: '%s', type: '%s', flags: 0x%X\n", psz_event,
+ libvlc_renderer_item_name(p_item), libvlc_renderer_item_type(p_item),
+ libvlc_renderer_item_flags(p_item));
}
static void
@@ -47,7 +47,7 @@ renderer_discoverer_item_deleted(const struct libvlc_event_t *p_ev, void *p_data
static void
test_discoverer(libvlc_instance_t *p_vlc, const char *psz_name)
{
- log("creating and starting discoverer %s\n", psz_name);
+ test_log("creating and starting discoverer %s\n", psz_name);
libvlc_renderer_discoverer_t *p_rd =
libvlc_renderer_discoverer_new(p_vlc, psz_name);
@@ -66,11 +66,11 @@ test_discoverer(libvlc_instance_t *p_vlc, const char *psz_name)
if (libvlc_renderer_discoverer_start(p_rd) == -1)
{
- log("warn: could not start md (not critical)\n");
+ test_log("warn: could not start md (not critical)\n");
}
else
{
- log("Press any keys to stop\n");
+ test_log("Press any keys to stop\n");
getchar();
libvlc_renderer_discoverer_stop(p_rd);
}
@@ -98,14 +98,14 @@ main(int i_argc, char *ppsz_argv[])
return 0;
}
- log("== getting the list of renderer_discoverer ==\n");
+ test_log("== getting the list of renderer_discoverer ==\n");
libvlc_rd_description_t **pp_services;
ssize_t i_count =
libvlc_renderer_discoverer_list_get(p_vlc, &pp_services);
if (i_count <= 0)
{
- log("warn: no discoverers (not critical)\n");
+ test_log("warn: no discoverers (not critical)\n");
goto end;
}
assert(pp_services != NULL);
@@ -114,8 +114,8 @@ main(int i_argc, char *ppsz_argv[])
{
libvlc_rd_description_t *p_service = pp_services[i];
- log("= discoverer: name: '%s', longname: '%s' =\n",
- p_service->psz_name, p_service->psz_longname);
+ test_log("= discoverer: name: '%s', longname: '%s' =\n",
+ p_service->psz_name, p_service->psz_longname);
}
libvlc_renderer_discoverer_list_release(pp_services, i_count);
diff --git a/test/libvlc/test.h b/test/libvlc/test.h
index 62e260fd89..7be53e1417 100644
--- a/test/libvlc/test.h
+++ b/test/libvlc/test.h
@@ -63,7 +63,7 @@ static const char test_default_video[] = SRCDIR"/samples/image.jpg";
* Some useful common functions
*/
-#define log( ... ) printf( "testapi: " __VA_ARGS__ );
+#define test_log( ... ) printf( "testapi: " __VA_ARGS__ );
static inline void test_init (void)
{
diff --git a/test/src/config/chain.c b/test/src/config/chain.c
index 27f39d01ca..59e26c15b4 100644
--- a/test/src/config/chain.c
+++ b/test/src/config/chain.c
@@ -181,13 +181,13 @@ static void test_config_ChainDuplicate()
int main( void )
{
- log( "Testing config chain escaping\n" );
+ test_log( "Testing config chain escaping\n" );
test_config_StringEscape();
- log( "Testing config chain un-escaping\n" );
+ test_log( "Testing config chain un-escaping\n" );
test_config_StringUnEscape();
- log( "Testing config_ChainCreate()\n" );
+ test_log( "Testing config_ChainCreate()\n" );
test_config_ChainCreate();
- log( "Testing config_ChainDuplicate()\n" );
+ test_log( "Testing config_ChainDuplicate()\n" );
test_config_ChainDuplicate();
return 0;
diff --git a/test/src/input/stream.c b/test/src/input/stream.c
index a1b38808a7..86adbbae21 100644
--- a/test/src/input/stream.c
+++ b/test/src/input/stream.c
@@ -234,8 +234,8 @@ read_at( struct reader **pp_readers, unsigned int i_readers,
const uint8_t *p_peek = NULL;
struct reader *p_reader = pp_readers[i];
- log( "%s: %s %zu @ %"PRIu64" (size: %" PRIu64 ")\n", p_reader->psz_name,
- p_buf ? "read" : "peek", i_read, i_offset, i_size );
+ test_log( "%s: %s %zu @ %"PRIu64" (size: %" PRIu64 ")\n", p_reader->psz_name,
+ p_buf ? "read" : "peek", i_read, i_offset, i_size );
assert( p_reader->pf_seek( p_reader, i_offset ) != -1 );
i_last_pos = p_reader->pf_tell( p_reader );
@@ -301,7 +301,7 @@ test( struct reader **pp_readers, unsigned int i_readers, const char *psz_md5 )
i_size = pp_readers[0]->pf_getsize( pp_readers[0] );
assert( i_size > 0 );
- log( "stream size: %"PRIu64"\n", i_size );
+ test_log( "stream size: %"PRIu64"\n", i_size );
for( unsigned int i = 1; i < i_readers; ++i )
assert( pp_readers[i]->pf_getsize( pp_readers[i] ) == i_size );
@@ -374,10 +374,10 @@ main( void )
char *psz_url;
int i_tmp_fd;
- log( "Generating random file...\n" );
+ test_log( "Generating random file...\n" );
i_tmp_fd = vlc_mkstemp( psz_tmp_path );
fill_rand( i_tmp_fd, RAND_FILE_SIZE );
- log( "Testing random file with libc, and stream...\n" );
+ test_log( "Testing random file with libc, and stream...\n" );
assert( i_tmp_fd != -1 );
assert( asprintf( &psz_url, "file://%s", psz_tmp_path ) != -1 );
@@ -392,11 +392,11 @@ main( void )
close( i_tmp_fd );
#else
- log( "Testing http url with stream...\n" );
+ test_log( "Testing http url with stream...\n" );
alarm( 0 );
if( !( pp_readers[0] = stream_open( HTTP_URL ) ) )
{
- log( "WARNING: can't test http url" );
+ test_log( "WARNING: can't test http url" );
return 0;
}
diff --git a/test/src/misc/variables.c b/test/src/misc/variables.c
index 24080b83be..1fd0914dc4 100644
--- a/test/src/misc/variables.c
+++ b/test/src/misc/variables.c
@@ -450,37 +450,37 @@ static void test_variables( libvlc_instance_t *p_vlc )
libvlc_int_t *p_libvlc = p_vlc->p_libvlc_int;
srand( time( NULL ) );
- log( "Testing for integers\n" );
+ test_log( "Testing for integers\n" );
test_integer( p_libvlc );
- log( "Testing for booleans\n" );
+ test_log( "Testing for booleans\n" );
test_booleans( p_libvlc );
- log( "Testing for floats\n" );
+ test_log( "Testing for floats\n" );
test_floats( p_libvlc );
- log( "Testing for rationals\n" );
+ test_log( "Testing for rationals\n" );
test_fracts( p_libvlc );
- log( "Testing for strings\n" );
+ test_log( "Testing for strings\n" );
test_strings( p_libvlc );
- log( "Testing for addresses\n" );
+ test_log( "Testing for addresses\n" );
test_address( p_libvlc );
- log( "Testing the callbacks\n" );
+ test_log( "Testing the callbacks\n" );
test_callbacks( p_libvlc );
- log( "Testing the limits\n" );
+ test_log( "Testing the limits\n" );
test_limits( p_libvlc );
- log( "Testing choices\n" );
+ test_log( "Testing choices\n" );
test_choices( p_libvlc );
- log( "Testing var_Change()\n" );
+ test_log( "Testing var_Change()\n" );
test_change( p_libvlc );
- log( "Testing type at creation\n" );
+ test_log( "Testing type at creation\n" );
test_creation_and_type( p_libvlc );
}
@@ -491,7 +491,7 @@ int main( void )
test_init();
- log( "Testing the core variables\n" );
+ test_log( "Testing the core variables\n" );
p_vlc = libvlc_new( test_defaults_nargs, test_defaults_args );
assert( p_vlc != NULL );
More information about the vlc-commits
mailing list