From 96d0d3b5ce093c5443735d6a8f8f6883e9860384 Mon Sep 17 00:00:00 2001 From: navarrop Date: Wed, 23 Jun 2010 14:13:24 +0000 Subject: [PATCH] Update tests for java. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7923 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/AddTests.cmake | 12 ++++++------ buildtools/Cmake/test_java.sh | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index 5cdbd8c886..3224d3783c 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -1,8 +1,8 @@ ### Be sure we can execut some launch file exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh" OUTPUT_VARIABLE "OKITOKI") if(enable_smpi) - exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/src/smpi/smpicc" OUTPUT_VARIABLE "OKITOKI") - exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/src/smpi/smpirun" OUTPUT_VARIABLE "OKITOKI") + exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpicc" OUTPUT_VARIABLE "OKITOKI") + exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE "OKITOKI") endif(enable_smpi) if(enable_memcheck) @@ -228,10 +228,10 @@ endif(HAVE_MC) if(HAVE_JAVA) # java examples -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}) +ADD_TEST(java-basic ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/basic BasicTest ${CMAKE_BINARY_DIR}) +ADD_TEST(java-pingpong ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/ping_pong PingPongTest ${CMAKE_BINARY_DIR}) +ADD_TEST(java-comm_time ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/comm_time CommTimeTest ${CMAKE_BINARY_DIR}) +ADD_TEST(java-suspend ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/suspend SuspendTest ${CMAKE_BINARY_DIR}) endif(HAVE_JAVA) ### diff --git a/buildtools/Cmake/test_java.sh b/buildtools/Cmake/test_java.sh index 6f0b2553b1..2f4c858216 100755 --- a/buildtools/Cmake/test_java.sh +++ b/buildtools/Cmake/test_java.sh @@ -1,7 +1,7 @@ #! /bin/sh echo "\n" -export CLASSPATH=$3:$3/src/simgrid.jar:$CLASSPATH -export LD_LIBRARY_PATH=$3/src/.libs:$LD_LIBRARY_PATH +export CLASSPATH=$3:$3/simgrid.jar:$CLASSPATH +export LD_LIBRARY_PATH=$3/lib:$LD_LIBRARY_PATH cd $1 echo "CLASSPATH = $CLASSPATH" echo "LD_LIBRARY_PATH = $LD_LIBRARY_PATH" -- 2.20.1