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

diff --git a/testsuite/xbt/log_usage.c b/testsuite/xbt/log_usage.c
index 3e5813e5ec..ebc77e469a 100644
--- a/testsuite/xbt/log_usage.c
+++ b/testsuite/xbt/log_usage.c
@@ -1,6 +1,7 @@
 /* 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-2012. 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. */
@@ -9,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__
@@ -22,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", "", "", "", "", "", "!");
 }
 
 
@@ -42,6 +42,5 @@ int main(int argc, char **argv)
   dolog(" test.thres:verbose root.thres:error ");
   dolog(" test.thres:critical ");
 
-  xbt_exit();
   return 0;
 }