Enable java tests to be executed out of project directory.'

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7582 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/src/CMakeTest.txt b/buildtools/Cmake/src/CMakeTest.txt
index 6d66974..917e5c1 100644 (file)
--- a/buildtools/Cmake/src/CMakeTest.txt
+++ b/buildtools/Cmake/src/CMakeTest.txt
@@ -208,10 +208,10 @@ endif(HAVE_RUBY)
 
 if(HAVE_JAVA)
 # java examples
-ADD_TEST(java-basic    ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/basic BasicTest)
-ADD_TEST(java-pingpong         ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/ping_pong PingPongTest)
-ADD_TEST(java-comm_time ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/comm_time CommTimeTest)
-ADD_TEST(java-suspend  ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/suspend SuspendTest)
+ADD_TEST(java-basic    ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/basic BasicTest ${PROJECT_DIRECTORY})
+ADD_TEST(java-pingpong         ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/ping_pong PingPongTest ${PROJECT_DIRECTORY})
+ADD_TEST(java-comm_time ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/comm_time CommTimeTest ${PROJECT_DIRECTORY})
+ADD_TEST(java-suspend  ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/suspend SuspendTest ${PROJECT_DIRECTORY})
 endif(HAVE_JAVA)
 
 ###

diff --git a/buildtools/Cmake/test_java.sh b/buildtools/Cmake/test_java.sh
index 08da59d..7abf189 100755 (executable)
--- a/buildtools/Cmake/test_java.sh
+++ b/buildtools/Cmake/test_java.sh
@@ -1,16 +1,8 @@
 #! /bin/sh
-echo "\n\n"
-pwd
-export LD_LIBRARY_PATH="`pwd`/src/.libs:$LD_LIBRARY_PATH"
-export CLASSPATH="`pwd`/src/simgrid.jar:$CLASSPATH"
+echo "\n"
+export CLASSPATH=$3:$3/src/simgrid.jar:$CLASSPATH
 cd $1
-export CLASSPATH="$CLASSPATH:`pwd`"
-pwd
-
-echo "LD_LIBRARY_PATH = $LD_LIBRARY_PATH"
 echo "CLASSPATH = $CLASSPATH"
-
-echo "\n\n"
+pwd
 echo "java $2 *platform.xml *deployment.xml"
-echo "\n\n"
 java $2 *platform.xml *deployment.xml