Add a platform with a bypass route. Add the test to cmake.

[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 9b9a5be..2d841f3 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test.c
+++ b/teshsuite/simdag/platforms/basic_parsing_test.c
@@ -23,6 +23,8 @@ int main(int argc, char **argv)
   int route_size, i, j, k;
   int list_size;
 
   int route_size, i, j, k;
   int list_size;
 

+  setvbuf(stdout, NULL, _IOLBF, 0);
+

   SD_init(&argc, argv);
 
   /* creation of the environment */
   SD_init(&argc, argv);
 
   /* creation of the environment */


@@ -31,9 +33,7 @@ int main(int argc, char **argv)
          SD_workstation_get_number(), SD_link_get_number());
 
   if (argc >= 3) {
          SD_workstation_get_number(), SD_link_get_number());
 
   if (argc >= 3) {

-  for(i=1;i<argc;i++)
-  {
-               if (!strcmp(argv[i], "ONE_LINK")) {
+               if (!strcmp(argv[2], "ONE_LINK")) {

                  workstations = SD_workstation_get_list();
                  w1 = workstations[0];
                  w2 = workstations[1];
                  workstations = SD_workstation_get_list();
                  w1 = workstations[0];
                  w2 = workstations[1];


@@ -45,7 +45,7 @@ int main(int argc, char **argv)
                  route_size = SD_route_get_size(w1, w2);
                  printf("Route size %d\n", route_size);
                  for (i = 0; i < route_size; i++) {
                  route_size = SD_route_get_size(w1, w2);
                  printf("Route size %d\n", route_size);
                  for (i = 0; i < route_size; i++) {

-                       printf("   Link %s: latency = %f, bandwidth = %f\n",
+                       printf("  Link %s: latency = %f, bandwidth = %f\n",

                                   SD_link_get_name(route[i]),
                                   SD_link_get_current_latency(route[i]),
                                   SD_link_get_current_bandwidth(route[i]));
                                   SD_link_get_name(route[i]),
                                   SD_link_get_current_latency(route[i]),
                                   SD_link_get_current_bandwidth(route[i]));


@@ -53,37 +53,33 @@ int main(int argc, char **argv)
                  printf("Route latency = %f, route bandwidth = %f\n",
                                 SD_route_get_current_latency(w1, w2),
                                 SD_route_get_current_bandwidth(w1, w2));
                  printf("Route latency = %f, route bandwidth = %f\n",
                                 SD_route_get_current_latency(w1, w2),
                                 SD_route_get_current_bandwidth(w1, w2));

-                 i=argc;
-               }else{
-                       if (!strcmp(argv[i], "FULL_LINK")) {
-                         workstations = SD_workstation_get_list();
-                         list_size = SD_workstation_get_number();
-                         for (i = 0; i < list_size; i++) {
-                               w1 = workstations[i];
-                               name1 = SD_workstation_get_name(w1);
-                               for (j = 0; j < list_size; j++) {
-                                 w2 = workstations[j];
-                                 name2 = SD_workstation_get_name(w2);
-                                 printf("Route between %s and %s\n", name1, name2);
-                                 route = SD_route_get_list(w1, w2);
-                                 route_size = SD_route_get_size(w1, w2);
-                                 printf("\tRoute size %d\n", route_size);
-                                 for (k = 0; k < route_size; k++) {
-                                       printf("\tLink %s: latency = %f, bandwidth = %f\n",
-                                                  SD_link_get_name(route[k]),
-                                                  SD_link_get_current_latency(route[k]),
-                                                  SD_link_get_current_bandwidth(route[k]));
-                                 }
-                                 printf("\tRoute latency = %f, route bandwidth = %f\n",
-                                                SD_route_get_current_latency(w1, w2),
-                                                SD_route_get_current_bandwidth(w1, w2));
-                               }
+               }
+               if (!strcmp(argv[2], "FULL_LINK")) {
+                 workstations = SD_workstation_get_list();
+                 list_size = SD_workstation_get_number();
+                 for (i = 0; i < list_size; i++) {
+                       w1 = workstations[i];
+                       name1 = SD_workstation_get_name(w1);
+                       for (j = 0; j < list_size; j++) {
+                         w2 = workstations[j];
+                         name2 = SD_workstation_get_name(w2);
+                         printf("Route between %s and %s\n", name1, name2);
+                         route = SD_route_get_list(w1, w2);
+                         route_size = SD_route_get_size(w1, w2);
+                         printf("  Route size %d\n", route_size);
+                         for (k = 0; k < route_size; k++) {
+                               printf("  Link %s: latency = %f, bandwidth = %f\n",
+                                          SD_link_get_name(route[k]),
+                                          SD_link_get_current_latency(route[k]),
+                                          SD_link_get_current_bandwidth(route[k]));

                          }
                          }

-                         i=argc;
+                         printf("  Route latency = %f, route bandwidth = %f\n",
+                                        SD_route_get_current_latency(w1, w2),
+                                        SD_route_get_current_bandwidth(w1, w2));

                        }
                        }

+                 }

                }
   }
                }
   }

-  }

 
   SD_exit();
   return 0;
 
   SD_exit();
   return 0;