From: navarrop Date: Mon, 10 Jan 2011 12:00:15 +0000 (+0000) Subject: Out of sources build for those examples. X-Git-Tag: v3.6_beta2~539 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/90ca2797de9d642420d648ac3410b7b3f0fbe232 Out of sources build for those examples. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9389 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index 69f7481850..c8baaafca9 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -60,13 +60,13 @@ ELSE(${ARCH_32_BITS}) ADD_TEST(tesh-gras-msg-handle-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/msg_handle/test_sg_64) ENDIF(${ARCH_32_BITS}) -ADD_TEST(tesh-gras-empty-main-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/empty_main/test_rl) -ADD_TEST(tesh-gras-empty-main-sg ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/empty_main/test_sg) +ADD_TEST(tesh-gras-empty-main-rl ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/gras/empty_main --cd ${CMAKE_HOME_DIRECTORY}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/empty_main/test_rl) +ADD_TEST(tesh-gras-empty-main-sg ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/gras/empty_main --cd ${CMAKE_HOME_DIRECTORY}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/empty_main/test_sg) IF(${ARCH_32_BITS}) - ADD_TEST(tesh-gras-small-sleep-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/small_sleep/test_sg_32) + ADD_TEST(tesh-gras-small-sleep-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/gras/small_sleep --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/small_sleep/test_sg_32) ELSE(${ARCH_32_BITS}) - ADD_TEST(tesh-gras-small-sleep-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/small_sleep/test_sg_64) + ADD_TEST(tesh-gras-small-sleep-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/gras/small_sleep --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/small_sleep/test_sg_64) ENDIF(${ARCH_32_BITS}) ADD_TEST(tesh-msg-get-sender ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.tesh) diff --git a/teshsuite/gras/empty_main/CMakeLists.txt b/teshsuite/gras/empty_main/CMakeLists.txt index 088eaaddb7..bd6cf8bddd 100644 --- a/teshsuite/gras/empty_main/CMakeLists.txt +++ b/teshsuite/gras/empty_main/CMakeLists.txt @@ -4,7 +4,7 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_empty_main_function.c ${CMAKE_CURRENT_BINARY_DIR}/_empty_main_simulator.c PROPERTIES GENERATED true) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(empty_main_function ${CMAKE_CURRENT_SOURCE_DIR}/empty_main.c ${CMAKE_CURRENT_BINARY_DIR}/_empty_main_function.c) diff --git a/teshsuite/gras/empty_main/test_rl b/teshsuite/gras/empty_main/test_rl index 3e5203a1fb..bb5ae90928 100755 --- a/teshsuite/gras/empty_main/test_rl +++ b/teshsuite/gras/empty_main/test_rl @@ -1,4 +1,4 @@ ! timeout 20 -& $SG_TEST_ENV ./gras/empty_main/empty_main_function$EXEEXT --log=root.fmt=%P:%t%e%m%n $ARGS +& $SG_TEST_ENV ${bindir:=.}/empty_main_function$EXEEXT --log=root.fmt=%P:%t%e%m%n $ARGS > function:main Exiting GRAS diff --git a/teshsuite/gras/empty_main/test_sg b/teshsuite/gras/empty_main/test_sg index bd051db885..7b96c1c556 100755 --- a/teshsuite/gras/empty_main/test_sg +++ b/teshsuite/gras/empty_main/test_sg @@ -1,4 +1,4 @@ p Runs the 'empty_main' test within the simulator -$ $SG_TEST_EXENV ./gras/empty_main/empty_main_simulator${EXEEXT:=} ${srcdir:=.}/../examples/msg/small_platform.xml ${srcdir:=.}/gras/empty_main/empty_main.xml +$ $SG_TEST_EXENV ${bindir:=.}/empty_main_simulator${EXEEXT:=} ${srcdir:=.}/../examples/msg/small_platform.xml ${srcdir:=.}/gras/empty_main/empty_main.xml > [Tremblay:function:(1) 0.000000] [gras/INFO] Exiting GRAS diff --git a/teshsuite/gras/small_sleep/CMakeLists.txt b/teshsuite/gras/small_sleep/CMakeLists.txt index e52ad6daa4..3b6cffb29d 100644 --- a/teshsuite/gras/small_sleep/CMakeLists.txt +++ b/teshsuite/gras/small_sleep/CMakeLists.txt @@ -4,7 +4,7 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_small_sleep_function.c ${CMAKE_CURRENT_BINARY_DIR}/_small_sleep_simulator.c PROPERTIES GENERATED true) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(small_sleep_function ${CMAKE_CURRENT_SOURCE_DIR}/small_sleep.c ${CMAKE_CURRENT_BINARY_DIR}/_small_sleep_function.c) diff --git a/teshsuite/gras/small_sleep/test_sg_32 b/teshsuite/gras/small_sleep/test_sg_32 index 039a26d786..197d42f16c 100755 --- a/teshsuite/gras/small_sleep/test_sg_32 +++ b/teshsuite/gras/small_sleep/test_sg_32 @@ -1,6 +1,6 @@ p Runs the 'small_sleep' test within the simulator -$ $SG_TEST_EXENV ./gras/small_sleep/small_sleep_simulator${EXEEXT:=} ${srcdir:=.}/../examples/msg/small_platform.xml ${srcdir:=.}/gras/small_sleep/small_sleep.xml +$ $SG_TEST_EXENV ${bindir:=.}/small_sleep_simulator${EXEEXT:=} ${srcdir:=.}/../examples/msg/small_platform.xml ${srcdir:=.}/gras/small_sleep/small_sleep.xml > [Tremblay:function:(1) 100.000000] [test/INFO] Let's go 1E-5 > [Tremblay:function:(1) 100.000010] [test/INFO] Let's go 1E-10 > [Tremblay:function:(1) 100.000020] [test/INFO] Let's go 1E-15 diff --git a/teshsuite/gras/small_sleep/test_sg_64 b/teshsuite/gras/small_sleep/test_sg_64 index f7c3169354..19377cf06c 100755 --- a/teshsuite/gras/small_sleep/test_sg_64 +++ b/teshsuite/gras/small_sleep/test_sg_64 @@ -1,6 +1,6 @@ p Runs the 'empty_main' test within the simulator -$ $SG_TEST_EXENV ./gras/small_sleep/small_sleep_simulator${EXEEXT:=} ${srcdir:=.}/../examples/msg/small_platform.xml ${srcdir:=.}/gras/small_sleep/small_sleep.xml +$ $SG_TEST_EXENV ${bindir:=.}/small_sleep_simulator${EXEEXT:=} ${srcdir:=.}/../examples/msg/small_platform.xml ${srcdir:=.}/gras/small_sleep/small_sleep.xml > [Tremblay:function:(1) 100.000000] [test/INFO] Let's go 1E-5 > [Tremblay:function:(1) 100.000010] [test/INFO] Let's go 1E-10 > [Tremblay:function:(1) 100.000020] [test/INFO] Let's go 1E-15