don't throw away existing LD_LIBRARY_PATH in our tests.

[simgrid.git] / examples / deprecated / java / CMakeLists.txt

diff --git a/examples/deprecated/java/CMakeLists.txt b/examples/deprecated/java/CMakeLists.txt
index bfbb575..814a45c 100644 (file)
--- a/examples/deprecated/java/CMakeLists.txt
+++ b/examples/deprecated/java/CMakeLists.txt
@@ -7,11 +7,11 @@ set(async-waitall_files         Main  Receiver Sender)
 set(async-yield_files           Main  Yielder)
 set(async-dsend_files           Main  Receiver Sender)
 set(cloud-masterworker_files    Main  Master Worker)
-set(cloud-migration_files       Main  Daemon Test TestHostOnOff XVM)
+set(cloud-migration_files       Main  Daemon Test XVM)
 set(dht-chord_files             Main  ChordTask  Common FindSuccessorAnswerTask  FindSuccessorTask
                                       GetPredecessorAnswerTask GetPredecessorTask Node  NotifyTask)
 set(dht-kademlia_files          Main  Answer  Bucket  Common Contact FindNodeAnswerTask  FindNodeTask
-                                      KademliaTask  Node  PingAnswerTask PingTask  RoutingTable)
+                                      KademliaTask  Node  RoutingTable)
 set(trace-pingpong_files        Main  PingPongTask Receiver Sender)
 set(energy-consumption_files    Main  EnergyConsumer)
 set(energy-pstate_files         Main  PstateRunner)
@@ -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/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)
+    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:$ENV{LD_LIBRARY_PATH} --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()