From: navarrop Date: Thu, 25 Nov 2010 16:30:36 +0000 (+0000) Subject: Add new tests and exes for windows. X-Git-Tag: v3_5~171 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/02f6c8f2138d26350576c29cbbbe863ce15c9a2b Add new tests and exes for windows. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8659 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/buildtools/Cmake/AddTestsWin.cmake b/buildtools/Cmake/AddTestsWin.cmake index dc9e1113ef..971e3c5940 100644 --- a/buildtools/Cmake/AddTestsWin.cmake +++ b/buildtools/Cmake/AddTestsWin.cmake @@ -30,28 +30,13 @@ SET(MEMORYCHECK_COMMAND "${PROJECT_DIRECTORY}/buildtools/Cmake/my_valgrind.pl") INCLUDE(CTest) ENABLE_TESTING() -# BEGIN TESH TESTS - -# teshsuite/xbt -IF(${ARCH_32_BITS}) - ADD_TEST(tesh-gras-msg_handle-sg-32 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/msg_handle/test_sg_32) -ELSE(${ARCH_32_BITS}) - ADD_TEST(tesh-gras-msg_handle-sg-64 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/msg_handle/test_sg_64) -ENDIF(${ARCH_32_BITS}) - -ADD_TEST(tesh-gras-empty_main-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/empty_main/test_rl) -ADD_TEST(tesh-gras-empty_main-sg perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/empty_main/test_sg) - -IF(${ARCH_32_BITS}) - ADD_TEST(tesh-gras-small_sleep-sg-32 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/small_sleep/test_sg_32) -ELSE(${ARCH_32_BITS}) - ADD_TEST(tesh-gras-small_sleep-sg-64 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/small_sleep/test_sg_64) -ENDIF(${ARCH_32_BITS}) - -ADD_TEST(tesh-msg-get_sender perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite msg/get_sender.tesh) -ADD_TEST(tesh-simdag-reinit_costs perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/test_reinit_costs.tesh) -ADD_TEST(tesh-simdag-parser perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh) -ADD_TEST(tesh-simdag-flatifier perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh) +ADD_TEST(tesh-msg-get_sender perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite msg/get_sender.tesh) +ADD_TEST(tesh-simdag-reinit_costs perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/test_reinit_costs.tesh) +ADD_TEST(tesh-simdag-parser perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh) +ADD_TEST(tesh-simdag-parser-bogus-symmetric perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms two_hosts_asymetric.tesh) +ADD_TEST(tesh-simdag-parser-sym-full perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_sym_full.tesh) +ADD_TEST(tesh-simdag-flatifier perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh) +ADD_TEST(tesh-simdag-full_links perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms get_full_link.tesh) ADD_TEST(tesh-simdag-basic0 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/basic0.tesh) ADD_TEST(tesh-simdag-basic1 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/basic1.tesh) ADD_TEST(tesh-simdag-basic2 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/basic2.tesh) @@ -69,34 +54,6 @@ ADD_TEST(tesh-simdag-mxn-3 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${ ADD_TEST(tesh-simdag-par-1 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/partask/test_comp_only_seq.tesh) ADD_TEST(tesh-simdag-par-2 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/partask/test_comp_only_par.tesh) -# GRAS examples -ADD_TEST(gras-ping-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/ping test_rl) -ADD_TEST(gras-rpc-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/rpc test_rl) -ADD_TEST(gras-spawn-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/spawn test_rl) - -ADD_TEST(gras-timer-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/timer test_rl) -set_tests_properties(gras-timer-rl PROPERTIES TIMEOUT 10) - -ADD_TEST(gras-chrono-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/chrono test_rl) -set_tests_properties(gras-chrono-rl PROPERTIES TIMEOUT 10) - -ADD_TEST(gras-simple_token-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token test_rl) - -ADD_TEST(gras-mmrpc-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/mmrpc test_rl) -set_tests_properties(gras-mmrpc-rl PROPERTIES TIMEOUT 10) - -ADD_TEST(gras-all2all-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/all2all test_rl) -set_tests_properties(gras-all2all-rl PROPERTIES TIMEOUT 10) - -ADD_TEST(gras-pmm-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/pmm test_rl) -set_tests_properties(gras-pmm-rl PROPERTIES TIMEOUT 10) - -ADD_TEST(gras-synchro-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/synchro test_rl) -set_tests_properties(gras-synchro-rl PROPERTIES TIMEOUT 10) - -ADD_TEST(gras-properties-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/properties test_rl) -set_tests_properties(gras-properties-rl PROPERTIES TIMEOUT 10) - # MSG examples ADD_TEST(msg-suspend perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg suspend/suspend.tesh) ADD_TEST(msg-masterslave perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave.tesh) @@ -112,9 +69,7 @@ ADD_TEST(msg-properties perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PR ADD_TEST(msg-trace perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg trace/trace.tesh) ADD_TEST(msg-masterslave_cpu_ti perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti.tesh) ADD_TEST(msg_icomms perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg/icomms peer.tesh) -ADD_TEST(msg_icomms_waitany ${PROJECT_DIRECTORY}/examples/msg/icomms/peer3 - ${PROJECT_DIRECTORY}/examples/msg/icomms/small_platform.xml - ${PROJECT_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml) +ADD_TEST(msg_icomms_waitany ${PROJECT_DIRECTORY}/examples/msg/icomms/peer3 ${PROJECT_DIRECTORY}/examples/msg/icomms/small_platform.xml ${PROJECT_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml) IF(HAVE_TRACING) ADD_TEST(tracing-ms perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg tracing/ms.tesh) @@ -166,71 +121,34 @@ if(HAVE_TRACING) ADD_TEST(smpi-tracing-ptp perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/examples/smpi ${PROJECT_DIRECTORY}/examples/smpi/smpi_traced.tesh) endif(HAVE_TRACING) endif(enable_smpi) - -if(HAVE_GTNETS) -ADD_TEST(msg-gtnets-waxman perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-waxman.tesh) -ADD_TEST(msg-gtnets-dogbone perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-dogbone-gtnets.tesh) -ADD_TEST(msg-gtnets-onelink perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-onelink-gtnets.tesh) -ADD_TEST(msg-gtnets-dogbone-lv08 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-dogbone-lv08.tesh) -ADD_TEST(msg-gtnets-onelink-lv08 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-onelink-lv08.tesh) - if(HAVE_TRACING) - ADD_TEST(msg-tracing-gtnets-waxman perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/tracing-gtnets-waxman.tesh) - ADD_TEST(msg-tracing-gtnets-dogbone perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/tracing-gtnets-dogbone-gtnets.tesh) - ADD_TEST(msg-tracing-gtnets-onelink perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/tracing-gtnets-onelink-gtnets.tesh) - ADD_TEST(msg-tracing-gtnets-dogbone-lv08 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/tracing-gtnets-dogbone-lv08.tesh) - ADD_TEST(msg-tracing-gtnets-onelink-lv08 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/tracing-gtnets-onelink-lv08.tesh) - endif(HAVE_TRACING) -endif(HAVE_GTNETS) - -# Lua examples -if(HAVE_LUA) -ADD_TEST(lua-masterslave perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/lua master_slave.tesh) -ADD_TEST(lua-mult_matrix perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/lua mult_matrix.tesh) -ADD_TEST(lua-masterslave_bypass perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/lua master_slave_bypass.tesh) -ADD_TEST(msg-masterslave-console perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg/masterslave/ masterslave_console.tesh) -endif(HAVE_LUA) - -# Ruby examples -if(HAVE_RUBY) -ADD_TEST(ruby-masterslave perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/ruby MasterSlave.tesh) -ADD_TEST(ruby-ping_pong perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/ruby PingPong.tesh) -ADD_TEST(ruby-quicksort perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/ruby Quicksort.tesh) -endif(HAVE_RUBY) - -# END TESH TESTS - + +# examples/msg/mc if(HAVE_MC) ADD_TEST(mc-bugged1 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg/mc bugged1.tesh) ADD_TEST(mc-bugged2 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg/mc bugged2.tesh) ADD_TEST(mc-centralized perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg/mc centralized.tesh) endif(HAVE_MC) -if(HAVE_JAVA) -# java examples -ADD_TEST(java-basic ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/basic BasicTest ${simgrid_BINARY_DIR}) -ADD_TEST(java-pingpong ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/ping_pong PingPongTest ${simgrid_BINARY_DIR}) -ADD_TEST(java-comm_time ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/comm_time CommTimeTest ${simgrid_BINARY_DIR}) -ADD_TEST(java-suspend ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/suspend SuspendTest ${simgrid_BINARY_DIR}) -endif(HAVE_JAVA) - -if(HAVE_RUBY) -set_tests_properties(ruby-quicksort PROPERTIES WILL_FAIL true) -endif(HAVE_RUBY) - -ADD_TEST(tesh-log-large ${PROJECT_DIRECTORY}/teshsuite/xbt/log_large_test --log=root.fmt:%m%n) - -ADD_TEST(msg-sendrecv_CLM03 ${PROJECT_DIRECTORY}/examples/msg/sendrecv/sendrecv.exe ${PROJECT_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${PROJECT_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml --cfg=workstation/model:CLM03 --cfg=cpu/model:Cas01 --cfg=network/model:CM02) -ADD_TEST(msg-sendrecv_Vegas ${PROJECT_DIRECTORY}/examples/msg/sendrecv/sendrecv.exe ${PROJECT_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${PROJECT_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Vegas") -ADD_TEST(msg-sendrecv_Reno ${PROJECT_DIRECTORY}/examples/msg/sendrecv/sendrecv.exe ${PROJECT_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${PROJECT_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical) - +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) # testsuite directory add_test(test-xbt-log ${PROJECT_DIRECTORY}/testsuite/xbt/log_usage) add_test(test-xbt-graphxml ${PROJECT_DIRECTORY}/testsuite/xbt/graphxml_usage ${PROJECT_DIRECTORY}/testsuite/xbt/graph.xml) add_test(test-xbt-heap ${PROJECT_DIRECTORY}/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:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml) +add_test(test-surf_usage2 ${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage2 --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml) +add_test(test-surf-trace ${CMAKE_HOME_DIRECTORY}/testsuite/surf/trace_usage --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/) + add_test(test-simdag-1 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag small_platform_variable.xml) add_test(test-simdag-2 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/small_platform.xml) add_test(test-simdag-3 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/msg_platform.xml) -add_test(testall ${PROJECT_DIRECTORY}/src/testall) \ No newline at end of file +add_test(testall ${PROJECT_DIRECTORY}/src/testall) + + diff --git a/buildtools/Cmake/MakeExeLibWin.cmake b/buildtools/Cmake/MakeExeLibWin.cmake index f0f6e40890..5ca686d4c9 100644 --- a/buildtools/Cmake/MakeExeLibWin.cmake +++ b/buildtools/Cmake/MakeExeLibWin.cmake @@ -40,7 +40,7 @@ add_subdirectory(${PROJECT_DIRECTORY}/tools/gras) add_subdirectory(${PROJECT_DIRECTORY}/testsuite/xbt) #testsuite/surf -#add_subdirectory(${PROJECT_DIRECTORY}/testsuite/surf) +add_subdirectory(${PROJECT_DIRECTORY}/testsuite/surf) #testsuite/simdag add_subdirectory(${PROJECT_DIRECTORY}/testsuite/simdag) @@ -71,6 +71,7 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/all2all) add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/pmm) add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/synchro) add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/properties) +add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/console) add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/properties) add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/actions) @@ -98,9 +99,9 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/amok/saturate) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dax) -if(HAVE_CGRAPH_H) +if(enable_graphviz) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dot) -endif(HAVE_CGRAPH_H) +endif(enable_graphviz) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/scheduling) diff --git a/src/xbt/xbt_os_time.c b/src/xbt/xbt_os_time.c index f7e90b2471..cd4d42011d 100644 --- a/src/xbt/xbt_os_time.c +++ b/src/xbt/xbt_os_time.c @@ -12,9 +12,9 @@ #include "portable.h" #include /* floor */ - #ifdef _XBT_WIN32 #include +#include #endif double xbt_os_time(void)