X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..ae1a96602f9cd542605cc31c7addf82494cbf4c4:/testsuite/xbt/log_usage.c

diff --git a/testsuite/xbt/log_usage.c b/testsuite/xbt/log_usage.c
index 5be8fbd043..0f32252fde 100644
--- a/testsuite/xbt/log_usage.c
+++ b/testsuite/xbt/log_usage.c
@@ -1,8 +1,7 @@
-/* $Id$ */
-
 /* log_usage - A test of normal usage of the log facilities                 */
 
-/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
+/* Copyright (c) 2004-2007, 2009-2013. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -11,11 +10,10 @@
 #pragma hdrstop
 #endif
 
-#include "gras.h"
-
+#include "xbt.h"
 
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(test, top, "Logging specific to this test");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(test, top,
+                                "Logging specific to this test");
 XBT_LOG_NEW_CATEGORY(top, "Useless test channel");
 
 #ifdef __BORLANDC__
@@ -24,12 +22,12 @@ XBT_LOG_NEW_CATEGORY(top, "Useless test channel");
 
 static void dolog(const char *settings)
 {
-  INFO1("Test with the settings '%s'", settings);
+  XBT_INFO("Test with the settings '%s'", settings);
   xbt_log_control_set(settings);
-  DEBUG1("val=%d", 1);
-  WARN1("val=%d", 2);
-  CDEBUG2(top, "val=%d%s", 3, "!");
-  CRITICAL6("false alarm%s%s%s%s%s%s", "", "", "", "", "", "!");
+  XBT_DEBUG("val=%d", 1);
+  XBT_WARN("val=%d", 2);
+  XBT_CDEBUG(top, "val=%d%s", 3, "!");
+  XBT_CRITICAL("false alarm%s%s%s%s%s%s", "", "", "", "", "", "!");
 }
 
 
@@ -40,10 +38,11 @@ int main(int argc, char **argv)
   dolog("");
   dolog(" ");
   dolog(" test.thres:info root.thres:info  ");
+#ifndef NDEBUG
   dolog(" test.thres:debug ");
+#endif
   dolog(" test.thres:verbose root.thres:error ");
   dolog(" test.thres:critical ");
 
-  xbt_exit();
   return 0;
 }