add yet another basic tesh to increase coverage. sd_link.c should be at

100% now

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index f2fdaa0..86e5fff 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -101,6 +101,7 @@ ENDIF(enable_debug)
 
 ADD_TEST(tesh-simdag-bypass     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_bypass.tesh)
 ADD_TEST(tesh-simdag-flatifier ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh)
+ADD_TEST(tesh-simdag-link      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_link_test.tesh)
 
 ADD_TEST(tesh-simdag-reinit-costs      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/test_reinit_costs.tesh)
 ADD_TEST(tesh-simdag-parser    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}             --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms  --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh)

diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt
index af76e2a..10aa922 100644 (file)
--- a/teshsuite/simdag/platforms/CMakeLists.txt
+++ b/teshsuite/simdag/platforms/CMakeLists.txt
@@ -6,6 +6,7 @@ add_executable(basic_parsing_test basic_parsing_test.c)
 add_executable(is_router_test is_router_test.c)
 add_executable(flatifier flatifier.c)
 add_executable(basic_tracing basic_tracing.c)
+add_executable(basic_link_test basic_link_test.c)
 
 ### Add definitions for compile
 if(NOT WIN32)
@@ -17,11 +18,13 @@ target_link_libraries(basic_parsing_test simgrid m)
 target_link_libraries(is_router_test simgrid m)
 target_link_libraries(flatifier simgrid m)
 target_link_libraries(basic_tracing simgrid m)
+target_link_libraries(basic_link_test simgrid m)
 else(NOT WIN32)
 target_link_libraries(basic_parsing_test simgrid)
 target_link_libraries(is_router_test simgrid)
 target_link_libraries(flatifier simgrid)
 target_link_libraries(basic_tracing simgrid)
+target_link_libraries(basic_link_test simgrid)
 endif(NOT WIN32)
 
 set(tesh_files
@@ -30,6 +33,7 @@ set(tesh_files
   ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_test_sym_full.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_test.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_test_bypass.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic_link_test.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/flatifier.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/get_full_link.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_asymetric.tesh
@@ -88,6 +92,7 @@ set(teshsuite_src
   ${teshsuite_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_test.c
   ${CMAKE_CURRENT_SOURCE_DIR}/basic_tracing.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic_link_test.c
   ${CMAKE_CURRENT_SOURCE_DIR}/Evaluate_get_route_time.c
   ${CMAKE_CURRENT_SOURCE_DIR}/Evaluate_parse_time.c
   ${CMAKE_CURRENT_SOURCE_DIR}/flatifier.c

diff --git a/teshsuite/simdag/platforms/basic_link_test.c b/teshsuite/simdag/platforms/basic_link_test.c
new file mode 100644 (file)
index 0000000..2fb8c6f
--- /dev/null
+++ b/teshsuite/simdag/platforms/basic_link_test.c
@@ -0,0 +1,42 @@
+/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "simdag/simdag.h"
+#include "surf/surf_private.h"
+#include "xbt/log.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic_link_test, sd,
+                                "SimDag test basic_link_test");
+
+int main(int argc, char **argv)
+{
+  int i;
+  const char *user_data = "some user_data";
+  const SD_link_t *links;
+
+  /* initialization of SD */
+  SD_init(&argc, argv);
+
+  /* creation of the environment */
+  SD_create_environment(argv[1]);
+  XBT_INFO("Link number: %d", SD_link_get_number());
+  links = SD_link_get_list();
+  for(i=0; i<SD_link_get_number();i++){
+    XBT_INFO("%s: latency = %.5f, bandwidth = %f",
+             SD_link_get_name(links[i]),
+             SD_link_get_current_latency(links[i]),
+             SD_link_get_current_bandwidth(links[i]));
+    SD_link_set_data(links[i], (void*) user_data);
+    if(strcmp(user_data, (const char*)SD_link_get_data(links[i]))){
+      XBT_ERROR("User data was corrupted.");
+    }
+  }
+
+  SD_exit();
+  return 0;
+}

diff --git a/teshsuite/simdag/platforms/basic_link_test.tesh b/teshsuite/simdag/platforms/basic_link_test.tesh
new file mode 100644 (file)
index 0000000..ec41c1b
--- /dev/null
+++ b/teshsuite/simdag/platforms/basic_link_test.tesh
@@ -0,0 +1,17 @@
+#! ./tesh
+
+$ ${bindir:=.}/basic_link_test one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
+> [  0.000000] (0:@) Link number: 12
+> [  0.000000] (0:@) bob_cluster_link_2_UP: latency = 0.00005, bandwidth = 125000000.000000
+> [  0.000000] (0:@) bob_cluster_link_6_UP: latency = 0.00005, bandwidth = 125000000.000000
+> [  0.000000] (0:@) bob_cluster_link_2_DOWN: latency = 0.00005, bandwidth = 125000000.000000
+> [  0.000000] (0:@) bob_cluster_link_6_DOWN: latency = 0.00005, bandwidth = 125000000.000000
+> [  0.000000] (0:@) __loopback__: latency = 0.00002, bandwidth = 498000000.000000
+> [  0.000000] (0:@) bob_cluster_backbone: latency = 0.00050, bandwidth = 2250000000.000000
+> [  0.000000] (0:@) bob_cluster_link_3_DOWN: latency = 0.00005, bandwidth = 125000000.000000
+> [  0.000000] (0:@) bob_cluster_link_0_UP: latency = 0.00005, bandwidth = 125000000.000000
+> [  0.000000] (0:@) bob_cluster_link_4_UP: latency = 0.00005, bandwidth = 125000000.000000
+> [  0.000000] (0:@) bob_cluster_link_0_DOWN: latency = 0.00005, bandwidth = 125000000.000000
+> [  0.000000] (0:@) bob_cluster_link_4_DOWN: latency = 0.00005, bandwidth = 125000000.000000
+> [  0.000000] (0:@) bob_cluster_link_3_UP: latency = 0.00005, bandwidth = 125000000.000000