X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7861b5b21c9986daad451a2d97a8ed7f908ab5e1..4a00aeabd069cdbd1927a3e8a433bb10f49362be:/.gitignore

diff --git a/.gitignore b/.gitignore
index f0e286e3de..6dff2de688 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@
 
 ### cmake
 CTestCustom.cmake
+CTestResults.xml
 
 ### Maintainer mode
 src/simdag/dax_dtd.l
@@ -69,8 +70,8 @@ lib/
 manpages/
 build_*/
 build/
-buildtools/Cmake/memcheck_tests.cmake
-buildtools/Cmake/test_prog/prog_va_copy.c
+tools/cmake/memcheck_tests.cmake
+tools/cmake/test_prog/prog_va_copy.c
 ### windows borland
 *.bpr
 *.bpf
@@ -140,9 +141,9 @@ examples/msg/cloud/multicore
 examples/msg/cloud/scale
 examples/msg/cloud/simple_vm
 examples/msg/cloud/two_tasks_vm
-examples/msg/energy/pstate/pstate
+examples/msg/energy/consumption/energy_consumption
 examples/msg/energy/onoff/onoff
-examples/msg/energy/e2/e2
+examples/msg/energy/pstate/pstate
 examples/msg/energy/e3/e3
 examples/msg/pastry/pastry
 examples/msg/semaphores/synchro
@@ -180,6 +181,7 @@ examples/msg/icomms/toto.txt
 examples/msg/masterslave/masterslave_console
 examples/msg/irc_isend/peer
 examples/msg/irc_isend/toto.txt
+examples/msg/ns3/ns3
 examples/simdag/sd_avail
 examples/simdag/ex_sd_seq_access
 examples/simdag/sd_seq_access
@@ -202,6 +204,7 @@ examples/simdag/goal/goal_test
 examples/simdag/scheduling/minmin_test
 examples/simdag/io/sd_io
 examples/msg/actions/actions
+examples/msg/actions/storage_actions
 examples/msg/bittorrent/bittorrent
 examples/msg/bittorrent/bittorrent_platfgen
 examples/msg/kademlia/kademlia
@@ -970,6 +973,8 @@ teshsuite/msg/task_destroy_cancel/task_destroy_cancel
 teshsuite/msg/pid/pid
 teshsuite/msg/get_sender/get_sender
 teshsuite/msg/trace/test_trace_integration
+teshsuite/msg/host_on_off/host_on_off_recv
+teshsuite/msg/host_on_off/host_on_off_wait
 teshsuite/simix/check_defaults/check_defaults
 teshsuite/simix/stack_overflow/stack_overflow
 teshsuite/simdag/availability/availability_test
@@ -1047,9 +1052,13 @@ examples/java/tracing/java_tracing_compiled
 examples/java/reservationSurfPlugin/java_reservation_surf_plugin_compiled
 examples/java/surfCpuModel/java_surf_cpu_model_compiled
 examples/java/surfPlugin/java_surf_plugin_compiled
+examples/scala/master_slave_bypass/scala_master_slave_bypass_compiled
+examples/scala/master_slave_kill/scala_master_slave_kill_compiled
+examples/scala/masterslave/scala_masterslave_compiled
 /CMakeCache.txt
 teshsuite/mc/dwarf/dwarf
 teshsuite/mc/dwarf_expression/dwarf-expression
+teshsuite/mc/replay/random_bug
 examples/smpi/mc/smpi_bugged1
 examples/smpi/mc/smpi_bugged1_liveness
 examples/smpi/mc/smpi_bugged2