Changeset 41b985f for tests/src/utils/test-log.c

Timestamp:

Mar 12, 2017, 11:26:24 AM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

bde49c4a

Parents:

71f2e5f (diff), 67b6618 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 'origin/master' into sampler

Conflicts:

.travis.yml
Makefile
examples/aubionotes.c
examples/parse_args.h
python/demos/demo_timestretch_online.py
python/lib/moresetuptools.py
python/tests/test_source.py
setup.py
src/io/source.c

File:

• tests/src/utils/test-log.c (modified) (4 diffs)

tests/src/utils/test-log.c

@@ -10 +10 @@
 void logging(int level, const char_t *message, void *data) {
   FILE *out;
-  fprintf(stdout, "using custom logging function\n");
+  //fprintf(stdout, "using custom logging function\n");
   if (level == AUBIO_LOG_ERR) {
     out = stderr;
@@ -26 +26 @@
   fprintf(stdout, "### testing normal logging\n");
   AUBIO_ERR("testing normal AUBIO_LOG_ERR\n");
+  AUBIO_INF("testing normal AUBIO_LOG_INF\n");
   AUBIO_WRN("testing normal AUBIO_LOG_WRN\n");
   AUBIO_MSG("testing normal AUBIO_LOG_MSG\n");
@@ -32 +33 @@
   fprintf(stdout, "### testing with one custom function\n");
   aubio_log_set_function(logging, (void *)hdr);
-  AUBIO_ERR("testing recustom AUBIO_LOG_ERR\n");
-  AUBIO_WRN("testing recustom AUBIO_LOG_WRN\n");
-  AUBIO_MSG("testing recustom AUBIO_LOG_MSG\n");
-  AUBIO_DBG("testing recustom AUBIO_LOG_DBG\n");
+  AUBIO_ERR("testing custom set_function AUBIO_LOG_ERR\n");
+  AUBIO_INF("testing custom set_function AUBIO_LOG_INF\n");
+  AUBIO_WRN("testing custom set_function AUBIO_LOG_WRN\n");
+  AUBIO_MSG("testing custom set_function AUBIO_LOG_MSG\n");
+  AUBIO_DBG("testing custom set_function AUBIO_LOG_DBG\n");
 
   fprintf(stdout, "### testing resetted logging\n");
   aubio_log_reset();
-  AUBIO_ERR("testing uncustom AUBIO_LOG_ERR\n");
-  AUBIO_WRN("testing uncustom AUBIO_LOG_WRN\n");
-  AUBIO_MSG("testing uncustom AUBIO_LOG_MSG\n");
-  AUBIO_DBG("testing uncustom AUBIO_LOG_DBG\n");
+  AUBIO_ERR("testing again normal AUBIO_LOG_ERR\n");
+  AUBIO_INF("testing again normal AUBIO_LOG_INF\n");
+  AUBIO_WRN("testing again normal AUBIO_LOG_WRN\n");
+  AUBIO_MSG("testing again normal AUBIO_LOG_MSG\n");
+  AUBIO_DBG("testing again normal AUBIO_LOG_DBG\n");
 
   fprintf(stdout, "### testing per level customization\n");
@@ -48 +51 @@
   aubio_log_set_level_function(AUBIO_LOG_WRN, logging, NULL);
   aubio_log_set_level_function(AUBIO_LOG_MSG, logging, (void *)hdr);
-  AUBIO_ERR("testing custom AUBIO_LOG_ERR\n");
-  AUBIO_WRN("testing custom AUBIO_LOG_WRN with data=NULL\n");
-  AUBIO_MSG("testing custom AUBIO_LOG_MSG\n");
-  AUBIO_DBG("testing uncustomized AUBIO_LOG_DBG\n");
+  AUBIO_ERR("testing custom set_level_function AUBIO_LOG_ERR\n");
+  AUBIO_INF("testing again normal AUBIO_LOG_INF\n");
+  AUBIO_WRN("testing custom set_level_function AUBIO_LOG_WRN with data=NULL\n");
+  AUBIO_MSG("testing custom set_level_function AUBIO_LOG_MSG\n");
+  AUBIO_DBG("testing again normal AUBIO_LOG_DBG\n");
 
   return 0;