Correctly remove generated files.

The added "rm" command for s4u-exec-ptasks prevents use of ADD_TESH_FACTORIES
(it chokes on "--cfg=contexts/factory:...").

diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
index 71cb5dc..0d44e12 100644 (file)
--- a/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@ -70,7 +70,7 @@ foreach (example actor-create actor-daemon actor-exiting actor-join actor-kill
                  energy-exec energy-boot energy-link energy-vm energy-exec-ptask energy-wifi
                  engine-filtering
                  exec-async exec-basic exec-dvfs exec-remote exec-waitany exec-waitfor exec-dependent exec-unassigned
-                 exec-ptask exec-ptask-multicore
+                 exec-ptask-multicore
                  maestro-set
                  mc-bugged1 mc-bugged2 mc-electric-fence mc-failing-assert
                                 network-wifi
@@ -206,7 +206,7 @@ endif()
 # Examples not accepting factories
 ##################################
 
-foreach (example trace-categories trace-masterworkers trace-platform trace-process-migration
+foreach (example exec-ptask 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)

diff --git a/examples/cpp/exec-ptask/s4u-exec-ptask.tesh b/examples/cpp/exec-ptask/s4u-exec-ptask.tesh
index 817bdf5..606f3a2 100644 (file)
--- a/examples/cpp/exec-ptask/s4u-exec-ptask.tesh
+++ b/examples/cpp/exec-ptask/s4u-exec-ptask.tesh
@@ -50,3 +50,5 @@ $ ${bindir:=.}/s4u-exec-ptask ${platfdir}/energy_platform.xml --cfg=host/model:p
 > [375.500000] (0:maestro@) UNCAT LINK [360.500000 - 375.500000] bus bandwidth_used 100000.000000
 > [375.500000] (1:test@MyHost1) Goodbye now!
 > [375.500000] (0:maestro@) Simulation done.
+
+$ rm -f ./simgrid.trace

diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh
index 22ba4d5..9edbad7 100644 (file)
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh
+++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh
@@ -115,4 +115,4 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 > [1738.001382] (job_0001@Bourassa) Finished job 1 (smpi_app 'job1')
 > [1738.001382] (maestro@) Simulation finished! Final time: 1738
 
-$ rm -f ${srcdir:=.}/workload_mixed2_sr
+$ rm -f ${srcdir:=.}/workload_mixed2_same_resources