fix some (c) dates; do test the local version of gras, not the installed one; cleanup...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@603 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/testsuite/xbt/config_usage.c b/testsuite/xbt/config_usage.c
index 1f20a58..8856684 100644 (file)
--- a/testsuite/xbt/config_usage.c
+++ b/testsuite/xbt/config_usage.c
@@ -8,7 +8,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <stdio.h>
-#include <gras.h>
+#include "gras.h"
 
 /*====[ Prototypes ]=========================================================*/
 xbt_cfg_t make_set(void); /* build a minimal set */

diff --git a/testsuite/xbt/dict_crash.c b/testsuite/xbt/dict_crash.c
index 792e422..9b9058c 100644 (file)
--- a/testsuite/xbt/dict_crash.c
+++ b/testsuite/xbt/dict_crash.c
@@ -2,12 +2,12 @@
 
 /* dict_crash - A crash test for dictionnaries                              */
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* 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. */
 
-#include <gras.h>
+#include "gras.h"
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/testsuite/xbt/dict_usage.c b/testsuite/xbt/dict_usage.c
index ae87f1f..b7bd396 100644 (file)
--- a/testsuite/xbt/dict_usage.c
+++ b/testsuite/xbt/dict_usage.c
@@ -2,15 +2,14 @@
 
 /* dict_usage - A test of normal usage of a dictionnary                     */
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* 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. */
 
 #include <stdio.h>
-#include <assert.h>
 
-#include <gras.h>
+#include "gras.h"
 
 XBT_LOG_EXTERNAL_CATEGORY(dict);
 XBT_LOG_NEW_DEFAULT_CATEGORY(test,"Logging specific to this test");
@@ -125,7 +124,7 @@ int main(int argc,char **argv) {
 
   printf(" - Retrive values\n");
   TRYFAIL(xbt_dict_get(head,"123",(void**)&data));
-  assert(data);
+  xbt_assert(data);
   TRYFAIL(strcmp("123",data));
 
   TRYEXPECT(xbt_dict_get(head,"Can't be found",(void**)&data),mismatch_error);

diff --git a/testsuite/xbt/dynar_double.c b/testsuite/xbt/dynar_double.c
index c32723a..bfd0641 100644 (file)
--- a/testsuite/xbt/dynar_double.c
+++ b/testsuite/xbt/dynar_double.c
@@ -2,13 +2,12 @@
 
 /* dynar_double: A test case for the dynar using doubles as content         */
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* 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. */
 
-#include <stdio.h>
-#include <gras.h>
+#include "gras.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test,"Logging specific to this test");
 

diff --git a/testsuite/xbt/dynar_int.c b/testsuite/xbt/dynar_int.c
index 01dfd52..8e9ba8b 100644 (file)
--- a/testsuite/xbt/dynar_int.c
+++ b/testsuite/xbt/dynar_int.c
@@ -2,13 +2,12 @@
 
 /* dynar_int: A test case for the dynar using integers as content           */
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* 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. */
 
-#include <stdio.h>
-#include <gras.h>
+#include "gras.h"
 
 #define NB_ELEM 5000
 XBT_LOG_NEW_DEFAULT_CATEGORY(test,"Logging specific to this test");

diff --git a/testsuite/xbt/dynar_string.c b/testsuite/xbt/dynar_string.c
index 4409023..c36f84a 100644 (file)
--- a/testsuite/xbt/dynar_string.c
+++ b/testsuite/xbt/dynar_string.c
@@ -2,13 +2,13 @@
 
 /* dynar_string: A test case for the dynar using strings as content         */
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* 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. */
 
-#include <stdio.h>
-#include <gras.h>
+#include <stdio.h> /* sprintf */
+#include "gras.h"
 
 /* NB_ELEM HAS to be a multiple of 5 */
 #define NB_ELEM 5000

diff --git a/testsuite/xbt/log_usage.c b/testsuite/xbt/log_usage.c
index d3beea3..e6f5072 100644 (file)
--- a/testsuite/xbt/log_usage.c
+++ b/testsuite/xbt/log_usage.c
@@ -2,13 +2,12 @@
 
 /* log_usage - A test of normal usage of the log facilities                 */
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* 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. */
 
-#include <gras.h>
-#include <stdio.h>
+#include "gras.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(test, top,"Logging specific to this test");
 XBT_LOG_NEW_CATEGORY(top,"Useless test channel");

diff --git a/testsuite/xbt/multidict_crash.c b/testsuite/xbt/multidict_crash.c
index 1799a11..0663563 100644 (file)
--- a/testsuite/xbt/multidict_crash.c
+++ b/testsuite/xbt/multidict_crash.c
@@ -2,15 +2,14 @@
 
 /* multidict_crash - A crash test for multi-level dictionnaries             */
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* 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. */
 
 #include <stdio.h>
-#include <assert.h>
 
-#include <gras.h>
+#include "gras.h"
 
 #define NB_ELM 10/*00*/
 #define MULTICACHE_DEPTH 5

diff --git a/testsuite/xbt/set_usage.c b/testsuite/xbt/set_usage.c
index b510266..178b421 100644 (file)
--- a/testsuite/xbt/set_usage.c
+++ b/testsuite/xbt/set_usage.c
@@ -8,9 +8,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <stdio.h>
-#include <assert.h>
 
-#include <gras.h>
+#include "gras.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test,"Logging specific to this test");
 XBT_LOG_EXTERNAL_CATEGORY(set);
@@ -189,7 +188,7 @@ int main(int argc,char **argv) {
 
   printf(" - Retrive values\n");
   xbt_set_get_by_name(set,"123",(xbt_set_elm_t*)&elm);
-  assert(elm);
+  xbt_assert(elm);
   TRYFAIL(strcmp("123",elm->data));
 
   TRYEXPECT(xbt_set_get_by_name(set,"Can't be found",(xbt_set_elm_t*)&elm),