X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f738ba3162349f5c5e9f87840049391a3928fff8..62f9057c5250b460384dd7d2e10d9b7bb2be3e5d:/testsuite/xbt/config_usage.c

diff --git a/testsuite/xbt/config_usage.c b/testsuite/xbt/config_usage.c
index d0c54883c6..88566848a0 100644
--- a/testsuite/xbt/config_usage.c
+++ b/testsuite/xbt/config_usage.c
@@ -2,83 +2,93 @@
 
 /* test config - test code to the config set */
 
+/* Copyright (c) 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. */
+
 #include <stdio.h>
-#include <gras.h>
+#include "gras.h"
 
 /*====[ Prototypes ]=========================================================*/
-gras_cfg_t *make_set(void); /* build a minimal set */
+xbt_cfg_t make_set(void); /* build a minimal set */
 
 /*====[ Code ]===============================================================*/
-gras_cfg_t *make_set(){
-  gras_cfg_t *set=NULL; 
-  gras_error_t errcode;
+xbt_cfg_t make_set(){
+  xbt_cfg_t set=NULL; 
+  xbt_error_t errcode;
 
-  TRYFAIL(gras_cfg_new(&set));
-  TRYFAIL(gras_cfg_register_str(set,"speed:1_to_2_int"));
-  TRYFAIL(gras_cfg_register_str(set,"hostname:1_to_1_string"));
-  TRYFAIL(gras_cfg_register_str(set,"user:1_to_10_string"));
+  set = xbt_cfg_new();
+  TRYFAIL(xbt_cfg_register_str(set,"speed:1_to_2_int"));
+  TRYFAIL(xbt_cfg_register_str(set,"hostname:1_to_1_string"));
+  TRYFAIL(xbt_cfg_register_str(set,"user:1_to_10_string"));
 
-  TRYFAIL(gras_cfg_set_parse(set, "hostname:veloce "
+  TRYFAIL(xbt_cfg_set_parse(set, "hostname:veloce "
 			     "user:mquinson\nuser:oaumage\tuser:alegrand"));
   return set;
 }
  
 int main(int argc, char **argv) {
-  gras_error_t errcode;
-  gras_cfg_t *set;
+  xbt_error_t errcode;
+  xbt_cfg_t set;
 
-  gras_dynar_t *dyn;
+  xbt_dynar_t dyn;
   char *str;
   int ival;
   
-  gras_init_defaultlog(&argc,argv,"config.thresh=debug root.thresh=info");
+  xbt_init_defaultlog(&argc,argv,"config.thresh=debug root.thresh=info");
 
   fprintf(stderr,"==== Alloc and free a config set.\n");
   set=make_set();
-  gras_cfg_dump("test set","",set);
-  gras_cfg_free(&set);
+  xbt_cfg_dump("test set","",set);
+  xbt_cfg_free(&set);
+  xbt_cfg_free(&set);
 
 
   fprintf(stderr,"==== Try to use an unregistered option. (ERROR EXPECTED: 'color' not registered)\n");
   set=make_set();
-  TRYEXPECT(mismatch_error,gras_cfg_set_parse(set,"color:blue"));
-  gras_cfg_free(&set);
+  TRYEXPECT(mismatch_error,xbt_cfg_set_parse(set,"color:blue"));
+  xbt_cfg_free(&set);
+  xbt_cfg_free(&set);
 
 
   fprintf(stderr,
 	  "==== Validation test. (ERROR EXPECTED: not enough values of 'speed')\n");
   set=make_set();
-  gras_cfg_check(set);
-  gras_cfg_free(&set);
-  gras_cfg_free(&set);
+  xbt_cfg_check(set);
+  xbt_cfg_free(&set);
+  xbt_cfg_free(&set);
 
   fprintf(stderr,"==== Validation test (ERROR EXPECTED: too many elements)\n");
   set=make_set();
-  gras_cfg_set_parse(set,"hostname:toto:42");
-  gras_cfg_set_parse(set,"speed:42 speed:24 speed:34");
-  gras_cfg_check(set);
-  gras_cfg_free(&set);
+  xbt_cfg_set_parse(set,"hostname:toto:42");
+  xbt_cfg_set_parse(set,"speed:42 speed:24 speed:34");
+  xbt_cfg_check(set);
+  xbt_cfg_free(&set);
+  xbt_cfg_free(&set);
 
   fprintf(stderr,"==== Get single value (Expected: 'speed value: 42')\n");
   set=make_set();
-  gras_cfg_set_parse(set,"hostname:toto:42 speed:42");
-  gras_cfg_get_int(set,"speed",&ival);
+  xbt_cfg_set_parse(set,"hostname:toto:42 speed:42");
+  xbt_cfg_get_int(set,"speed",&ival);
   fprintf(stderr,"speed value: %d\n",ival); 
-  gras_cfg_free(&set);
+  xbt_cfg_free(&set);
+  xbt_cfg_free(&set);
 
   fprintf(stderr,"==== Get multiple values (Expected: 'Count: 3; Options: mquinson;ecaron;alegrand;')\n");
   set=make_set();
-  gras_cfg_set_parse(set,"speed:42");
-  gras_cfg_check(set);
-  gras_cfg_get_dynar(set,"user",&dyn);
-  fprintf(stderr,"Count: %lu; Options: ",gras_dynar_length(dyn));
-  gras_dynar_foreach(dyn,ival,str) {
+  xbt_cfg_set_parse(set,"speed:42");
+  xbt_cfg_check(set);
+  xbt_cfg_get_dynar(set,"user",&dyn);
+  fprintf(stderr,"Count: %lu; Options: ",xbt_dynar_length(dyn));
+  xbt_dynar_foreach(dyn,ival,str) {
     fprintf(stderr,"%s;",str);
   }
   fprintf(stderr,"\n");
-  gras_cfg_free(&set);
+  xbt_cfg_free(&set);
+  xbt_cfg_free(&set);
 
-  gras_exit();
+  xbt_exit();
   return 0;
 }