Modify almost all SD tests. There is no need to free a structure

[simgrid.git] / examples / simdag / dax / dax_test.c

diff --git a/examples/simdag/dax/dax_test.c b/examples/simdag/dax/dax_test.c
index 2b90da3..6bc8f25 100644 (file)
--- a/examples/simdag/dax/dax_test.c
+++ b/examples/simdag/dax/dax_test.c
@@ -1,6 +1,6 @@
 /* simple test trying to load a DAX file.                                   */
 
-/* Copyright (c) 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2009-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -8,7 +8,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
 #include "xbt/log.h"
 #include "xbt/ex.h"
 #include <string.h>
@@ -27,11 +27,11 @@ static int name_compare_hosts(const void *n1, const void *n2)
 
 int main(int argc, char **argv)
 {
-  xbt_dynar_t dax, changed;
+  xbt_dynar_t dax;
   unsigned int cursor;
   SD_task_t task;
 
-  /* initialisation of SD */
+  /* SD initialization */
   SD_init(&argc, argv);
 
   /* Check our arguments */
@@ -59,6 +59,12 @@ int main(int argc, char **argv)
 
   /* load the DAX file */
   dax = SD_daxload(argv[2]);
+  if (!dax){
+    XBT_ERROR("A problem occurred during DAX parsing (cycle or syntax). Do not continue this test");
+    free(tracefilename);
+    SD_exit();
+    exit(255);
+  }
 
   /* Display all the tasks */
   XBT_INFO
@@ -94,8 +100,7 @@ int main(int argc, char **argv)
 
   XBT_INFO
       ("------------------- Run the schedule ---------------------------");
-  changed = SD_simulate(-1);
-  xbt_dynar_free_container(&changed);
+  SD_simulate(-1);
   XBT_INFO
       ("------------------- Produce the trace file---------------------------");
   XBT_INFO("Producing the trace of the run into %s", tracefilename);
@@ -132,7 +137,7 @@ int main(int argc, char **argv)
     SD_task_destroy(task);
   }
   fclose(out);
-
+  xbt_dynar_free_container(&dax);
   /* exit */
   SD_exit();
   return 0;