From: navarrop Date: Wed, 5 Jan 2011 15:46:13 +0000 (+0000) Subject: Can compile out of source now. X-Git-Tag: v3.6_beta2~565 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/dbc6804c876c7a9dc95efc780fb8f102f8bee5f7?ds=inline Can compile out of source now. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9363 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/.gitignore b/.gitignore index 09878bd2f3..845a93a664 100644 --- a/.gitignore +++ b/.gitignore @@ -61,6 +61,7 @@ Testing/ Makefile bin/ lib/ +build_dir/ buildtools/Cmake/test_prog/prog_va_copy.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 5dd64660a2..29e9a435c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,8 +25,27 @@ else(APPLE) endif(APPLE) ### Set some variables for Cmake -SET(LIBRARY_OUTPUT_PATH ${CMAKE_HOME_DIRECTORY}/lib) -set(INCLUDES ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_HOME_DIRECTORY}/src/include ${CMAKE_HOME_DIRECTORY}/src) +SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) + +if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}") + set(INCLUDES + ${CMAKE_HOME_DIRECTORY} + ${CMAKE_HOME_DIRECTORY}/include + ${CMAKE_HOME_DIRECTORY}/src + ${CMAKE_HOME_DIRECTORY}/src/include + ) +else("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}") + set(INCLUDES + ${CMAKE_HOME_DIRECTORY} + ${CMAKE_HOME_DIRECTORY}/include + ${CMAKE_HOME_DIRECTORY}/src + ${CMAKE_HOME_DIRECTORY}/src/include + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/include + ${CMAKE_BINARY_DIR}/src + ) +endif("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}") + set(INCLUDES ${INCLUDES} ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_HOME_DIRECTORY}/src/include ${CMAKE_HOME_DIRECTORY}/src ${CMAKE_CURRENT_BINARY_DIR}/src) if(WIN32) set(INCLUDES ${INCLUDES} ${CMAKE_HOME_DIRECTORY}/include/xbt ${CMAKE_HOME_DIRECTORY}/src/xbt) #for win32_ucontext.[ch] diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index ed56644b66..e2ce5ab786 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -44,24 +44,24 @@ ADD_TEST(tesh-self-background ${CMAKE_BINARY_DIR}/bin/tesh --cd "${CMAKE_HOME_D # BEGIN TESH TESTS # teshsuite/xbt -ADD_TEST(tesh-log-large ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite xbt/log_large_test.tesh) -ADD_TEST(tesh-log-parallel ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite xbt/parallel_log_crashtest.tesh) +ADD_TEST(tesh-log-large ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/log_large_test.tesh) +ADD_TEST(tesh-log-parallel ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parallel_log_crashtest.tesh) # teshsuite/gras/datadesc directory -ADD_TEST(tesh-gras-dd-mem ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/datadesc/datadesc_mem.tesh) -ADD_TEST(tesh-gras-dd-rw ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/datadesc/datadesc_rw.tesh) -ADD_TEST(tesh-gras-dd-r-little32-4 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_little32_4.tesh) -ADD_TEST(tesh-gras-dd-r-little64 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_little64.tesh) -ADD_TEST(tesh-gras-dd-r-big32-8-4 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_big32_8_4.tesh) +ADD_TEST(tesh-gras-dd-mem ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc_mem.tesh) +ADD_TEST(tesh-gras-dd-rw ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc_rw.tesh) +ADD_TEST(tesh-gras-dd-r-little32-4 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc_r_little32_4.tesh) +ADD_TEST(tesh-gras-dd-r-little64 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc_r_little64.tesh) +ADD_TEST(tesh-gras-dd-r-big32-8-4 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc_r_big32_8_4.tesh) IF(${ARCH_32_BITS}) - ADD_TEST(tesh-gras-msg-handle-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/msg_handle/test_sg_32) + ADD_TEST(tesh-gras-msg-handle-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/msg_handle/test_sg_32) ELSE(${ARCH_32_BITS}) - ADD_TEST(tesh-gras-msg-handle-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/msg_handle/test_sg_64) + 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 gras/empty_main/test_rl) -ADD_TEST(tesh-gras-empty-main-sg ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/empty_main/test_sg) +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) 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) @@ -69,137 +69,141 @@ 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) ENDIF(${ARCH_32_BITS}) -ADD_TEST(tesh-msg-get-sender ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite msg/get_sender.tesh) -ADD_TEST(tesh-simdag-reinit-costs ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/test_reinit_costs.tesh) -ADD_TEST(tesh-simdag-parser ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh) -ADD_TEST(tesh-simdag-parser-bogus-symmetric ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms two_hosts_asymetric.tesh) -ADD_TEST(tesh-simdag-parser-sym-full ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_sym_full.tesh) -ADD_TEST(tesh-simdag-flatifier ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh) -ADD_TEST(tesh-simdag-full-links ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms get_full_link.tesh) -ADD_TEST(tesh-simdag-basic0 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic0.tesh) -ADD_TEST(tesh-simdag-basic1 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic1.tesh) -ADD_TEST(tesh-simdag-basic2 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic2.tesh) -ADD_TEST(tesh-simdag-basic3 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic3.tesh) -ADD_TEST(tesh-simdag-basic4 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic4.tesh) -ADD_TEST(tesh-simdag-basic5 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic5.tesh) -ADD_TEST(tesh-simdag-basic6 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic6.tesh) -ADD_TEST(tesh-simdag-p2p-1 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/p2p/test_latency1.tesh) -ADD_TEST(tesh-simdag-p2p-2 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/p2p/test_latency2.tesh) -ADD_TEST(tesh-simdag-p2p-3 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/p2p/test_latency3.tesh) -ADD_TEST(tesh-simdag-p2p-4 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/p2p/test_latency_bound.tesh) -ADD_TEST(tesh-simdag-mxn-1 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_all2all.tesh) -ADD_TEST(tesh-simdag-mxn-2 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_independent_comm.tesh) -ADD_TEST(tesh-simdag-mxn-3 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_scatter.tesh) -ADD_TEST(tesh-simdag-par-1 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/partask/test_comp_only_seq.tesh) -ADD_TEST(tesh-simdag-par-2 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/partask/test_comp_only_par.tesh) +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) +ADD_TEST(tesh-simdag-reinit-costs ${CMAKE_BINARY_DIR}/bin/tesh --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 --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh) +ADD_TEST(tesh-simdag-parser-bogus-symmetric ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms two_hosts_asymetric.tesh) +ADD_TEST(tesh-simdag-parser-sym-full ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_sym_full.tesh) +ADD_TEST(tesh-simdag-flatifier ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh) +ADD_TEST(tesh-simdag-full-links ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms get_full_link.tesh) +ADD_TEST(tesh-simdag-basic0 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic0.tesh) +ADD_TEST(tesh-simdag-basic1 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic1.tesh) +ADD_TEST(tesh-simdag-basic2 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic2.tesh) +ADD_TEST(tesh-simdag-basic3 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic3.tesh) +ADD_TEST(tesh-simdag-basic4 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic4.tesh) +ADD_TEST(tesh-simdag-basic5 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic5.tesh) +ADD_TEST(tesh-simdag-basic6 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic6.tesh) +ADD_TEST(tesh-simdag-p2p-1 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency1.tesh) +ADD_TEST(tesh-simdag-p2p-2 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency2.tesh) +ADD_TEST(tesh-simdag-p2p-3 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency3.tesh) +ADD_TEST(tesh-simdag-p2p-4 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency_bound.tesh) +ADD_TEST(tesh-simdag-mxn-1 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn/test_intra_all2all.tesh) +ADD_TEST(tesh-simdag-mxn-2 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh) +ADD_TEST(tesh-simdag-mxn-3 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn/test_intra_scatter.tesh) +ADD_TEST(tesh-simdag-par-1 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask/test_comp_only_seq.tesh) +ADD_TEST(tesh-simdag-par-2 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask/test_comp_only_par.tesh) # GRAS examples -ADD_TEST(gras-ping-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/ping test_rl) -ADD_TEST(gras-rpc-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc test_rl) -ADD_TEST(gras-spawn-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn test_rl) -ADD_TEST(gras-timer-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/timer test_rl) -ADD_TEST(gras-chrono-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono test_rl) -ADD_TEST(gras-simple-token-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token test_rl) -ADD_TEST(gras-mmrpc-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc test_rl) -ADD_TEST(gras-all2all-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all test_rl) -ADD_TEST(gras-pmm-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm test_rl) -ADD_TEST(gras-synchro-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro test_rl) -ADD_TEST(gras-properties-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/properties test_rl) +ADD_TEST(gras-ping-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_rl) +ADD_TEST(gras-rpc-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_rl) +ADD_TEST(gras-spawn-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_rl) +ADD_TEST(gras-timer-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/gras/timer ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/test_rl) +ADD_TEST(gras-chrono-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono/test_rl) +ADD_TEST(gras-simple-token-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/gras/mutual_exclusion/simple_token ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_rl) +ADD_TEST(gras-mmrpc-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/gras/mmrpc ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc/test_rl) +ADD_TEST(gras-all2all-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_rl) +ADD_TEST(gras-pmm-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_rl) +ADD_TEST(gras-synchro-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_rl) +ADD_TEST(gras-properties-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/gras/properties ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/test_rl) # MSG examples -ADD_TEST(msg-sendrecv-CLM03 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg sendrecv/sendrecv_CLM03.tesh) -ADD_TEST(msg-sendrecv-Vegas ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg sendrecv/sendrecv_Vegas.tesh) -ADD_TEST(msg-sendrecv-Reno ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg sendrecv/sendrecv_Reno.tesh) -ADD_TEST(msg-suspend ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg suspend/suspend.tesh) -ADD_TEST(msg-masterslave ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave.tesh) -ADD_TEST(msg-masterslave-forwarder ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_forwarder.tesh) -ADD_TEST(msg-masterslave-failure ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_failure.tesh) -ADD_TEST(msg-masterslave-bypass ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_bypass.tesh) -ADD_TEST(msg-masterslave-mailbox ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_mailbox.tesh) -ADD_TEST(msg-masterslave-vivaldi ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_vivaldi.tesh) -ADD_TEST(msg-masterslave-multicore ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_multicore.tesh) -ADD_TEST(msg-migration ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg migration/migration.tesh) -ADD_TEST(msg-ptask ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg parallel_task/parallel_task.tesh) -ADD_TEST(msg-priority ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg priority/priority.tesh) -ADD_TEST(msg-properties ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg properties/msg_prop.tesh) -ADD_TEST(msg-trace ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg trace/trace.tesh) -ADD_TEST(msg-masterslave-cpu-ti ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti.tesh) -ADD_TEST(msg-icomms ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms peer.tesh) -ADD_TEST(msg-actions ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/actions actions.tesh) +ADD_TEST(msg-sendrecv-CLM03 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_CLM03.tesh) +ADD_TEST(msg-sendrecv-Vegas ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Vegas.tesh) +ADD_TEST(msg-sendrecv-Reno ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Reno.tesh) +ADD_TEST(msg-suspend ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/suspend/suspend.tesh) +ADD_TEST(msg-masterslave ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave.tesh) +ADD_TEST(msg-masterslave-forwarder ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_forwarder.tesh) +ADD_TEST(msg-masterslave-failure ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_failure.tesh) +ADD_TEST(msg-masterslave-bypass ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_bypass.tesh) +ADD_TEST(msg-masterslave-mailbox ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_mailbox.tesh) +ADD_TEST(msg-masterslave-vivaldi ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh) +ADD_TEST(msg-masterslave-multicore ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_multicore.tesh) +ADD_TEST(msg-migration ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.tesh) +ADD_TEST(msg-ptask ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task.tesh) +ADD_TEST(msg-priority ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/priority/priority.tesh) +ADD_TEST(msg-properties ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/properties/msg_prop.tesh) +ADD_TEST(msg-icomms ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/icomms --cd ${CMAKE_BINARY_DIR}/examples/msg/icomms ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/peer.tesh) +ADD_TEST(msg-actions ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/actions --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/actions actions.tesh) +ADD_TEST(msg-masterslave-cpu-ti ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/masterslave --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti.tesh) +ADD_TEST(msg-trace ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg trace/trace.tesh) IF(HAVE_TRACING) - ADD_TEST(tracing-ms ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/ms.tesh) - ADD_TEST(tracing-categories ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/categories.tesh) - ADD_TEST(tracing-volume ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/volume.tesh) - ADD_TEST(tracing-tasks ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/tasks.tesh) - ADD_TEST(tracing-process-migration ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/procmig.tesh) + ADD_TEST(tracing-ms ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/ms.tesh) + ADD_TEST(tracing-categories ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/categories.tesh) + ADD_TEST(tracing-volume ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/volume.tesh) + ADD_TEST(tracing-tasks ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/tasks.tesh) + ADD_TEST(tracing-process-migration ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/procmig.tesh) ENDIF(HAVE_TRACING) IF(${ARCH_32_BITS}) - ADD_TEST(gras-ping-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/ping test_sg_32) - ADD_TEST(gras-rpc-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc test_sg_32) - ADD_TEST(gras-spawn-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn test_sg_32) - ADD_TEST(gras-timer-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/timer test_sg_32) - ADD_TEST(gras-chrono-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono test_sg_32) - ADD_TEST(gras-simple-token-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token test_sg_32) - ADD_TEST(gras-mmrpc-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc test_sg_32) - ADD_TEST(gras-all2all-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all test_sg_32) - ADD_TEST(gras-pmm-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm test_sg_32) - ADD_TEST(gras-synchro-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro test_sg_32) + ADD_TEST(gras-ping-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_32) + ADD_TEST(gras-rpc-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_32) + ADD_TEST(gras-spawn-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/spawn --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_sg_32) + ADD_TEST(gras-timer-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/timer --cd ${CMAKE_BINARY_DIR}/examples/gras/timer ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/test_sg_32) + ADD_TEST(gras-chrono-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/chrono --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono/test_sg_32) + ADD_TEST(gras-simple-token-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token --cd ${CMAKE_BINARY_DIR}/examples/gras/mutual_exclusion/simple_token ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_sg_32) + ADD_TEST(gras-mmrpc-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc --cd ${CMAKE_BINARY_DIR}/examples/gras/mmrpc ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc/test_sg_32) + ADD_TEST(gras-all2all-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_32) + ADD_TEST(gras-pmm-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_32) + ADD_TEST(gras-synchro-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_32) ELSE(${ARCH_32_BITS}) - ADD_TEST(gras-ping-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/ping test_sg_64) - ADD_TEST(gras-rpc-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc test_sg_64) - ADD_TEST(gras-spawn-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn test_sg_64) - ADD_TEST(gras-timer-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/timer test_sg_64) - ADD_TEST(gras-chrono-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono test_sg_64) - ADD_TEST(gras-simple-token-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token test_sg_64) - ADD_TEST(gras-mmrpc-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc test_sg_64) - ADD_TEST(gras-all2all-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all test_sg_64) - ADD_TEST(gras-pmm-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm test_sg_64) - ADD_TEST(gras-synchro-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro test_sg_64) + ADD_TEST(gras-ping-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_64) + ADD_TEST(gras-rpc-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_64) + ADD_TEST(gras-spawn-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/spawn --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_sg_64) + ADD_TEST(gras-timer-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/timer --cd ${CMAKE_BINARY_DIR}/examples/gras/timer ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/test_sg_64) + ADD_TEST(gras-chrono-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/chrono --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono/test_sg_64) + ADD_TEST(gras-simple-token-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token --cd ${CMAKE_BINARY_DIR}/examples/gras/mutual_exclusion/simple_token ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_sg_64) + ADD_TEST(gras-mmrpc-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc --cd ${CMAKE_BINARY_DIR}/examples/gras/mmrpc ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc/test_sg_64) + ADD_TEST(gras-all2all-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_64) + ADD_TEST(gras-pmm-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_64) + ADD_TEST(gras-synchro-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_64) ENDIF(${ARCH_32_BITS}) -ADD_TEST(gras-properties-sg ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/gras/properties test_sg) +ADD_TEST(gras-properties-sg ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/properties --cd ${CMAKE_BINARY_DIR}/examples/gras/properties ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/test_sg) # amok examples -ADD_TEST(amok-bandwidth-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/amok bandwidth/bandwidth_rl.tesh) -ADD_TEST(amok-saturate-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/amok saturate/saturate_rl.tesh) +ADD_TEST(amok-bandwidth-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_rl.tesh) +ADD_TEST(amok-saturate-rl ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_rl.tesh) IF(${ARCH_32_BITS}) - ADD_TEST(amok-bandwidth-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/amok bandwidth/bandwidth_sg_32.tesh) - ADD_TEST(amok-saturate-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/amok saturate/saturate_sg_32.tesh) + ADD_TEST(amok-bandwidth-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_32.tesh) + ADD_TEST(amok-saturate-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_32.tesh) ELSE(${ARCH_32_BITS}) - ADD_TEST(amok-bandwidth-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/amok bandwidth/bandwidth_sg_64.tesh) - ADD_TEST(amok-saturate-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/amok saturate/saturate_sg_64.tesh) + ADD_TEST(amok-bandwidth-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_64.tesh) + ADD_TEST(amok-saturate-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_64.tesh) ENDIF(${ARCH_32_BITS}) # simdag examples -ADD_TEST(simdag-test-simdag ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag test_simdag.tesh) -ADD_TEST(simdag-test-simdag2 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag test_simdag2.tesh) -ADD_TEST(simdag-test-simdag-seq-access ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag test_simdag_seq_access.tesh) -ADD_TEST(simdag-test-prop ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag properties/test_prop.tesh) -ADD_TEST(simdag-minmin-test ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling test_minmin.tesh) +ADD_TEST(simdag-test-simdag ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag.tesh) +ADD_TEST(simdag-test-simdag2 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag2.tesh) +ADD_TEST(simdag-test-simdag-seq-access ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag_seq_access.tesh) +ADD_TEST(simdag-test-prop ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/properties/test_prop.tesh) +ADD_TEST(simdag-minmin-test ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/simdag/scheduling --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling test_minmin.tesh) if(HAVE_GTNETS) -ADD_TEST(msg-gtnets-waxman ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg gtnets/gtnets-waxman.tesh) -ADD_TEST(msg-gtnets-dogbone ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg gtnets/gtnets-dogbone-gtnets.tesh) -ADD_TEST(msg-gtnets-onelink ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg gtnets/gtnets-onelink-gtnets.tesh) -ADD_TEST(msg-gtnets-dogbone-lv08 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg gtnets/gtnets-dogbone-lv08.tesh) -ADD_TEST(msg-gtnets-onelink-lv08 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg gtnets/gtnets-onelink-lv08.tesh) +ADD_TEST(msg-gtnets-waxman ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-waxman.tesh) +ADD_TEST(msg-gtnets-dogbone ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh) +ADD_TEST(msg-gtnets-onelink ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-gtnets.tesh) +ADD_TEST(msg-gtnets-dogbone-lv08 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-lv08.tesh) +ADD_TEST(msg-gtnets-onelink-lv08 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-lv08.tesh) +ADD_TEST(msg-gtnets-fullduplex ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-fullduplex.tesh) if(HAVE_TRACING) - ADD_TEST(msg-tracing-gtnets-waxman ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg gtnets/tracing-gtnets-waxman.tesh) - ADD_TEST(msg-tracing-gtnets-dogbone ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg gtnets/tracing-gtnets-dogbone-gtnets.tesh) - ADD_TEST(msg-tracing-gtnets-onelink ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg gtnets/tracing-gtnets-onelink-gtnets.tesh) - ADD_TEST(msg-tracing-gtnets-dogbone-lv08 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg gtnets/tracing-gtnets-dogbone-lv08.tesh) - ADD_TEST(msg-tracing-gtnets-onelink-lv08 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg gtnets/tracing-gtnets-onelink-lv08.tesh) - ADD_TEST(msg-gtnets-fullduplex ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg gtnets/gtnets-fullduplex.tesh) + ADD_TEST(msg-tracing-gtnets-waxman ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-waxman.tesh) + ADD_TEST(msg-tracing-gtnets-dogbone ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh) + ADD_TEST(msg-tracing-gtnets-onelink ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh) + ADD_TEST(msg-tracing-gtnets-dogbone-lv08 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh) + ADD_TEST(msg-tracing-gtnets-onelink-lv08 ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-onelink-lv08.tesh) endif(HAVE_TRACING) endif(HAVE_GTNETS) # Lua examples if(HAVE_LUA) -ADD_TEST(lua-masterslave ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/lua master_slave.tesh) -ADD_TEST(lua-mult-matrix ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/lua mult_matrix.tesh) -ADD_TEST(lua-masterslave-bypass ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/lua master_slave_bypass.tesh) -ADD_TEST(lua-msg-masterslave-console ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/ masterslave_console.tesh) +ADD_TEST(lua-masterslave ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/lua master_slave.tesh) +ADD_TEST(lua-mult-matrix ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/lua mult_matrix.tesh) +ADD_TEST(lua-masterslave-bypass ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/lua master_slave_bypass.tesh) +ADD_TEST(lua-msg-masterslave-console ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/msg/masterslave --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_console.tesh) +set_tests_properties(lua-masterslave PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") +set_tests_properties(lua-mult-matrix PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") +set_tests_properties(lua-masterslave-bypass PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") +set_tests_properties(lua-msg-masterslave-console PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") endif(HAVE_LUA) # Ruby examples @@ -207,6 +211,9 @@ if(HAVE_RUBY) ADD_TEST(ruby-masterslave ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/ruby MasterSlave.tesh) ADD_TEST(ruby-ping-pong ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/ruby PingPong.tesh) ADD_TEST(ruby-quicksort ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/ruby Quicksort.tesh) +set_tests_properties(ruby-masterslave PROPERTIES ENVIRONMENT "RUBYLIB=${CMAKE_BINARY_DIR}/lib") +set_tests_properties(ruby-ping-pong PROPERTIES ENVIRONMENT "RUBYLIB=${CMAKE_BINARY_DIR}/lib") +set_tests_properties(ruby-quicksort PROPERTIES ENVIRONMENT "RUBYLIB=${CMAKE_BINARY_DIR}/lib") endif(HAVE_RUBY) # END TESH TESTS @@ -249,23 +256,23 @@ endif(HAVE_RUBY) endif(NOT enable_memcheck) -ADD_TEST(tesh-simdag-full-links01 ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK) -ADD_TEST(tesh-simdag-full-links02 ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters_one_name.xml FULL_LINK) -ADD_TEST(tesh-simdag-one-link-g5k ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/examples/platforms/g5k.xml ONE_LINK) -ADD_TEST(msg-icomms-waitany ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/peer3 ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml) +ADD_TEST(tesh-simdag-full-links01 ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK) +ADD_TEST(tesh-simdag-full-links02 ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters_one_name.xml FULL_LINK) +ADD_TEST(tesh-simdag-one-link-g5k ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/examples/platforms/g5k.xml ONE_LINK) +ADD_TEST(msg-icomms-waitany ${CMAKE_BINARY_DIR}/examples/msg/icomms/peer3 ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml) # testsuite directory -add_test(test-xbt-log ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/log_usage) -add_test(test-xbt-graphxml ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/graphxml_usage ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/graph.xml) -add_test(test-xbt-heap ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/heap_bench) +add_test(test-xbt-log ${CMAKE_BINARY_DIR}/testsuite/xbt/log_usage) +add_test(test-xbt-graphxml ${CMAKE_BINARY_DIR}/testsuite/xbt/graphxml_usage ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/graph.xml) +add_test(test-xbt-heap ${CMAKE_BINARY_DIR}/testsuite/xbt/heap_bench) -add_test(test-surf-lmm ${CMAKE_HOME_DIRECTORY}/testsuite/surf/lmm_usage) -add_test(test-surf-maxmin ${CMAKE_HOME_DIRECTORY}/testsuite/surf/maxmin_bench) -add_test(test-surf-usage ${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/ platform.xml) -add_test(test-surf-usage2 ${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage2 --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/ platform.xml) -add_test(test-surf-trace ${CMAKE_HOME_DIRECTORY}/testsuite/surf/trace_usage --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/) +add_test(test-surf-lmm ${CMAKE_BINARY_DIR}/testsuite/surf/lmm_usage) +add_test(test-surf-maxmin ${CMAKE_BINARY_DIR}/testsuite/surf/maxmin_bench) +add_test(test-surf-usage ${CMAKE_BINARY_DIR}/testsuite/surf/surf_usage --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/ platform.xml) +add_test(test-surf-usage2 ${CMAKE_BINARY_DIR}/testsuite/surf/surf_usage2 --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/ platform.xml) +add_test(test-surf-trace ${CMAKE_BINARY_DIR}/testsuite/surf/trace_usage --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/) -add_test(testall ${CMAKE_HOME_DIRECTORY}/src/testall) +add_test(testall ${CMAKE_BINARY_DIR}/src/testall) if(enable_memcheck) include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake) diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake index fb130d2c33..bd53502a51 100644 --- a/buildtools/Cmake/MakeExeLib.cmake +++ b/buildtools/Cmake/MakeExeLib.cmake @@ -80,12 +80,13 @@ endif(HAVE_PCRE_LIB) if(HAVE_RUBY) set(SIMGRID_DEP "${SIMGRID_DEP} -l${RUBY_LIBRARY_NAME}") ADD_CUSTOM_TARGET(link_simgrid_ruby ALL - DEPENDS simgrid ${CMAKE_HOME_DIRECTORY}/src/bindings/ruby/libsimgrid.${LIB_EXE} + DEPENDS simgrid ${CMAKE_BINARY_DIR}/src/bindings/ruby/libsimgrid.${LIB_EXE} ) add_custom_command( - OUTPUT ${CMAKE_HOME_DIRECTORY}/src/bindings/ruby/libsimgrid.${LIB_EXE} - COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/bindings/ruby/libsimgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_HOME_DIRECTORY}/src/bindings/ruby/libsimgrid.${LIB_EXE} + OUTPUT ${CMAKE_BINARY_DIR}/src/bindings/ruby/libsimgrid.${LIB_EXE} + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/src/bindings/ruby/libsimgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/src/bindings/ruby/ + COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/src/bindings/ruby/libsimgrid.${LIB_EXE} ) endif(HAVE_RUBY) @@ -98,22 +99,25 @@ endif(pthread) if(HAVE_LUA) ADD_CUSTOM_TARGET(link_simgrid_lua ALL DEPENDS simgrid - ${CMAKE_HOME_DIRECTORY}/examples/lua/simgrid.${LIB_EXE} - ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/simgrid.${LIB_EXE} - ${CMAKE_HOME_DIRECTORY}/examples/simdag/simgrid.${LIB_EXE} + ${CMAKE_BINARY_DIR}/examples/lua/simgrid.${LIB_EXE} + ${CMAKE_BINARY_DIR}/examples/msg/masterslave/simgrid.${LIB_EXE} + ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE} ) add_custom_command( - OUTPUT ${CMAKE_HOME_DIRECTORY}/examples/lua/simgrid.${LIB_EXE} - ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/simgrid.${LIB_EXE} - ${CMAKE_HOME_DIRECTORY}/examples/simdag/simgrid.${LIB_EXE} - COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/examples/lua/simgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_HOME_DIRECTORY}/examples/lua/simgrid.${LIB_EXE} #for test + OUTPUT ${CMAKE_BINARY_DIR}/examples/lua/simgrid.${LIB_EXE} + ${CMAKE_BINARY_DIR}/examples/msg/masterslave/simgrid.${LIB_EXE} + ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE} + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/examples/lua/simgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/lua/ + COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/examples/lua/simgrid.${LIB_EXE} #for test - COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/simgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/simgrid.${LIB_EXE} #for test + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/examples/msg/masterslave/simgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/msg/masterslave/ + COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/examples/msg/masterslave/simgrid.${LIB_EXE} #for test - COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/examples/simdag/simgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_HOME_DIRECTORY}/examples/simdag/simgrid.${LIB_EXE} #for test + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/simdag/ + COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE} #for test ) SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -l${LIB_LUA_NAME}") endif(HAVE_LUA) diff --git a/examples/gras/console/CMakeLists.txt b/examples/gras/console/CMakeLists.txt index 6e7a215b7c..29309c0c64 100644 --- a/examples/gras/console/CMakeLists.txt +++ b/examples/gras/console/CMakeLists.txt @@ -1,34 +1,34 @@ if(HAVE_LUA) cmake_minimum_required(VERSION 2.6) -set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/_ping_simulator.c - ${CMAKE_CURRENT_SOURCE_DIR}/_ping_client.c - ${CMAKE_CURRENT_SOURCE_DIR}/_ping_server.c +set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c + ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c + ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c PROPERTIES GENERATED true) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") -add_executable(ping_simulator_console ${CMAKE_CURRENT_SOURCE_DIR}/_ping_simulator.c +add_executable(ping_simulator_console ${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/ping_server.c ${CMAKE_CURRENT_SOURCE_DIR}/ping_client.c ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c) -add_executable(ping_client_console ${CMAKE_CURRENT_SOURCE_DIR}/_ping_client.c +add_executable(ping_client_console ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c ${CMAKE_CURRENT_SOURCE_DIR}/ping_client.c ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c) -add_executable(ping_server_console ${CMAKE_CURRENT_SOURCE_DIR}/_ping_server.c +add_executable(ping_server_console ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c ${CMAKE_CURRENT_SOURCE_DIR}/ping_server.c ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c) add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/_ping_simulator.c - ${CMAKE_CURRENT_SOURCE_DIR}/_ping_client.c - ${CMAKE_CURRENT_SOURCE_DIR}/_ping_server.c - ${CMAKE_HOME_DIRECTORY}/examples/gras/console/simgrid.${LIB_EXE} - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_HOME_DIRECTORY}/examples/gras/console/simgrid.${LIB_EXE} + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c + ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c + ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c + ${CMAKE_CURRENT_BINARY_DIR}/simgrid.${LIB_EXE} + COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_CURRENT_BINARY_DIR}/simgrid.${LIB_EXE} COMMAND lua ${CMAKE_CURRENT_SOURCE_DIR}/ping_generator.lua - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} #needed to find simgrid.so. By default CMAKE_CURRENT_BINARY_DIR + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} #needed to find simgrid.so. By default CMAKE_CURRENT_BINARY_DIR ) ### Add definitions for compile diff --git a/examples/msg/actions/actions.tesh b/examples/msg/actions/actions.tesh index 0d3c3f510e..2977d07c29 100644 --- a/examples/msg/actions/actions.tesh +++ b/examples/msg/actions/actions.tesh @@ -2,7 +2,7 @@ ! output sort -$ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment_split.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment_split.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [500.005200] (1:p0@host0) p0 recv p1 500.005200 > [500.005200] (2:p1@host1) p1 send p0 1e10 500.005200 > [500.005201] (1:p0@host0) p0 compute 12 0.000001 @@ -10,7 +10,7 @@ $ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment_split > [512.005200] (2:p1@host1) p1 sleep 12 12.000000 ! output sort -$ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_allReduce.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_allReduce.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (1:p0@host0) p0 comm_size 3 0.000000 > [100.010400] (1:p0@host0) p0 allReduce 5e8 5e8 100.010400 > [100.010400] (2:p1@host1) p1 allReduce 5e8 5e8 100.010400 @@ -21,7 +21,7 @@ $ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml a > [150.010400] (3:p2@host2) p2 compute 5e8 50.000000 ! output sort -$ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_barrier.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_barrier.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (1:p0@host0) p0 comm_size 3 0.000000 > [ 0.000000] (2:p1@host1) p1 comm_size 3 0.000000 > [ 0.000000] (3:p2@host2) p2 comm_size 3 0.000000 @@ -33,7 +33,7 @@ $ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml a > [ 0.955200] (1:p0@host0) p0 compute 4.5E6 0.450000 ! output sort -$ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_bcast.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_bcast.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (1:p0@host0) p0 comm_size 3 0.000000 > [ 25.005200] (1:p0@host0) p0 bcast 5e8 25.005200 > [ 25.005200] (2:p1@host1) p1 bcast 5e8 25.005200 @@ -53,7 +53,7 @@ $ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml a > [225.015600] (1:p0@host0) p0 reduce 5e8 5e8 75.005200 ! output sort -$ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_reduce.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_reduce.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (1:p0@host0) p0 comm_size 3 0.000000 > [ 25.005200] (2:p1@host1) p1 reduce 5e8 5e8 25.005200 > [ 25.005200] (3:p2@host2) p2 reduce 5e8 5e8 25.005200 @@ -64,7 +64,7 @@ $ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml a > [125.005200] (1:p0@host0) p0 compute 5e8 50.000000 ! output sort -$ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_with_isend.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_with_isend.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (2:p1@host1) p1 Irecv p0 0.000000 > [ 0.000000] (3:p2@host2) p2 Irecv p1 0.000000 > [ 50.000000] (3:p2@host2) p2 compute 5e8 50.000000 diff --git a/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh b/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh index 9738883cf3..6f59afb925 100644 --- a/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh +++ b/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh @@ -2,7 +2,7 @@ p Testing dogbone communication pattern with GTNets model -$ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets +$ gtnets/gtnets ${srcdir:=.}/gtnets/dogbone-p.xml ${srcdir:=.}/gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets' diff --git a/examples/msg/gtnets/gtnets-dogbone-lv08.tesh b/examples/msg/gtnets/gtnets-dogbone-lv08.tesh index 8078a08111..aab0e721e6 100644 --- a/examples/msg/gtnets/gtnets-dogbone-lv08.tesh +++ b/examples/msg/gtnets/gtnets-dogbone-lv08.tesh @@ -2,7 +2,7 @@ p Testing dogbone communication pattern with LV08 model -$ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 +$ gtnets/gtnets ${srcdir:=.}/gtnets/dogbone-p.xml ${srcdir:=.}/gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'LV08' diff --git a/examples/msg/gtnets/gtnets-fullduplex.tesh b/examples/msg/gtnets/gtnets-fullduplex.tesh index 30d72f04ac..b1fcf162ec 100644 --- a/examples/msg/gtnets/gtnets-fullduplex.tesh +++ b/examples/msg/gtnets/gtnets-fullduplex.tesh @@ -2,7 +2,7 @@ p Testing fullduplex TCP option DISABLED -$ gtnets/gtnets gtnets/fullduplex-p.xml gtnets/fullduplex-d.xml --cfg=fullduplex:0 +$ gtnets/gtnets ${srcdir:=.}/gtnets/fullduplex-p.xml ${srcdir:=.}/gtnets/fullduplex-d.xml --cfg=fullduplex:0 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'fullduplex' to '0' > [C1:master:(7) 108.799652] [msg_test/INFO] Send completed (to S1). Transfer time: 108.799652 Agregate bandwidth: 9191.205854 > [C1:master:(7) 108.799652] [msg_test/INFO] Completed peer: S1 time: 108.799652 @@ -14,7 +14,7 @@ $ gtnets/gtnets gtnets/fullduplex-p.xml gtnets/fullduplex-d.xml --cfg=fullduplex p Testing fullduplex TCP option ENABLED -$ gtnets/gtnets gtnets/fullduplex-p.xml gtnets/fullduplex-d.xml --cfg=fullduplex:1 +$ gtnets/gtnets ${srcdir:=.}/gtnets/fullduplex-p.xml ${srcdir:=.}/gtnets/fullduplex-d.xml --cfg=fullduplex:1 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'fullduplex' to '1' > [S1:master:(1) 331.625739] [msg_test/INFO] Send completed (to C1). Transfer time: 331.625739 Agregate bandwidth: 3015.447482 > [S1:master:(1) 331.625739] [msg_test/INFO] Completed peer: C1 time: 331.625739 diff --git a/examples/msg/gtnets/gtnets-onelink-gtnets.tesh b/examples/msg/gtnets/gtnets-onelink-gtnets.tesh index 17d2229bb6..7515b81762 100644 --- a/examples/msg/gtnets/gtnets-onelink-gtnets.tesh +++ b/examples/msg/gtnets/gtnets-onelink-gtnets.tesh @@ -2,7 +2,7 @@ p Testing onelink communication pattern with GTNets model -$ gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets +$ gtnets/gtnets ${srcdir:=.}/gtnets/onelink-p.xml ${srcdir:=.}/gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets' diff --git a/examples/msg/gtnets/gtnets-onelink-lv08.tesh b/examples/msg/gtnets/gtnets-onelink-lv08.tesh index a54832d81b..205c2e4a6f 100644 --- a/examples/msg/gtnets/gtnets-onelink-lv08.tesh +++ b/examples/msg/gtnets/gtnets-onelink-lv08.tesh @@ -2,7 +2,7 @@ p Testing onelink communication pattern with LV08 model -$ gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO +$ gtnets/gtnets ${srcdir:=.}/gtnets/onelink-p.xml ${srcdir:=.}/gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'LV08' diff --git a/examples/msg/gtnets/gtnets-waxman.tesh b/examples/msg/gtnets/gtnets-waxman.tesh index 339aad1da3..531bfb1df4 100644 --- a/examples/msg/gtnets/gtnets-waxman.tesh +++ b/examples/msg/gtnets/gtnets-waxman.tesh @@ -3,7 +3,7 @@ p Testing waxman radom communication pattern with GTNets model, 200 nodes, 200 flows ! timeout 10 -$ gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets +$ gtnets/gtnets ${srcdir:=.}/gtnets/waxman-p.xml ${srcdir:=.}/gtnets/waxman-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets' diff --git a/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh b/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh index 6ccc0b8ae4..507ced42c7 100644 --- a/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh +++ b/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh @@ -2,7 +2,7 @@ p Testing dogbone communication pattern with GTNets model -$ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_gtnets.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets +$ gtnets/gtnets ${srcdir:=.}/gtnets/dogbone-p.xml ${srcdir:=.}/gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_gtnets.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'dogbone_gtnets.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' diff --git a/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh b/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh index 9ae6b1d28d..2ab5986bf2 100644 --- a/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh +++ b/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh @@ -2,7 +2,7 @@ p Testing dogbone communication pattern with LV08 model -$ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_lv08.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 +$ gtnets/gtnets ${srcdir:=.}/gtnets/dogbone-p.xml ${srcdir:=.}/gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_lv08.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'dogbone_lv08.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' diff --git a/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh b/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh index 0f94d2a558..4d291e0555 100644 --- a/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh +++ b/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh @@ -2,7 +2,7 @@ p Testing onelink communication pattern with GTNets model -$ gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=tracing/filename:onelink_gtnets.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets +$ gtnets/gtnets ${srcdir:=.}/gtnets/onelink-p.xml ${srcdir:=.}/gtnets/onelink-d.xml --cfg=tracing/filename:onelink_gtnets.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'onelink_gtnets.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' diff --git a/examples/msg/gtnets/tracing-gtnets-onelink-lv08.tesh b/examples/msg/gtnets/tracing-gtnets-onelink-lv08.tesh index 8499ca65d3..3adcd4a8ea 100644 --- a/examples/msg/gtnets/tracing-gtnets-onelink-lv08.tesh +++ b/examples/msg/gtnets/tracing-gtnets-onelink-lv08.tesh @@ -2,7 +2,7 @@ p Testing onelink communication pattern with LV08 model -$ gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=tracing/filename:onelink_lv08.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO +$ gtnets/gtnets ${srcdir:=.}/gtnets/onelink-p.xml ${srcdir:=.}/gtnets/onelink-d.xml --cfg=tracing/filename:onelink_lv08.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'onelink_lv08.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' diff --git a/examples/msg/gtnets/tracing-gtnets-waxman.tesh b/examples/msg/gtnets/tracing-gtnets-waxman.tesh index d7b2f12ced..42d4e6e89f 100644 --- a/examples/msg/gtnets/tracing-gtnets-waxman.tesh +++ b/examples/msg/gtnets/tracing-gtnets-waxman.tesh @@ -3,7 +3,7 @@ p Testing waxman radom communication pattern with GTNets model, 200 nodes, 200 flows ! timeout 10 -$ gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=tracing/filename:waxman_gtnets.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets +$ gtnets/gtnets ${srcdir:=.}/gtnets/waxman-p.xml ${srcdir:=.}/gtnets/waxman-d.xml --cfg=tracing/filename:waxman_gtnets.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'waxman_gtnets.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' diff --git a/examples/msg/icomms/peer.tesh b/examples/msg/icomms/peer.tesh index 5c75a0f08c..371d681eec 100644 --- a/examples/msg/icomms/peer.tesh +++ b/examples/msg/icomms/peer.tesh @@ -5,7 +5,7 @@ p Test1 MSG_comm_test() with Sleep_sender > Sleep_receiver ! output sort -$ ./peer small_platform.xml deployment_peer01.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer01.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 5.000000 , sleep_test_time : 0.100000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 1.000000 , sleep_test_time : 0.100000 > [ 1.000000] (2:receiver@Ruby) Wait to receive a task @@ -34,7 +34,7 @@ $ ./peer small_platform.xml deployment_peer01.xml --log=root.fmt:[%10.6r]%e(%i:% p Test2 MSG_comm_test() with Sleep_sender < Sleep_receiver ! output sort -$ ./peer small_platform.xml deployment_peer02.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer02.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 1.000000 , sleep_test_time : 0.100000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 5.000000 , sleep_test_time : 0.100000 > [ 1.000000] (1:sender@Tremblay) Send to receiver-0 Task_0 @@ -63,7 +63,7 @@ $ ./peer small_platform.xml deployment_peer02.xml --log=root.fmt:[%10.6r]%e(%i:% p Test1 MSG_comm_wait() with Sleep_sender > Sleep_receiver ! output sort -$ ./peer small_platform.xml deployment_peer03.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer03.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 5.000000 , sleep_test_time : 0.000000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 1.000000 , sleep_test_time : 0.000000 > [ 1.000000] (2:receiver@Ruby) Wait to receive a task @@ -92,7 +92,7 @@ $ ./peer small_platform.xml deployment_peer03.xml --log=root.fmt:[%10.6r]%e(%i:% p Test2 MSG_comm_wait() with Sleep_sender < Sleep_receiver ! output sort -$ ./peer small_platform.xml deployment_peer04.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer04.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 1.000000 , sleep_test_time : 0.000000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 5.000000 , sleep_test_time : 0.000000 > [ 1.000000] (1:sender@Tremblay) Send to receiver-0 Task_0 @@ -121,7 +121,7 @@ $ ./peer small_platform.xml deployment_peer04.xml --log=root.fmt:[%10.6r]%e(%i:% p Test1 MSG_comm_waitall() for sender ! output sort -$ ./peer2 small_platform.xml deployment_peer.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ./peer2 ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (1:sender@Tremblay) Send to receiver-0 Task_0 > [ 0.000000] (1:sender@Tremblay) Send to receiver-0 Task_1 > [ 0.000000] (1:sender@Tremblay) Send to receiver-0 Task_2 diff --git a/examples/msg/masterslave/masterslave_console.tesh b/examples/msg/masterslave/masterslave_console.tesh index 2ab90f61a8..c847502eec 100644 --- a/examples/msg/masterslave/masterslave_console.tesh +++ b/examples/msg/masterslave/masterslave_console.tesh @@ -1,7 +1,7 @@ #! ./tesh ! output sort -$ $SG_TEST_EXENV masterslave_console platform_script.lua --log=surf_parse.thres:critical --log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV masterslave_console ${srcdir:=.}/platform_script.lua --log=surf_parse.thres:critical --log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (1:master@Tremblay) Got 4 slaves and 20 tasks to process > [ 0.000000] (1:master@Tremblay) Sending "Task_0" (of 20) to mailbox "slave-0" > [ 221.119476] (1:master@Tremblay) Sending "Task_1" (of 20) to mailbox "slave-1" diff --git a/examples/msg/masterslave/masterslave_cpu_ti.tesh b/examples/msg/masterslave/masterslave_cpu_ti.tesh index be85695d2c..b1ca72dde3 100644 --- a/examples/msg/masterslave/masterslave_cpu_ti.tesh +++ b/examples/msg/masterslave/masterslave_cpu_ti.tesh @@ -3,7 +3,7 @@ p Testing a simple master/slave example application ! output sort -$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT small_platform.xml masterslave/deployment_masterslave.xml --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' > [ 0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s) > [ 0.000000] (1:master@Tremblay) Got 5 slaves and 20 tasks to process @@ -128,7 +128,7 @@ $ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/small_pla p Testing a master/slave example application with a forwarder module ! output sort -$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/msg_platform.xml ${srcdir:=.}/masterslave/deployment_masterslave_forwarder.xml --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT msg_platform.xml masterslave/deployment_masterslave_forwarder.xml --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' > [ 0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s) > [ 0.000000] (1:master@Jacquelin) Got 5 slaves and 20 tasks to process @@ -279,7 +279,7 @@ $ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/msg_platf p Testing a simple master/slave example application handling failures ! output sort -$ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=path:${srcdir} --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc small_platform_with_failures.xml masterslave/deployment_masterslave.xml --cfg=path:${srcdir} --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s) > [ 0.000000] (0:@) Cannot launch process 'slave' on failed host 'Fafard' > [ 0.000000] (1:master@Tremblay) Got 5 slave(s) : @@ -374,7 +374,7 @@ $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_l p Testing the bypassing of the flexml parser ! output sort -$ $SG_TEST_EXENV masterslave/masterslave_bypass --log=no_loc --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/masterslave_bypass --log=no_loc --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' > [ 0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s) > [ 0.000000] (0:@) Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code. diff --git a/examples/msg/masterslave/masterslave_multicore.tesh b/examples/msg/masterslave/masterslave_multicore.tesh index 8515d8c8b1..9461fe0cc8 100644 --- a/examples/msg/masterslave/masterslave_multicore.tesh +++ b/examples/msg/masterslave/masterslave_multicore.tesh @@ -2,7 +2,7 @@ p Testing a simple master/slave example application -$ $SG_TEST_EXENV ./masterslave/masterslave_mailbox ../platforms/multicore_machine.xml ./masterslave/deployment_masterslave_mailbox_multicore.xml --cfg=cpu/model:Cas01_fullupdate +$ $SG_TEST_EXENV ./masterslave/masterslave_mailbox ${srcdir:=.}/../platforms/multicore_machine.xml ${srcdir:=.}/masterslave/deployment_masterslave_mailbox_multicore.xml --cfg=cpu/model:Cas01_fullupdate > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01_fullupdate' > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 6 slaves and 20 tasks to process diff --git a/examples/msg/masterslave/masterslave_vivaldi.tesh b/examples/msg/masterslave/masterslave_vivaldi.tesh index aba78934fe..bbca1545aa 100644 --- a/examples/msg/masterslave/masterslave_vivaldi.tesh +++ b/examples/msg/masterslave/masterslave_vivaldi.tesh @@ -2,7 +2,7 @@ p Testing a simple master/slave example application -$ $SG_TEST_EXENV ./masterslave/masterslave_mailbox ../platforms/vivaldi.xml ./masterslave/deployment_masterslave_vivaldi.xml --cfg=network/latency_factor:1.0 --cfg=network/bandwidth_factor:1.0 +$ $SG_TEST_EXENV ./masterslave/masterslave_mailbox ${srcdir:=.}/../platforms/vivaldi.xml ${srcdir:=.}/masterslave/deployment_masterslave_vivaldi.xml --cfg=network/latency_factor:1.0 --cfg=network/bandwidth_factor:1.0 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/latency_factor' to '1.0' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/bandwidth_factor' to '1.0' > [100030591:master:(1) 0.000000] [msg_test/INFO] Got 39 slaves and 20 tasks to process diff --git a/examples/msg/trace/trace.tesh b/examples/msg/trace/trace.tesh index cb31bf46f1..5efce28347 100644 --- a/examples/msg/trace/trace.tesh +++ b/examples/msg/trace/trace.tesh @@ -3,7 +3,7 @@ p Testing trace integration using file.trace and test1.xml, a < max(time), b < max(time) ! output sort -$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test1.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test1.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -15,7 +15,7 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test1.xm p Testing trace integration using file.trace and test2.xml, a < max(time), max(time) < b < 2 max(time) ! output sort -$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test2.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test2.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -28,7 +28,7 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test2.xm p Testing trace integration using file.trace and test3.xml, a < max(time), b > 2 max(time) ! output sort -$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test3.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test3.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -40,7 +40,7 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test3.xm p Testing trace integration using file.trace and test4.xml, max(time) < a < 2max(time), max(time) < b < 2max(time) ! output sort -$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test4.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test4.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -52,7 +52,7 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test4.xm p Testing trace integration using file.trace and test5.xml, max(time) < a < 2max(time), 2max(time) < b < 3max(time) ! output sort -$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test5.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test5.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -64,7 +64,7 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test5.xm p Testing trace integration using file.trace and test6.xml, max(time) < a < 2max(time), b > 3max(time) ! output sort -$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test6.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test6.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -76,7 +76,7 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test6.xm p Testing trace integration using file.trace and test7.xml, two process with same priority ! output sort -$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test7.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test7.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -92,7 +92,7 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test7.xm p Testing trace integration using file.trace and test8.xml, two process with different priority ! output sort -$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test8.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test8.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -108,7 +108,7 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test8.xm p Testing trace integration using file.trace and test9.xml, three process with same priority ! output sort -$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test9.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test9.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -128,7 +128,7 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test9.xm p Testing trace integration using file.trace and test10.xml, three process with different priority ! output sort -$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test10.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test10.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -148,7 +148,7 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test10.x p Testing trace integration using file.trace and test11.xml, three process with different priority. Changed timestep to 0.1. ! output sort -$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test11.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test11.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' diff --git a/examples/msg/tracing/categories.tesh b/examples/msg/tracing/categories.tesh index ee6db929cf..2e3d586542 100644 --- a/examples/msg/tracing/categories.tesh +++ b/examples/msg/tracing/categories.tesh @@ -2,7 +2,7 @@ p Tracing multiple categories master/slave application -$ $SG_TEST_EXENV tracing/categories$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:tracing/categories.trace --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=triva/categorized:tracing/categories.cat.plist --cfg=triva/uncategorized:tracing/categories.uncat.plist ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml +$ $SG_TEST_EXENV ${bindir:=.}/tracing/categories$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:tracing/categories.trace --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=triva/categorized:tracing/categories.cat.plist --cfg=triva/uncategorized:tracing/categories.uncat.plist ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/categories.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' diff --git a/examples/msg/tracing/ms.tesh b/examples/msg/tracing/ms.tesh index 5bae1b3af2..e2294aabef 100644 --- a/examples/msg/tracing/ms.tesh +++ b/examples/msg/tracing/ms.tesh @@ -2,7 +2,7 @@ p Tracing master/slave application -$ $SG_TEST_EXENV tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:tracing/ms.trace --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=triva/categorized:tracing/ms.cat.plist --cfg=triva/uncategorized:tracing/ms.uncat.plist --log=instr_paje.thres:debug --log=instr_paje_trace.thres:debug --log=root.fmt:[%10.6r]%e\(%i:%P@%h\)%e%m%n ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml +$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:tracing/ms.trace --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=triva/categorized:tracing/ms.cat.plist --cfg=triva/uncategorized:tracing/ms.uncat.plist --log=instr_paje.thres:debug --log=instr_paje_trace.thres:debug --log=root.fmt:[%10.6r]%e\(%i:%P@%h\)%e%m%n ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml > [ 0.000000] (0:@) Configuration change: Set 'tracing' to '1' > [ 0.000000] (0:@) Configuration change: Set 'tracing/filename' to 'tracing/ms.trace' > [ 0.000000] (0:@) Configuration change: Set 'tracing/categorized' to '1' diff --git a/examples/msg/tracing/procmig.tesh b/examples/msg/tracing/procmig.tesh index 4da00ae258..74244657c7 100644 --- a/examples/msg/tracing/procmig.tesh +++ b/examples/msg/tracing/procmig.tesh @@ -2,7 +2,7 @@ p Tracing processes -$ $SG_TEST_EXENV tracing/procmig$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:tracing/procmig.trace --cfg=tracing/msg/process:1 ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.xml +$ $SG_TEST_EXENV ${bindir:=.}/tracing/procmig$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:tracing/procmig.trace --cfg=tracing/msg/process:1 ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/procmig.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to '1' diff --git a/examples/msg/tracing/tasks.tesh b/examples/msg/tracing/tasks.tesh index 851a6023d1..f7722923a7 100644 --- a/examples/msg/tracing/tasks.tesh +++ b/examples/msg/tracing/tasks.tesh @@ -2,7 +2,7 @@ p Tracing tasks -$ $SG_TEST_EXENV tracing/tasks$EXEEXT --cfg=tracing:1 --cfg=tracing/msg/task:1 --cfg=tracing/filename:tracing/tasks.trace ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml +$ $SG_TEST_EXENV ${bindir:=.}/tracing/tasks$EXEEXT --cfg=tracing:1 --cfg=tracing/msg/task:1 --cfg=tracing/filename:tracing/tasks.trace ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/task' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/tasks.trace' diff --git a/examples/msg/tracing/volume.tesh b/examples/msg/tracing/volume.tesh index 6c64336e4b..1c2117e86e 100644 --- a/examples/msg/tracing/volume.tesh +++ b/examples/msg/tracing/volume.tesh @@ -2,7 +2,7 @@ p Tracing communications among processes of a master/slave application -$ $SG_TEST_EXENV tracing/volume$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:tracing/volume.trace --cfg=tracing/msg/volume:1 ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml +$ $SG_TEST_EXENV ${bindir:=.}/tracing/volume$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:tracing/volume.trace --cfg=tracing/msg/volume:1 ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/volume.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/volume' to '1' diff --git a/examples/ruby/MasterSlave.tesh b/examples/ruby/MasterSlave.tesh index 3a38d3fedf..5b54ad5ce1 100644 --- a/examples/ruby/MasterSlave.tesh +++ b/examples/ruby/MasterSlave.tesh @@ -1,8 +1,5 @@ # MasterSlave Ruby Example -# This setenv and the -I arg are mandatory until the make install only -! setenv RUBYLIB=../../lib - $ ruby -I ../../src/bindings/ruby MasterSlave.rb > [Tremblay:Master:(1) 0.000000] [ruby/INFO] args[0]=20 > [Tremblay:Master:(1) 0.000000] [ruby/INFO] args[1]=50000000 diff --git a/examples/ruby/PingPong.tesh b/examples/ruby/PingPong.tesh index 501b23c873..90380e5253 100644 --- a/examples/ruby/PingPong.tesh +++ b/examples/ruby/PingPong.tesh @@ -1,8 +1,5 @@ #PingPong Example -# This setenv and the -I arg are mandatory until the make install only -! setenv RUBYLIB=../../lib - $ ruby -I ../../src/bindings/ruby PingPong.rb > [Inmos:Sender:(1) 0.000000] [ruby/INFO] Hello from Sender > [Inmos:Sender:(1) 0.000000] [ruby/INFO] Host count :1 diff --git a/examples/ruby/Quicksort.tesh b/examples/ruby/Quicksort.tesh index 19a035298a..152036472e 100644 --- a/examples/ruby/Quicksort.tesh +++ b/examples/ruby/Quicksort.tesh @@ -1,8 +1,5 @@ #QuickSort Ruby Example -# This setenv and the -I arg are mandatory until the make install only -! setenv RUBYLIB=../../lib - $ ruby -I ../../src/bindings/ruby Quicksort.rb > [Inmos:Sender:(1) 0.000000] [ruby/INFO] Hello Bellevue !!, Please !! I need you to help me to sort my table , Here it is : > [1, -2, 45, 67, 87, 76, 89, 56, 78, 3, -4, 99] diff --git a/examples/simdag/scheduling/test_minmin.tesh b/examples/simdag/scheduling/test_minmin.tesh index 824c2e6df8..74a1b71855 100644 --- a/examples/simdag/scheduling/test_minmin.tesh +++ b/examples/simdag/scheduling/test_minmin.tesh @@ -2,7 +2,7 @@ p Simple test of simdag -$ $SG_TEST_EXENV ./minmin_test --log=sd_daxparse.thresh:critical ${srcdir:=.}/simulacrum_7_hosts.xml ${srcdir:=.}/Montage_25.xml +$ $SG_TEST_EXENV ${bindir:=.}/minmin_test --log=sd_daxparse.thresh:critical ${srcdir:=.}/simulacrum_7_hosts.xml ${srcdir:=.}/Montage_25.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > [0.000000] [test/INFO] Schedule ID00002@mProjectPP on Host 27 > [0.000105] [test/INFO] Schedule ID00000@mProjectPP on Host 26 diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh index 02bf6b7c66..18efe5bee0 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh @@ -1,75 +1,75 @@ -$ ./basic_parsing_test one_cluster.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_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 > Workstation number: 5, link number: 8 -$ ./basic_parsing_test one_host_availability.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_host_availability.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 1 -$ ./basic_parsing_test one_host_properties.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_host_properties.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 1 -$ ./basic_parsing_test one_host_state_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_host_state_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 1 -$ ./basic_parsing_test one_host_state_off.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_host_state_off.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 1 -$ ./basic_parsing_test one_host_state_on.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_host_state_on.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 1 -$ ./basic_parsing_test one_host_trace_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_host_trace_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 1 -$ ./basic_parsing_test one_host_trace_inside.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_host_trace_inside.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 1 -$ ./basic_parsing_test one_host.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_host.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 1 -$ ./basic_parsing_test one_link_availability.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_link_availability.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 2 -$ ./basic_parsing_test one_link_fatpipe.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_link_fatpipe.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 2 -$ ./basic_parsing_test one_link_shared.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_link_shared.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 2 -$ ./basic_parsing_test one_link_state_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_link_state_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 2 -$ ./basic_parsing_test three_hosts_non_symmetric_route.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test three_hosts_non_symmetric_route.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 3, link number: 4 -$ ./basic_parsing_test two_clusters.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test two_clusters.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 10, link number: 16 -$ ./basic_parsing_test two_hosts_multi_hop.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test two_hosts_multi_hop.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 2, link number: 4 -$ ./basic_parsing_test two_hosts_one_link.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test two_hosts_one_link.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 2, link number: 2 -$ ./basic_parsing_test ./four_hosts_floyd.xml +$ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > Workstation number: 4, link number: 5 -$ ./basic_parsing_test ./four_hosts_floyd_bis.xml +$ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd_bis.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > Workstation number: 5, link number: 7 diff --git a/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh b/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh index a32ff3868b..82b701d355 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh @@ -1,7 +1,7 @@ ! output sort -$ simdag/platforms/basic_parsing_test --cfg=path:simdag/platforms one_cluster_properties_override.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/simdag/platforms/basic_parsing_test --cfg=path:simdag/platforms one_cluster_properties_override.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Configuration change: Set 'path' to 'simdag/platforms' ! output sort -$ simdag/platforms/basic_parsing_test --cfg=path:simdag/platforms one_host_trace_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/simdag/platforms/basic_parsing_test --cfg=path:simdag/platforms one_host_trace_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) Configuration change: Set 'path' to 'simdag/platforms' diff --git a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh index 4a02863f0c..da7dd15281 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh @@ -1,5 +1,5 @@ #! ./tesh -$ ./basic_parsing_test one_cluster_fullduplex.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 5, link number: 14 > Route between bob3.hamburger.edu and bob3.hamburger.edu @@ -153,7 +153,7 @@ $ ./basic_parsing_test one_cluster_fullduplex.xml FULL_LINK --log=root.fmt:[%10. > Link bob_cluster_link_6_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.000600, route bandwidth = 125000000.000000 -$ ./basic_parsing_test two_clusters_symmetric.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test two_clusters_symmetric.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 4, link number: 10 > Route between bob1.hamburger.edu and bob1.hamburger.edu @@ -285,7 +285,7 @@ $ ./basic_parsing_test two_clusters_symmetric.xml FULL_LINK --log=root.fmt:[%10. > Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.000600, route bandwidth = 125000000.000000 -$ ./basic_parsing_test two_hosts_one_link_symmetrical.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test two_hosts_one_link_symmetrical.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 2, link number: 4 > Route between alice and alice @@ -309,7 +309,7 @@ $ ./basic_parsing_test two_hosts_one_link_symmetrical.xml FULL_LINK --log=root.f > Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 > Route latency = 0.000015, route bandwidth = 498000000.000000 -$ ./basic_parsing_test two_hosts_one_link_fullduplex.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test two_hosts_one_link_fullduplex.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 2, link number: 3 > Route between alice and alice diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/platforms/flatifier.tesh index bdc2b5d2ed..a17dab7a38 100644 --- a/teshsuite/simdag/platforms/flatifier.tesh +++ b/teshsuite/simdag/platforms/flatifier.tesh @@ -1,6 +1,6 @@ #! ./tesh -$ ./flatifier$EXEEXT one_cluster.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -131,7 +131,7 @@ $ ./flatifier$EXEEXT one_cluster.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > > -$ ./flatifier$EXEEXT one_host_availability.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_host_availability.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -145,7 +145,7 @@ $ ./flatifier$EXEEXT one_host_availability.xml --log=root.fmt:[%10.6r]%e[%i:%P@% > > -$ ./flatifier$EXEEXT one_host_properties.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_host_properties.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -163,7 +163,7 @@ $ ./flatifier$EXEEXT one_host_properties.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h] > > -$ ./flatifier$EXEEXT one_host_state_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_host_state_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -177,7 +177,7 @@ $ ./flatifier$EXEEXT one_host_state_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h] > > -$ ./flatifier$EXEEXT one_host_state_off.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_host_state_off.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -191,7 +191,7 @@ $ ./flatifier$EXEEXT one_host_state_off.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]% > > -$ ./flatifier$EXEEXT one_host_state_on.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_host_state_on.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -205,7 +205,7 @@ $ ./flatifier$EXEEXT one_host_state_on.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e > > -$ ./flatifier$EXEEXT one_host_trace_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_host_trace_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -219,7 +219,7 @@ $ ./flatifier$EXEEXT one_host_trace_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h] > > -$ ./flatifier$EXEEXT one_host_trace_inside.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_host_trace_inside.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -233,7 +233,7 @@ $ ./flatifier$EXEEXT one_host_trace_inside.xml --log=root.fmt:[%10.6r]%e[%i:%P@% > > -$ ./flatifier$EXEEXT one_host.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_host.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -247,7 +247,7 @@ $ ./flatifier$EXEEXT one_host.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > > -$ ./flatifier$EXEEXT one_link_availability.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_link_availability.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -262,7 +262,7 @@ $ ./flatifier$EXEEXT one_link_availability.xml --log=root.fmt:[%10.6r]%e[%i:%P@% > > -$ ./flatifier$EXEEXT one_link_fatpipe.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_link_fatpipe.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -277,7 +277,7 @@ $ ./flatifier$EXEEXT one_link_fatpipe.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e% > > -$ ./flatifier$EXEEXT one_link_shared.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_link_shared.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -292,7 +292,7 @@ $ ./flatifier$EXEEXT one_link_shared.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m > > -$ ./flatifier$EXEEXT one_link_state_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_link_state_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -307,7 +307,7 @@ $ ./flatifier$EXEEXT one_link_state_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h] > > -$ ./flatifier$EXEEXT three_hosts_non_symmetric_route.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -350,7 +350,7 @@ $ ./flatifier$EXEEXT three_hosts_non_symmetric_route.xml --log=root.fmt:[%10.6r] > > -$ ./flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -819,7 +819,7 @@ $ ./flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > > -$ ./flatifier$EXEEXT two_hosts_multi_hop.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -846,7 +846,7 @@ $ ./flatifier$EXEEXT two_hosts_multi_hop.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h] > > -$ ./flatifier$EXEEXT two_hosts_one_link.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT two_hosts_one_link.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > diff --git a/teshsuite/simdag/platforms/get_full_link.tesh b/teshsuite/simdag/platforms/get_full_link.tesh index c08776a7aa..a1f27162b9 100644 --- a/teshsuite/simdag/platforms/get_full_link.tesh +++ b/teshsuite/simdag/platforms/get_full_link.tesh @@ -1,6 +1,6 @@ #! ./tesh -$ ./basic_parsing_test ./four_hosts_floyd.xml FULL_LINK +$ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd.xml FULL_LINK > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > Workstation number: 4, link number: 5 > Route between host1 and host1 @@ -74,7 +74,7 @@ $ ./basic_parsing_test ./four_hosts_floyd.xml FULL_LINK -$ ./basic_parsing_test ./four_hosts_floyd_bis.xml FULL_LINK +$ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd_bis.xml FULL_LINK > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > Workstation number: 5, link number: 7 > Route between host1 and host1 diff --git a/teshsuite/simdag/platforms/two_hosts_asymetric.tesh b/teshsuite/simdag/platforms/two_hosts_asymetric.tesh index 58ae3aaddb..a4dce9b25d 100644 --- a/teshsuite/simdag/platforms/two_hosts_asymetric.tesh +++ b/teshsuite/simdag/platforms/two_hosts_asymetric.tesh @@ -1,9 +1,9 @@ ! expect signal SIGABRT -$ ./flatifier two_hosts_asymetric_BOGUS.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier two_hosts_asymetric_BOGUS.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:@] Error while loading two_hosts_asymetric_BOGUS.xml: The route between "alice" and "bob" already exists. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags. ! expect signal SIGABRT -$ ./flatifier two_hosts_asymetric_BOGUS2.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier two_hosts_asymetric_BOGUS2.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:@] Error while loading two_hosts_asymetric_BOGUS2.xml: The route between "alice" and "bob" already exists. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags.