X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e709643ef0c5b61c6c878016c418bffa2b1b20cd..9b89e098cd45d4517c6ffac422997278f9bedc34:/examples/s4u/CMakeLists.txt diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt index 21c1aa1c56..26f62ba668 100644 --- a/examples/s4u/CMakeLists.txt +++ b/examples/s4u/CMakeLists.txt @@ -27,14 +27,11 @@ foreach (example mc-bugged1 mc-bugged2 mc-failing-assert mc-electric-fence) set(_${example}_factories "ucontext;raw;boost") endforeach() -set(_mc-bugged1-liveness_disable 1) if(SIMGRID_HAVE_MC) add_executable (s4u-mc-bugged1-liveness EXCLUDE_FROM_ALL mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp) target_link_libraries(s4u-mc-bugged1-liveness simgrid) set_target_properties(s4u-mc-bugged1-liveness PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mc-bugged1-liveness) add_dependencies(tests s4u-mc-bugged1-liveness) - set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp) - set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged1-liveness/s4u-mc-bugged1-liveness.tesh) if(HAVE_C_STACK_CLEANER) add_executable (s4u-mc-bugged1-liveness-cleaner-on EXCLUDE_FROM_ALL s4u-mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp) @@ -47,7 +44,6 @@ if(SIMGRID_HAVE_MC) set_target_properties(s4u-mc-bugged1-liveness-cleaner-off PROPERTIES COMPILE_FLAGS "-DGARBAGE_STACK -fno-stack-cleaner") add_dependencies(tests s4u-mc-bugged1-liveness-cleaner-off) endif() - endif() if(SIMGRID_HAVE_NS3) @@ -55,29 +51,33 @@ if(SIMGRID_HAVE_NS3) target_link_libraries(s4u-network-ns3 simgrid) set_target_properties(s4u-network-ns3 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/network-ns3) add_dependencies(tests s4u-network-ns3) + add_executable (s4u-network-ns3-wifi EXCLUDE_FROM_ALL network-ns3-wifi/s4u-network-ns3-wifi.cpp) + target_link_libraries(s4u-network-ns3-wifi simgrid) + set_target_properties(s4u-network-ns3-wifi PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/network-ns3-wifi) + add_dependencies(tests s4u-network-ns3-wifi) endif() # Deal with each example foreach (example actor-create actor-daemon actor-exiting actor-join actor-kill actor-lifetime actor-migrate actor-suspend actor-yield actor-stacksize - app-bittorrent app-chainsend app-pingpong app-token-ring - comm-ready comm-suspend comm-wait comm-waitany comm-waitall comm-waituntil - comm-dependent + app-bittorrent app-chainsend app-token-ring + comm-pingpong comm-ready comm-suspend comm-wait comm-waitany comm-waitall comm-waituntil + comm-dependent comm-host2host cloud-capping cloud-migration cloud-simple dht-chord dht-kademlia - energy-exec energy-boot energy-link energy-vm energy-exec-ptask + energy-exec energy-boot energy-link energy-vm energy-exec-ptask energy-wifi engine-filtering exec-async exec-basic exec-dvfs exec-ptask exec-remote exec-waitany exec-waitfor exec-dependent maestro-set - mc-bugged1 mc-bugged1-liveness mc-bugged2 mc-electric-fence mc-failing-assert + mc-bugged1 mc-bugged2 mc-electric-fence mc-failing-assert network-wifi io-async io-file-system io-file-remote io-disk-raw io-dependent platform-failures platform-profile platform-properties - plugin-hostload + plugin-host-load plugin-link-load replay-comm replay-io routing-get-clusters - synchro-barrier synchro-condition-variable synchro-mutex synchro-semaphore) + synchro-barrier synchro-condition-variable synchro-condition-variable-waituntil synchro-mutex synchro-semaphore) # Use default source file unless specified otherwise if(NOT DEFINED _${example}_sources) @@ -103,7 +103,7 @@ foreach (example actor-create actor-daemon actor-exiting actor-join actor-kill ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example}/s4u-${example}.tesh) else() message(STATUS "Example ${example} disabled, thus not compiled.") - unset(_${example}_disabled) + unset(_${example}_disable) endif() set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${example}/s4u-${example}.tesh) @@ -183,11 +183,17 @@ if(SIMGRID_HAVE_NS3) --setenv bindir=${CMAKE_BINARY_DIR}/examples/s4u --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms ${CMAKE_HOME_DIRECTORY}/examples/s4u/network-ns3/s4u-network-ns3.tesh) + ADD_TESH_FACTORIES(s4u-network-ns3-wifi "thread;ucontext;raw;boost" + --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/s4u + --setenv bindir=${CMAKE_BINARY_DIR}/examples/s4u + --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms + ${CMAKE_HOME_DIRECTORY}/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.tesh) endif() # Examples not accepting factories ################################## -foreach (example trace-platform) +foreach (example trace-categories trace-masterworkers trace-platform trace-process-migration + trace-host-user-variables trace-link-user-variables trace-route-user-variables) add_executable (s4u-${example} EXCLUDE_FROM_ALL ${example}/s4u-${example}.cpp) target_link_libraries(s4u-${example} simgrid) set_target_properties(s4u-${example} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${example}) @@ -197,23 +203,35 @@ foreach (example trace-platform) set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${example}/s4u-${example}.cpp) ADD_TESH(s4u-${example} --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/${example} + --setenv srcdir=${CMAKE_CURRENT_SOURCE_DIR}/${example} --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms + --cd ${CMAKE_CURRENT_BINARY_DIR}/${example} ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example}/s4u-${example}.tesh) endforeach() if (NOT enable_memcheck AND NOT WIN32) - ADD_TESH(simix-breakpoint --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/app-pingpong + ADD_TESH(simix-breakpoint --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/comm-pingpong --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms - ${CMAKE_CURRENT_SOURCE_DIR}/app-pingpong/simix-breakpoint.tesh) + ${CMAKE_CURRENT_SOURCE_DIR}/comm-pingpong/simix-breakpoint.tesh) +endif() + +if(enable_coverage AND SIMGRID_HAVE_MC) + foreach (example mc-bugged1 mc-bugged2 mc-electric-fence mc-failing-assert) + ADD_TEST(cover-${example} ${CMAKE_CURRENT_BINARY_DIR}/${example}/s4u-${example} ${CMAKE_HOME_DIRECTORY}/examples/platforms/model_checker_platform.xml) + endforeach() + ADD_TEST(cover-mc-bugged1-liveness ${CMAKE_CURRENT_BINARY_DIR}/mc-bugged1-liveness/s4u-mc-bugged1-liveness ${CMAKE_HOME_DIRECTORY}/examples/platforms/small_platform.xml 1 1001) endif() # Add all extra files to the archive #################################### - -set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/s4u-network-ns3.cpp PARENT_SCOPE) -set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/app-pingpong/simix-breakpoint.tesh +set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/s4u-network-ns3.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3-wifi/s4u-network-ns3-wifi.cpp PARENT_SCOPE) +set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/comm-pingpong/simix-breakpoint.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged1-liveness/s4u-mc-bugged1-liveness.tesh ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/s4u-network-ns3.tesh PARENT_SCOPE) + ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/s4u-network-ns3.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3-wifi/s4u-network-ns3-wifi.tesh PARENT_SCOPE) set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actor-create/s4u-actor-create_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/actor-lifetime/s4u-actor-lifetime_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/actor-yield/s4u-actor-yield_d.xml