fix Java and MC examples

diff --git a/.gitignore b/.gitignore
index 2e2b9e6..4d81e78 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -945,8 +945,8 @@ unit-mc-snapshot
 unit-tmgr
 #########################################
 ## files touched to track the dependencies of java examples
-examples/java/*/*/*_compiled
-examples/java/*/*_compiled
+examples/deprecated/java/*/*/*_compiled
+examples/deprecated/java/*/*_compiled
 /CMakeCache.txt
 simgrid.jar_finalized
 simgrid_full.jar

diff --git a/examples/deprecated/java/CMakeLists.txt b/examples/deprecated/java/CMakeLists.txt
index 33e9124..bfbb575 100644 (file)
--- a/examples/deprecated/java/CMakeLists.txt
+++ b/examples/deprecated/java/CMakeLists.txt
@@ -74,6 +74,6 @@ if(enable_java)
            cloud-migration cloud-masterworker dht-chord dht-kademlia energy-consumption energy-pstate energy-vm hostload io-file io-storage
            process-kill process-migration process-startkilltime process-suspend task-priority trace-pingpong)
     string (REPLACE "-" "/" example_dir ${example})
-    ADD_TESH(java-${example}  --setenv javacmd=${Java_JAVA_EXECUTABLE} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java/${example_dir} ${CMAKE_HOME_DIRECTORY}/examples/java/${example_dir}/${example}.tesh)
+    ADD_TESH(java-${example}  --setenv javacmd=${Java_JAVA_EXECUTABLE} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/java --setenv LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/deprecated/java/${example_dir} ${CMAKE_HOME_DIRECTORY}/examples/deprecated/java/${example_dir}/${example}.tesh)
   endforeach()
 endif()

diff --git a/examples/deprecated/java/app/bittorrent/app-bittorrent.tesh b/examples/deprecated/java/app/bittorrent/app-bittorrent.tesh
index b8df1ff..9fc7418 100644 (file)
--- a/examples/deprecated/java/app/bittorrent/app-bittorrent.tesh
+++ b/examples/deprecated/java/app/bittorrent/app-bittorrent.tesh
@@ -3,7 +3,7 @@
 ! output sort 19
 ! timeout 15
 
-$ ${javacmd:=java} -classpath ${classpath:=.} app/bittorrent/Main ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/app/bittorrent/bittorrent.xml
+$ ${javacmd:=java} -classpath ${classpath:=.} app/bittorrent/Main ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/app/bittorrent/bittorrent.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [5000.046836] [java/INFO] MSG_main finished; Terminating the simulation...
 > [node-0.simgrid.org:app.bittorrent.Tracker:(1) 0.000000] [java/INFO] Tracker launched.

diff --git a/examples/deprecated/java/app/centralizedmutex/app-centralizedmutex.tesh b/examples/deprecated/java/app/centralizedmutex/app-centralizedmutex.tesh
index bf8357d..d6ebe80 100644 (file)
--- a/examples/deprecated/java/app/centralizedmutex/app-centralizedmutex.tesh
+++ b/examples/deprecated/java/app/centralizedmutex/app-centralizedmutex.tesh
@@ -2,7 +2,7 @@
 
 ! output sort 19
 
-$ ${javacmd:=java} -classpath ${classpath:=.} app/centralizedmutex/Main ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/app/centralizedmutex/centralizedmutex.xml
+$ ${javacmd:=java} -classpath ${classpath:=.} app/centralizedmutex/Main ${srcdir:=.}/../../platforms/small_platform.xml ${srcdir:=.}/app/centralizedmutex/centralizedmutex.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [Jupiter:app.centralizedmutex.Node:(2) 0.000000] [java/INFO] Send a request to the coordinator
 > [Fafard:app.centralizedmutex.Node:(3) 0.000000] [java/INFO] Send a request to the coordinator

diff --git a/examples/deprecated/java/app/masterworker/app-masterworker.tesh b/examples/deprecated/java/app/masterworker/app-masterworker.tesh
index 75cffcf..4a9e791 100644 (file)
--- a/examples/deprecated/java/app/masterworker/app-masterworker.tesh
+++ b/examples/deprecated/java/app/masterworker/app-masterworker.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ ${javacmd:=java} -classpath ${classpath:=.} app/masterworker/Main ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/app/masterworker/masterworker.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${javacmd:=java} -classpath ${classpath:=.} app/masterworker/Main ${srcdir:=.}/../../platforms/small_platform.xml ${srcdir:=.}/app/masterworker/masterworker.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (1:app.masterworker.Master@Jacquelin) Hello! My PID is 1. Got 7 workers and 5 tasks to process
 > [  0.860026] (2:app.masterworker.Worker@Tremblay) Received "Task_0". Processing it (my pid is 2).

diff --git a/examples/deprecated/java/app/pingpong/app-pingpong.tesh b/examples/deprecated/java/app/pingpong/app-pingpong.tesh
index 9e587d4..5142047 100644 (file)
--- a/examples/deprecated/java/app/pingpong/app-pingpong.tesh
+++ b/examples/deprecated/java/app/pingpong/app-pingpong.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ ${javacmd:=java} -classpath ${classpath:=.} app/pingpong/Main ${srcdir:=.}/../platforms/small_platform.xml
+$ ${javacmd:=java} -classpath ${classpath:=.} app/pingpong/Main ${srcdir:=.}/../../platforms/small_platform.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [Jacquelin:Sender:(1) 0.000000] [java/INFO] Host count: 1
 > [Jacquelin:Sender:(1) 0.000000] [java/INFO] sender time: 0.0

diff --git a/examples/deprecated/java/app/tokenring/app-tokenring.tesh b/examples/deprecated/java/app/tokenring/app-tokenring.tesh
index 23bc1bd..2327a3e 100644 (file)
--- a/examples/deprecated/java/app/tokenring/app-tokenring.tesh
+++ b/examples/deprecated/java/app/tokenring/app-tokenring.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../platforms/routing_cluster.xml '--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n'
+$ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../../platforms/routing_cluster.xml '--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n'
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (0:maestro@) Number of hosts '6'
 > [  0.000000] (1:0@host1) Host '0' send 'Token' to Host '1'
@@ -17,7 +17,7 @@ $ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/..
 > [  0.131796] (1:0@host1) Host '0' received 'Token'
 > [  0.131796] (0:maestro@) MSG_main finished; Terminating the simulation...
 
-$ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../platforms/two_peers.xml '--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n'
+$ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../../platforms/two_peers.xml '--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n'
 > [    0.000000] (0:maestro@) Using regular java threads.
 > [    0.000000] (0:maestro@) Number of hosts '2'
 > [    0.000000] (1:0@100030591) Host '0' send 'Token' to Host '1'
@@ -26,7 +26,7 @@ $ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/..
 > [    1.248846] (1:0@100030591) Host '0' received 'Token'
 > [    1.248846] (0:maestro@) MSG_main finished; Terminating the simulation...
 
-$ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../platforms/meta_cluster.xml '--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n'
+$ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../../platforms/meta_cluster.xml '--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n'
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (0:maestro@) Number of hosts '60'
 > [  0.000000] (1:0@host-1.cluster1) Host '0' send 'Token' to Host '1'

diff --git a/examples/deprecated/java/async/dsend/async-dsend.tesh b/examples/deprecated/java/async/dsend/async-dsend.tesh
index 701ca73..399a2ae 100644 (file)
--- a/examples/deprecated/java/async/dsend/async-dsend.tesh
+++ b/examples/deprecated/java/async/dsend/async-dsend.tesh
@@ -1,7 +1,7 @@
 #!/usr/bin/env tesh
 
 ! timeout 30
-$ ${javacmd:=java} -classpath ${classpath:=.} async/dsend/Main ${srcdir:=.}/../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${javacmd:=java} -classpath ${classpath:=.} async/dsend/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (1:Sender@Boivin) Hello! Got 6 receivers to contact
 > [  0.000000] (1:Sender@Boivin) Sending "Task_1" to "Bourassa"

diff --git a/examples/deprecated/java/async/waitall/async-waitall.tesh b/examples/deprecated/java/async/waitall/async-waitall.tesh
index 4ef3cef..c2b6c4a 100644 (file)
--- a/examples/deprecated/java/async/waitall/async-waitall.tesh
+++ b/examples/deprecated/java/async/waitall/async-waitall.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ ${javacmd:=java} -classpath ${classpath:=.} async/waitall/Main ${srcdir:=.}/../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${javacmd:=java} -classpath ${classpath:=.} async/waitall/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (1:Sender@Boivin) I have 6 receivers to contact
 > [  0.000000] (1:Sender@Boivin) Start the Sending 'Task_1' to 'Bourassa'

diff --git a/examples/deprecated/java/async/yield/async-yield.tesh b/examples/deprecated/java/async/yield/async-yield.tesh
index 036dff4..16db9ac 100644 (file)
--- a/examples/deprecated/java/async/yield/async-yield.tesh
+++ b/examples/deprecated/java/async/yield/async-yield.tesh
@@ -1,7 +1,7 @@
 #!/usr/bin/env tesh
 
 ! timeout 30
-$ ${javacmd:=java} -classpath ${classpath:=.} async/yield/Main ${srcdir:=.}/../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${javacmd:=java} -classpath ${classpath:=.} async/yield/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (1:Yielder@Boivin) Yielded 10. Good bye now!
 > [  0.000000] (2:Yielder@Bourassa) Yielded 15. Good bye now!

diff --git a/examples/deprecated/java/cloud/masterworker/cloud-masterworker.tesh b/examples/deprecated/java/cloud/masterworker/cloud-masterworker.tesh
index a6afa2b..ec1de09 100644 (file)
--- a/examples/deprecated/java/cloud/masterworker/cloud-masterworker.tesh
+++ b/examples/deprecated/java/cloud/masterworker/cloud-masterworker.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ ${javacmd:=java} -classpath ${classpath:=.} cloud/masterworker/Main ${srcdir:=.}/../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${javacmd:=java} -classpath ${classpath:=.} cloud/masterworker/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (1:Master@Boivin) Launched 6 VMs
 > [  0.000000] (1:Master@Boivin) Send some work to everyone

diff --git a/examples/deprecated/java/cloud/migration/cloud-migration.tesh b/examples/deprecated/java/cloud/migration/cloud-migration.tesh
index 42408a1..b51ef17 100644 (file)
--- a/examples/deprecated/java/cloud/migration/cloud-migration.tesh
+++ b/examples/deprecated/java/cloud/migration/cloud-migration.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ ${javacmd:=java} -classpath ${classpath:=.} cloud/migration/Main ${srcdir:=.}/../platforms/three_multicore_hosts.xml
+$ ${javacmd:=java} -classpath ${classpath:=.} cloud/migration/Main ${srcdir:=.}/../../platforms/three_multicore_hosts.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [PM0:Test:(1) 0.000000] [java/INFO] This example evaluates the migration time of a VM in presence of collocated VMs on the source and the dest nodes
 > [PM0:Test:(1) 0.000000] [java/INFO] The migrated VM has a memory intensity rate of 70% of the network BW and a cpu load of 90% " (see cloudcom 2013 paper "Adding a Live Migration Model Into SimGrid" for further information) 

diff --git a/examples/deprecated/java/dht/chord/dht-chord.tesh b/examples/deprecated/java/dht/chord/dht-chord.tesh
index 1ef1a2d..308564c 100644 (file)
--- a/examples/deprecated/java/dht/chord/dht-chord.tesh
+++ b/examples/deprecated/java/dht/chord/dht-chord.tesh
@@ -2,7 +2,7 @@
 
 ! output sort 19
 
-$ ${javacmd:=java} -classpath ${classpath:=.} dht/chord/Main ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/dht/chord/chord.xml
+$ ${javacmd:=java} -classpath ${classpath:=.} dht/chord/Main ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/dht/chord/chord.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [1046.732943] [java/INFO] MSG_main finished; Terminating the simulation...
 > [node-1.simgrid.org:dht.chord.Node:(2) 0.000000] [java/INFO] Joining the ring with id 366680 knowing node 42

diff --git a/examples/deprecated/java/dht/kademlia/dht-kademlia.tesh b/examples/deprecated/java/dht/kademlia/dht-kademlia.tesh
index fc99e42..d7b5caf 100644 (file)
--- a/examples/deprecated/java/dht/kademlia/dht-kademlia.tesh
+++ b/examples/deprecated/java/dht/kademlia/dht-kademlia.tesh
@@ -2,7 +2,7 @@
 
 ! output sort 19
 
-$ ${javacmd:=java} -classpath ${classpath:=.} dht/kademlia/Main ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/dht/kademlia/kademlia.xml
+$ ${javacmd:=java} -classpath ${classpath:=.} dht/kademlia/Main ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/dht/kademlia/kademlia.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [900.000000] [java/INFO] MSG_main finished; Terminating the simulation...
 > [node-0.simgrid.org:dht.kademlia.Node:(1) 0.000000] [java/INFO] Hi, I'm going to create the network with the id 0!

diff --git a/examples/deprecated/java/energy/consumption/energy-consumption.tesh b/examples/deprecated/java/energy/consumption/energy-consumption.tesh
index ed377f7..1117914 100644 (file)
--- a/examples/deprecated/java/energy/consumption/energy-consumption.tesh
+++ b/examples/deprecated/java/energy/consumption/energy-consumption.tesh
@@ -2,7 +2,7 @@
 
 ! timeout 15
 
-$ ${javacmd:=java} -classpath ${classpath:=.} energy/consumption/Main ${srcdir:=.}/../platforms/energy_platform.xml
+$ ${javacmd:=java} -classpath ${classpath:=.} energy/consumption/Main ${srcdir:=.}/../../platforms/energy_platform.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [MyHost1:energyConsumer:(1) 0.000000] [java/INFO] Energetic profile: 100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0
 > [MyHost1:energyConsumer:(1) 0.000000] [java/INFO] Initial peak speed= 1.0E8 flop/s; Energy dissipated = 0.0 J

diff --git a/examples/deprecated/java/energy/pstate/energy-pstate.tesh b/examples/deprecated/java/energy/pstate/energy-pstate.tesh
index 1dc3ab7..6691356 100644 (file)
--- a/examples/deprecated/java/energy/pstate/energy-pstate.tesh
+++ b/examples/deprecated/java/energy/pstate/energy-pstate.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ ${javacmd:=java} -classpath ${classpath:=.} energy/pstate/Main ${srcdir:=.}/../platforms/energy_platform.xml
+$ ${javacmd:=java} -classpath ${classpath:=.} energy/pstate/Main ${srcdir:=.}/../../platforms/energy_platform.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [MyHost1:dvfs_test:(2) 0.000000] [java/INFO] Count of Processor states=3
 > [MyHost1:dvfs_test:(2) 0.000000] [java/INFO] Current power peak=1.0E8

diff --git a/examples/deprecated/java/energy/vm/energy-vm.tesh b/examples/deprecated/java/energy/vm/energy-vm.tesh
index 6cf1dd1..45ab11c 100644 (file)
--- a/examples/deprecated/java/energy/vm/energy-vm.tesh
+++ b/examples/deprecated/java/energy/vm/energy-vm.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ ${javacmd:=java} -classpath ${classpath:=.} energy/vm/Main ${srcdir:=.}/../platforms/energy_platform.xml
+$ ${javacmd:=java} -classpath ${classpath:=.} energy/vm/Main ${srcdir:=.}/../../platforms/energy_platform.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [MyHost1:energy VM runner:(1) 0.000000] [java/INFO] Creating and starting two VMs
 > [MyHost1:energy VM runner:(1) 0.000000] [java/INFO] Create two tasks on Host1: one inside a VM, the other directly on the host

diff --git a/examples/deprecated/java/hostload/hostload.tesh b/examples/deprecated/java/hostload/hostload.tesh
index 9ebee0e..12bf489 100644 (file)
--- a/examples/deprecated/java/hostload/hostload.tesh
+++ b/examples/deprecated/java/hostload/hostload.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ ${javacmd:=java} -classpath ${classpath:=.} hostload/Main ${srcdir:=.}/../platforms/small_platform.xml
+$ ${javacmd:=java} -classpath ${classpath:=.} hostload/Main ${srcdir:=.}/../../platforms/small_platform.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [Boivin::(1) 0.000000] [java/INFO] Speed=9.8095E7 flop/s
 > [Boivin::(1) 0.000000] [java/INFO] Computed Flops 0.0

diff --git a/examples/deprecated/java/io/file/io-file.tesh b/examples/deprecated/java/io/file/io-file.tesh
index 2428f48..ca3957b 100644 (file)
--- a/examples/deprecated/java/io/file/io-file.tesh
+++ b/examples/deprecated/java/io/file/io-file.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ ${javacmd:=java} -classpath ${classpath:=.} io/file/Main ${srcdir:=.}/../platforms/storage/storage.xml
+$ ${javacmd:=java} -classpath ${classpath:=.} io/file/Main ${srcdir:=.}/../../platforms/storage/storage.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [0.000000] [java/INFO] Number of hosts:4
 > [alice:0:(1) 0.000000] [java/INFO] Open file c:\Windows\setupact.log

diff --git a/examples/deprecated/java/io/storage/io-storage.tesh b/examples/deprecated/java/io/storage/io-storage.tesh
index 538e790..4c3177e 100644 (file)
--- a/examples/deprecated/java/io/storage/io-storage.tesh
+++ b/examples/deprecated/java/io/storage/io-storage.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ ${javacmd:=java} -classpath ${classpath:=.} io/storage/Main ${srcdir:=.}/../platforms/storage/storage.xml
+$ ${javacmd:=java} -classpath ${classpath:=.} io/storage/Main ${srcdir:=.}/../../platforms/storage/storage.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [denise:0:(1) 0.000000] [java/INFO] ------------------------------------
 > [denise:0:(1) 0.000000] [java/INFO] Disk name: Disk2

diff --git a/examples/deprecated/java/process/kill/process-kill.tesh b/examples/deprecated/java/process/kill/process-kill.tesh
index b8ddf02..45d4249 100644 (file)
--- a/examples/deprecated/java/process/kill/process-kill.tesh
+++ b/examples/deprecated/java/process/kill/process-kill.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ ${javacmd:=java} -classpath ${classpath:=.} process/kill/Main ${srcdir:=.}/../platforms/small_platform.xml --lof=no_loc
+$ ${javacmd:=java} -classpath ${classpath:=.} process/kill/Main ${srcdir:=.}/../../platforms/small_platform.xml --lof=no_loc
 > [0.000000] [java/INFO] Using regular java threads.
 > [Jacquelin:killer:(1) 0.000000] [java/INFO] Hello!
 > [Boivin:victim:(2) 0.000000] [java/INFO] Hello!

diff --git a/examples/deprecated/java/process/migration/process-migration.tesh b/examples/deprecated/java/process/migration/process-migration.tesh
index f24af2f..5b18d6f 100644 (file)
--- a/examples/deprecated/java/process/migration/process-migration.tesh
+++ b/examples/deprecated/java/process/migration/process-migration.tesh
@@ -2,7 +2,7 @@
 
 ! output sort 19
 
-$ ${javacmd:=java} -classpath ${classpath:=.} process/migration/Main ${srcdir:=.}/../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${javacmd:=java} -classpath ${classpath:=.} process/migration/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (2:emigrant@Jacquelin) I'll look for a new job on another machine where the grass is greener.
 > [  0.000000] (2:emigrant@Boivin) Yeah, found something to do

diff --git a/examples/deprecated/java/process/startkilltime/process-startkilltime.tesh b/examples/deprecated/java/process/startkilltime/process-startkilltime.tesh
index c450a66..a2422d4 100644 (file)
--- a/examples/deprecated/java/process/startkilltime/process-startkilltime.tesh
+++ b/examples/deprecated/java/process/startkilltime/process-startkilltime.tesh
@@ -1,5 +1,5 @@
 #!/usr/bin/env tesh
-$ ${javacmd:=java} -classpath ${classpath:=.} process/startkilltime/Main ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/process/startkilltime/startkilltime.xml
+$ ${javacmd:=java} -classpath ${classpath:=.} process/startkilltime/Main ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/process/startkilltime/startkilltime.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [node-0.simgrid.org:process.startkilltime.Sleeper:(1) 0.000000] [java/INFO] Hello! I go to sleep.
 > [node-1.simgrid.org:process.startkilltime.Sleeper:(2) 1.000000] [java/INFO] Hello! I go to sleep.

diff --git a/examples/deprecated/java/process/suspend/process-suspend.tesh b/examples/deprecated/java/process/suspend/process-suspend.tesh
index 1bde0b0..64cc4a1 100644 (file)
--- a/examples/deprecated/java/process/suspend/process-suspend.tesh
+++ b/examples/deprecated/java/process/suspend/process-suspend.tesh
@@ -1,7 +1,7 @@
 #!/usr/bin/env tesh
 
 ! output sort 19
-$ ${javacmd:=java} -classpath ${classpath:=.} process/suspend/Main ${srcdir:=.}/../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${javacmd:=java} -classpath ${classpath:=.} process/suspend/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (1:DreamMaster@Jacquelin) Let's create a lazy guy.
 > [  0.000000] (1:DreamMaster@Jacquelin) Let's wait a little bit...

diff --git a/examples/deprecated/java/task/priority/task-priority.tesh b/examples/deprecated/java/task/priority/task-priority.tesh
index 91bfca0..84710f0 100644 (file)
--- a/examples/deprecated/java/task/priority/task-priority.tesh
+++ b/examples/deprecated/java/task/priority/task-priority.tesh
@@ -2,7 +2,7 @@
 
 ! output sort 19
 
-$ ${javacmd:=java} -classpath ${classpath:=.} task/priority/Main ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/task/priority/priority.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${javacmd:=java} -classpath ${classpath:=.} task/priority/Main ${srcdir:=.}/../../platforms/small_platform.xml ${srcdir:=.}/task/priority/priority.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (1:task.priority.Test@Fafard) Hello! Running a task of size 7.6296E7 with priority 1.0
 > [  0.000000] (2:task.priority.Test@Fafard) Hello! Running a task of size 7.6296E7 with priority 2.0

diff --git a/examples/deprecated/java/trace/pingpong/trace-pingpong.tesh b/examples/deprecated/java/trace/pingpong/trace-pingpong.tesh
index 319c13a..61e8b7a 100644 (file)
--- a/examples/deprecated/java/trace/pingpong/trace-pingpong.tesh
+++ b/examples/deprecated/java/trace/pingpong/trace-pingpong.tesh
@@ -2,7 +2,7 @@
 
 ! output sort 19
 
-$ ${javacmd:=java} -classpath ${classpath:=.} trace/pingpong/Main ${srcdir:=.}/../platforms/small_platform.xml --cfg=tracing:yes  --cfg=tracing/filename:simulation.trace --cfg=tracing/platform:yes
+$ ${javacmd:=java} -classpath ${classpath:=.} trace/pingpong/Main ${srcdir:=.}/../../platforms/small_platform.xml --cfg=tracing:yes  --cfg=tracing/filename:simulation.trace --cfg=tracing/platform:yes
 > [0.000000] [java/INFO] Using regular java threads.
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'simulation.trace'

diff --git a/examples/deprecated/msg/mc/bugged1.tesh b/examples/deprecated/msg/mc/bugged1.tesh
index ae74260..88d37e7 100644 (file)
--- a/examples/deprecated/msg/mc/bugged1.tesh
+++ b/examples/deprecated/msg/mc/bugged1.tesh
@@ -2,7 +2,7 @@
 
 ! expect return 1
 ! timeout 20
-$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning --cfg=contexts/stack-size:256
+$ ${bindir:=.}/../../../../bin/simgrid-mc ${bindir:=.}/bugged1 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning --cfg=contexts/stack-size:256
 > [  0.000000] (0:maestro@) Check a safety property. Reduction is: dpor.
 > [  0.000000] (2:client@HostB) Sent!
 > [  0.000000] (3:client@HostC) Sent!

diff --git a/examples/deprecated/msg/mc/bugged1_liveness.tesh b/examples/deprecated/msg/mc/bugged1_liveness.tesh
index 50c01be..c835b72 100644 (file)
--- a/examples/deprecated/msg/mc/bugged1_liveness.tesh
+++ b/examples/deprecated/msg/mc/bugged1_liveness.tesh
@@ -3,7 +3,7 @@
 ! expect return 2
 ! timeout 20
 ! output ignore
-$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=.}/../../platforms/small_platform.xml ${srcdir:=.}/deploy_bugged1_liveness.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=contexts/stack-size:256 --cfg=model-check/property:promela_bugged1_liveness
+$ ${bindir:=.}/../../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=.}/../../../platforms/small_platform.xml ${srcdir:=.}/deploy_bugged1_liveness.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=contexts/stack-size:256 --cfg=model-check/property:promela_bugged1_liveness
 > [  0.000000] (0:maestro@) Check the liveness property promela_bugged1_liveness
 > [  0.000000] (2:client@Boivin) Ask the request
 > [  0.000000] (3:client@Fafard) Ask the request

diff --git a/examples/deprecated/msg/mc/bugged1_liveness_sparse.tesh b/examples/deprecated/msg/mc/bugged1_liveness_sparse.tesh
index f22813b..7422ab8 100644 (file)
--- a/examples/deprecated/msg/mc/bugged1_liveness_sparse.tesh
+++ b/examples/deprecated/msg/mc/bugged1_liveness_sparse.tesh
@@ -3,7 +3,7 @@
 ! expect return 2
 ! timeout 20
 ! output ignore
-$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=.}/../../platforms/small_platform.xml ${srcdir:=.}/deploy_bugged1_liveness.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=contexts/stack-size:256 --cfg=model-check/sparse-checkpoint:yes --cfg=model-check/property:promela_bugged1_liveness
+$ ${bindir:=.}/../../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=.}/../../../platforms/small_platform.xml ${srcdir:=.}/deploy_bugged1_liveness.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=contexts/stack-size:256 --cfg=model-check/sparse-checkpoint:yes --cfg=model-check/property:promela_bugged1_liveness
 > [  0.000000] (0:maestro@) Check the liveness property promela_bugged1_liveness
 > [  0.000000] (2:client@Boivin) Ask the request
 > [  0.000000] (3:client@Fafard) Ask the request

diff --git a/examples/deprecated/msg/mc/bugged1_liveness_visited.tesh b/examples/deprecated/msg/mc/bugged1_liveness_visited.tesh
index 4a3fd2f..971ad4c 100644 (file)
--- a/examples/deprecated/msg/mc/bugged1_liveness_visited.tesh
+++ b/examples/deprecated/msg/mc/bugged1_liveness_visited.tesh
@@ -3,7 +3,7 @@
 ! expect return 2
 ! timeout 20
 ! output ignore
-$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=.}/../../platforms/small_platform.xml ${srcdir:=.}/deploy_bugged1_liveness_visited.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=model-check/visited:100 --cfg=contexts/stack-size:256  --cfg=model-check/property:promela_bugged1_liveness
+$ ${bindir:=.}/../../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=.}/../../../platforms/small_platform.xml ${srcdir:=.}/deploy_bugged1_liveness_visited.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=model-check/visited:100 --cfg=contexts/stack-size:256  --cfg=model-check/property:promela_bugged1_liveness
 > [  0.000000] (0:maestro@) Check the liveness property promela_bugged1_liveness
 > [  0.000000] (2:client@Boivin) Ask the request
 > [  0.000000] (3:client@Fafard) Ask the request

diff --git a/examples/deprecated/msg/mc/bugged1_liveness_visited_sparse.tesh b/examples/deprecated/msg/mc/bugged1_liveness_visited_sparse.tesh
index 7a4f893..47623e4 100644 (file)
--- a/examples/deprecated/msg/mc/bugged1_liveness_visited_sparse.tesh
+++ b/examples/deprecated/msg/mc/bugged1_liveness_visited_sparse.tesh
@@ -3,7 +3,7 @@
 ! expect return 2
 ! timeout 20
 ! output ignore
-$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=.}/../../platforms/small_platform.xml ${srcdir:=.}/deploy_bugged1_liveness_visited.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=model-check/visited:100 --cfg=contexts/stack-size:256 --cfg=model-check/sparse-checkpoint:yes  --cfg=model-check/property:promela_bugged1_liveness
+$ ${bindir:=.}/../../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=.}/../../../platforms/small_platform.xml ${srcdir:=.}/deploy_bugged1_liveness_visited.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=model-check/visited:100 --cfg=contexts/stack-size:256 --cfg=model-check/sparse-checkpoint:yes  --cfg=model-check/property:promela_bugged1_liveness
 > [  0.000000] (0:maestro@) Check the liveness property promela_bugged1_liveness
 > [  0.000000] (2:client@Boivin) Ask the request
 > [  0.000000] (3:client@Fafard) Ask the request

diff --git a/examples/deprecated/msg/mc/bugged2.tesh b/examples/deprecated/msg/mc/bugged2.tesh
index 8f32941..be3f8b7 100644 (file)
--- a/examples/deprecated/msg/mc/bugged2.tesh
+++ b/examples/deprecated/msg/mc/bugged2.tesh
@@ -2,7 +2,7 @@
 
 ! expect return 1
 ! timeout 20
-$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged2 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning --cfg=contexts/stack-size:256
+$ ${bindir:=.}/../../../../bin/simgrid-mc ${bindir:=.}/bugged2 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning --cfg=contexts/stack-size:256
 > [  0.000000] (0:maestro@) Check a safety property. Reduction is: dpor.
 > [  0.000000] (2:client@HostB) Send 1
 > [  0.000000] (3:client@HostC) Send 2

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 889badd..530884a 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -84,10 +84,10 @@ ENDMACRO()
 
 IF(enable_java)
   IF(WIN32)
-    SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/deprecated/java/\;${CMAKE_BINARY_DIR}/teshsuite/deprecated/java/\;${SIMGRID_JAR}")
+    SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/deprecated/java/\;${CMAKE_BINARY_DIR}/teshsuite/java/\;${SIMGRID_JAR}")
     STRING(REPLACE "\;" "§" TESH_CLASSPATH "${TESH_CLASSPATH}")
   ELSE()
-    SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/deprecated/java/:${CMAKE_BINARY_DIR}/teshsuite/deprecated/java/:${SIMGRID_JAR}")
+    SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/deprecated/java/:${CMAKE_BINARY_DIR}/teshsuite/java/:${SIMGRID_JAR}")
   ENDIF()
 ENDIF()