Merge branch 'master' of git+ssh://scm.gforge.inria.fr/gitroot/simgrid/simgrid

[simgrid.git] / teshsuite / simdag / platforms / basic_parsing_test.c

diff --git a/teshsuite/simdag/platforms/basic_parsing_test.c b/teshsuite/simdag/platforms/basic_parsing_test.c
index b51d24a..d701c1d 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test.c
+++ b/teshsuite/simdag/platforms/basic_parsing_test.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2008-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,11 +6,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
 #include "surf/surf_private.h"
 
-extern routing_platf_t routing_platf;
-
 int main(int argc, char **argv)
 {
   /* initialisation of SD */
@@ -23,7 +21,12 @@ int main(int argc, char **argv)
   int route_size, i, j, k;
   int list_size;
 
+#ifdef _XBT_WIN32
+  setbuf(stderr, NULL);
+  setbuf(stdout, NULL);
+#else
   setvbuf(stdout, NULL, _IOLBF, 0);
+#endif
 
   SD_init(&argc, argv);
 
@@ -79,6 +82,15 @@ int main(int argc, char **argv)
       }
       }
     }
+    if (!strcmp(argv[2], "PROP")) {
+      printf("SG_TEST_mem: %s\n",
+          SD_workstation_get_property_value(SD_workstation_get_by_name("host1"),
+          "SG_TEST_mem")
+          );
+      printf("Author: %s\n", SD_as_router_get_property_value("AS0", "author"));
+      printf("AS1: %s\n", SD_as_router_get_property_value("AS1", "name"));
+      printf("AS2: %s\n", SD_as_router_get_property_value("AS2", "name"));
+    }
   }
 
   SD_exit();