From: navarrop Date: Thu, 18 Feb 2010 16:08:09 +0000 (+0000) Subject: Add some test to cmake and correct bug in tesh file from commit 2010-02-04 21:47:02 X-Git-Tag: SVN~625 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a5b1d82520056f32e9f299b396f2e1f3239c0f7f Add some test to cmake and correct bug in tesh file from commit 2010-02-04 21:47:02 git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7113 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/buildtools/CPACK/simgrid_CMakeList/teshsuite/gras/empty_main/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/teshsuite/gras/empty_main/CMakeLists.txt new file mode 100644 index 0000000000..c4451fa8e2 --- /dev/null +++ b/buildtools/CPACK/simgrid_CMakeList/teshsuite/gras/empty_main/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 2.6) + +set(EXECUTABLE_OUTPUT_PATH "./") +set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") + +add_executable(empty_main_function empty_main.c _empty_main_function.c) +add_executable(empty_main_simulator empty_main.c _empty_main_simulator.c) + +### Add definitions for compile +target_link_libraries(empty_main_simulator simgrid m pthread -fprofile-arcs) +target_link_libraries(empty_main_function gras m pthread -fprofile-arcs) diff --git a/buildtools/CPACK/simgrid_CMakeList/teshsuite/gras/small_sleep/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/teshsuite/gras/small_sleep/CMakeLists.txt new file mode 100644 index 0000000000..6052df3093 --- /dev/null +++ b/buildtools/CPACK/simgrid_CMakeList/teshsuite/gras/small_sleep/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 2.6) + +set(EXECUTABLE_OUTPUT_PATH "./") +set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") + +add_executable(small_sleep_function small_sleep.c _small_sleep_function.c) +add_executable(small_sleep_simulator small_sleep.c _small_sleep_simulator.c) + +### Add definitions for compile +target_link_libraries(small_sleep_simulator simgrid m pthread -fprofile-arcs) +target_link_libraries(small_sleep_function gras m pthread -fprofile-arcs) diff --git a/buildtools/CPACK/simgrid_CMakeList/tools/gras/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/tools/gras/CMakeLists.txt index 6953ce6255..31ee6e7ff5 100644 --- a/buildtools/CPACK/simgrid_CMakeList/tools/gras/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/tools/gras/CMakeLists.txt @@ -93,6 +93,20 @@ COMMAND "${PROJECT_DIRECTORY}/tools/gras/gras_stub_generator" ARGS msg_handle ${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/msg_handle.xml WORKING_DIRECTORY "${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle" ) +#teshsuite/gras/empty_main +add_custom_command(TARGET gras_stub_generator +POST_BUILD +COMMAND "${PROJECT_DIRECTORY}/tools/gras/gras_stub_generator" +ARGS empty_main ${PROJECT_DIRECTORY}/teshsuite/gras/empty_main/empty_main.xml +WORKING_DIRECTORY "${PROJECT_DIRECTORY}/teshsuite/gras/empty_main" +) +#teshsuite/gras/small_sleep +add_custom_command(TARGET gras_stub_generator +POST_BUILD +COMMAND "${PROJECT_DIRECTORY}/tools/gras/gras_stub_generator" +ARGS small_sleep ${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep/small_sleep.xml +WORKING_DIRECTORY "${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep" +) #examples/amok/bandwidth add_custom_command(TARGET gras_stub_generator POST_BUILD diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt index bfeb0e6e9e..813d986713 100644 --- a/buildtools/CPACK/src/CMakeMakeExeLib.txt +++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt @@ -70,6 +70,8 @@ if(NOT init) add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/xbt) add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/datadesc) add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle) + add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/empty_main) + add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep) add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag) add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/network) add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/network/p2p) diff --git a/examples/simdag/test_simdag.tesh b/examples/simdag/test_simdag.tesh index d482d21c0b..658accff8e 100644 --- a/examples/simdag/test_simdag.tesh +++ b/examples/simdag/test_simdag.tesh @@ -14,7 +14,7 @@ $ $SG_TEST_EXENV ./sd_test ${srcdir:=.}/../msg/msg_platform.xml > [0.000000] [sd_test/INFO] Route latency = 0.070615, route bandwidth = 472125.000000 > [0.000000] [sd_test/INFO] Communication time for 2000000.000000 bytes between Jacquelin and Intel: 4.306781 > [0.000000] [sd_test/INFO] Communication time for 3000000.000000 bytes between Intel and Jacquelin: 6.424864 -> [0.000000] [sd_test/INFO] Estimated time for 'Task D': 385.928745 +> [0.000000] [sd_test/INFO] Estimated time for 'Task D': 6.432146 > [0.000000] [sd_kernel/INFO] Starting simulation... > [0.000000] [sd_kernel/INFO] Executing task 'Task D' > [1271.136703] [sd_kernel/INFO] Task 'Task D' done