Merge tag 'v3_9_90' into hypervisor

[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 184d715a63597dcfab9d8764c6f6dbabcfaf0839..99ec01eff67ebbf8cfeb15325bf601c66b4e6aa9 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-2013. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -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
@@ -100,7 +106,7 @@ int main(int argc, char **argv)
       ("------------------- Produce the trace file---------------------------");
   XBT_INFO("Producing the trace of the run into %s", tracefilename);
   FILE *out = fopen(tracefilename, "w");
-  xbt_assert1(out, "Cannot write to %s", tracefilename);
+  xbt_assert(out, "Cannot write to %s", tracefilename);
   free(tracefilename);
 
   xbt_dynar_foreach(dax, cursor, task) {
@@ -132,7 +138,7 @@ int main(int argc, char **argv)
     SD_task_destroy(task);
   }
   fclose(out);
-
+  xbt_dynar_free_container(&dax);
   /* exit */
   SD_exit();
   return 0;