X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/03ec2a82d9c953c0e4fdb68d45b18bc4ce42cd60..6068c9f0036786cdcbeb273d495e5aa378cb5f92:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 513265f0ca..f097deb049 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,12 +88,9 @@ set(JMSG_C_SRC src/jmsg_task.h src/jmsg_synchro.c src/jmsg_synchro.h - src/jmsg_application_handler.c - src/jmsg_application_handler.h ) set(JMSG_JAVA_SRC - org/simgrid/msg/ApplicationHandler.java org/simgrid/msg/Host.java org/simgrid/msg/HostFailureException.java org/simgrid/msg/HostNotFoundException.java @@ -113,6 +110,7 @@ set(JMSG_JAVA_SRC ) set(JAVA_EXAMPLES + examples/mutualExclusion/centralized/MutexCentral.java examples/mutualExclusion/centralized/GrantTask.java examples/mutualExclusion/centralized/Coordinator.java @@ -145,6 +143,9 @@ set(JAVA_EXAMPLES examples/async/Forwarder.java examples/async/Master.java examples/async/Slave.java + examples/startKillTime/Slave.java + examples/startKillTime/Master.java + examples/startKillTime/StartKillTime.java ) set(CMAKE_SRC @@ -242,6 +243,7 @@ add_custom_command( COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/*.java COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/*.java COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/*.java + COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/startKillTime/*.java ) add_custom_target(simgrid_java_examples ALL @@ -271,8 +273,9 @@ ADD_TEST(CommTime ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE ADD_TEST(mutualExclusion ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/mutualexclusion.tesh) ADD_TEST(bypass ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/bypass.tesh) ADD_TEST(kill ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/kill.tesh) +ADD_TEST(startKillTime ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/startKillTime/startKillTime.tesh) #Don't forget to put new test in this list!!! -set(test_list basic async pingPong CommTime mutualExclusion bypass kill) +set(test_list basic async pingPong CommTime mutualExclusion bypass kill startKillTime) ########################################## # Set the DYLD_LIBRARY_PATH for mac #