Try to fixup the context mess

[simgrid.git] / src / simgrid_units_main.c

diff --git a/src/simgrid_units_main.c b/src/simgrid_units_main.c
index 65c53ef..f65097e 100644 (file)
--- a/src/simgrid_units_main.c
+++ b/src/simgrid_units_main.c
@@ -24,6 +24,7 @@ extern xbt_test_unit_t _xbt_current_unit;
     void test_dynar_int(void);
     void test_dynar_double(void);
     void test_dynar_string(void);
+    void test_dynar_sync_int(void);
   /* SGU: END FILE */
 
   /* SGU: BEGIN FILE xbt/dict.c */
@@ -45,6 +46,11 @@ extern xbt_test_unit_t _xbt_current_unit;
     void test_swag_basic(void);
   /* SGU: END FILE */
 
+  /* SGU: BEGIN FILE xbt/xbt_str.c */
+    void test_split_quoted(void);
+    void test_split_str(void);
+  /* SGU: END FILE */
+
   /* SGU: BEGIN FILE xbt/config.c */
     void test_config_memuse(void);
     void test_config_validation(void);
@@ -61,6 +67,8 @@ int main(int argc, char *argv[]) {
   char selection[1024];
   int i;
 
+  int res;
+
   /* SGU: BEGIN SUITES DECLARATION */
     /* SGU: BEGIN FILE xbt/cunit.c */
       suite = xbt_test_suite_by_name("cunit","Testsuite mechanism autotest");
@@ -77,9 +85,10 @@ int main(int argc, char *argv[]) {
 
     /* SGU: BEGIN FILE xbt/dynar.c */
       suite = xbt_test_suite_by_name("dynar","Dynar data container");
-      xbt_test_suite_push(suite, "int", test_dynar_int, "Dyars of integers");
-      xbt_test_suite_push(suite, "double", test_dynar_double, "Dyars of doubles");
+      xbt_test_suite_push(suite, "int", test_dynar_int, "Dynars of integers");
+      xbt_test_suite_push(suite, "double", test_dynar_double, "Dynars of doubles");
       xbt_test_suite_push(suite, "string", test_dynar_string, "Dyars of strings");
+      xbt_test_suite_push(suite, "synchronized int", test_dynar_sync_int, "Synchronized dynars of integers");
     /* SGU: END FILE */
 
     /* SGU: BEGIN FILE xbt/dict.c */
@@ -104,6 +113,12 @@ int main(int argc, char *argv[]) {
       xbt_test_suite_push(suite, "basic", test_swag_basic, "Basic usage");
     /* SGU: END FILE */
 
+    /* SGU: BEGIN FILE xbt/xbt_str.c */
+      suite = xbt_test_suite_by_name("xbt_str","String Handling");
+      xbt_test_suite_push(suite, "xbt_str_split_quoted", test_split_quoted,  "test the function xbt_str_split_quoted");
+      xbt_test_suite_push(suite, "xbt_str_split_str", test_split_str,  "test the function xbt_str_split_str");
+    /* SGU: END FILE */
+
     /* SGU: BEGIN FILE xbt/config.c */
       suite = xbt_test_suite_by_name("config","Configuration support");
       xbt_test_suite_push(suite, "memuse", test_config_memuse, "Alloc and free a config set");
@@ -113,6 +128,8 @@ int main(int argc, char *argv[]) {
 
   /* SGU: END SUITES DECLARATION */
       
+  xbt_init(&argc,argv);
+    
   /* Search for the tests to do */
     selection[0]='\0';
     for (i=1;i<argc;i++) {
@@ -156,7 +173,9 @@ int main(int argc, char *argv[]) {
     }
   /* Got all my tests to do */
       
-  return xbt_test_run(selection);
+  res = xbt_test_run(selection);
+  xbt_exit();
+  return res;
 }
 /*******************************/
 /* GENERATED FILE, DO NOT EDIT */