From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Mon, 21 Mar 2016 10:07:53 +0000 (+0100)
Subject: simplify paths
X-Git-Tag: v3_13~346
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/61982c9c59c72c7c2562d1c180f5690eeaab7fcd?hp=c419b4a65b3ac53a2468d1090ef562bc088fcc24

simplify paths
---

diff --git a/teshsuite/java/CMakeLists.txt b/teshsuite/java/CMakeLists.txt
index 977f5e087e..68cbc198b5 100644
--- a/teshsuite/java/CMakeLists.txt
+++ b/teshsuite/java/CMakeLists.txt
@@ -14,7 +14,7 @@ foreach(example SemaphoreGC SleepHostOff)
     add_custom_target(${example} ALL DEPENDS ${example}_compiled)
     set_target_properties(${example}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${example})
 
-    ADD_TESH(tesh-java-${example} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/teshsuite/java ${CMAKE_HOME_DIRECTORY}/teshsuite/java/${example}/${example}.tesh)
+    ADD_TESH(tesh-java-${example} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/teshsuite/java ${CMAKE_HOME_DIRECTORY}/teshsuite/java/${example}/${example}.tesh)
   endif()
   set(examples_src ${examples_src} ${sources})
 endforeach()
diff --git a/teshsuite/java/SemaphoreGC/SemaphoreGC.tesh b/teshsuite/java/SemaphoreGC/SemaphoreGC.tesh
index 72e87a8508..08f6949aea 100644
--- a/teshsuite/java/SemaphoreGC/SemaphoreGC.tesh
+++ b/teshsuite/java/SemaphoreGC/SemaphoreGC.tesh
@@ -1,4 +1,4 @@
-$ java -classpath ${classpath:=.} SemaphoreGC.SemaphoreGC ${srcdir:=.}/../../examples/platforms/small_platform.xml "--log=root.fmt:[%10.4r]%e(%i:%P@%h)%e%m%n"
+$ java -classpath ${classpath:=.} SemaphoreGC.SemaphoreGC ${srcdir:=.}/small_platform.xml "--log=root.fmt:[%10.4r]%e(%i:%P@%h)%e%m%n"
 > [    0.0000] (0:maestro@) Using regular java threads.
 > [    0.0000] (1:SemCreator@Fafard) Creating 50 new Semaphores, yielding and triggering a GC after each
 > [  500.0000] (1:SemCreator@Fafard) It worked, we survived. The test is passed.
diff --git a/teshsuite/java/SleepHostOff/SleepHostOff.tesh b/teshsuite/java/SleepHostOff/SleepHostOff.tesh
index b70150ae31..fa751969d5 100644
--- a/teshsuite/java/SleepHostOff/SleepHostOff.tesh
+++ b/teshsuite/java/SleepHostOff/SleepHostOff.tesh
@@ -1,4 +1,4 @@
-$ java -classpath ${classpath:=.} SleepHostOff.SleepHostOff ${srcdir:=.}/../../examples/platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ java -classpath ${classpath:=.} SleepHostOff.SleepHostOff ${srcdir:=.}/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:TestRunner@Fafard) **** **** **** ***** ***** Test Sleep ***** ***** **** **** ****
 > [  0.000000] (1:TestRunner@Fafard) Test sleep: Create a process on Tremblay that simply make periodic sleep, turn off Tremblay