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

diff --git a/testsuite/xbt/log_usage.c b/testsuite/xbt/log_usage.c
index 3a6f8644d6..199a857c8e 100644
--- a/testsuite/xbt/log_usage.c
+++ b/testsuite/xbt/log_usage.c
@@ -1,57 +1,46 @@
-// $Id$
-// Copyright (c) 2001, Bit Farm, Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-//    notice, this list of conditions and the following disclaimer in the
-//    documentation and/or other materials provided with the distribution.
-// 3. The name of the author may not be used to endorse or promote products
-//    derived from this software without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-// IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-// NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-/**
- *
- * Run it w/o arguments, and also try:
- *
- *    ./test_l4c Test.thresh=0
- *
- * which should print out the DEBUG message.
- *
- * 'make test' will run various test cases.
- *
- */
-
-#include <gras.h>
-#include <stdio.h>
-
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(Test, Top);
-GRAS_LOG_NEW_CATEGORY(Top);
-
-int main(int ac, char **av) {
-  gras_error_t errcode;
-
-  if (ac > 1) {
-    TRYFAIL(gras_log_control_set(av[1]));
-  } else {
-    TRYFAIL(gras_log_control_set("root.thresh=debug log.thresh=debug"));
-  }
+/* $Id$ */
+
+/* log_usage - A test of normal usage of the log facilities                 */
+
+/* Copyright (c) 2003, 2004 Martin Quinson. 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. */
+ 
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#include "gras.h"
+
+
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(test, top,"Logging specific to this test");
+XBT_LOG_NEW_CATEGORY(top,"Useless test channel");
+
+#ifdef __BORLANDC__
+#pragma argsused
+#endif
+
+static void dolog(const char *settings) {
+  INFO1("Test with the settings '%s'",settings);
+  xbt_log_control_set(settings);
   DEBUG1("val=%d", 1);
-  WARNING1("val=%d", 2);
-  CDEBUG2(Top, "val=%d%s", 3, "!");
-  CRITICAL6("false alarm%s%s%s%s%s%s", "","","","","","!");
+  WARN1("val=%d", 2);
+  CDEBUG2(top, "val=%d%s", 3, "!");
+  CRITICAL6("false alarm%s%s%s%s%s%s", "","","","","","!");   
+}
+
+
+int main(int argc, char **argv) {
+  xbt_init(&argc,argv);
+
+  dolog("");
+  dolog("test.thres:info root.thres:info");
+  dolog("test.thres:debug");
+  dolog("test.thres:verbose root.thres:error");
+  dolog("test.thres:critical");
   
+  xbt_exit();
   return 0;
 }