From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 18 Feb 2011 18:44:28 +0000 (+0000)
Subject: Remove old script to launch java examples.
X-Git-Tag: v3_9_90~569^2~19^2~203
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0caed14b9f53263281010fcf575340c149ff4264?ds=sidebyside

Remove old script to launch java examples.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c7ea0911c..b5e10e3dd8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 project(simgrid-java C)
+set(UPDATE_TYPE svn)
 set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib")
@@ -141,5 +142,17 @@ ${CMAKE_HOME_DIRECTORY}/simgrid.jar
 INCLUDE(CTest)
 ENABLE_TESTING()
 
-ADD_TEST(java-basic 	${CMAKE_HOME_DIRECTORY}/test_java.sh ${CMAKE_HOME_DIRECTORY}/examples basic/BasicTest ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/basic/)
-ADD_TEST(java-pingpong 	${CMAKE_HOME_DIRECTORY}/test_java.sh ${CMAKE_HOME_DIRECTORY}/examples pingPong/PingPongTest ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/pingPong/)
\ No newline at end of file
+ADD_TEST(java-basic
+java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar basic/BasicTest ${CMAKE_HOME_DIRECTORY}/examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/basic/basicDeployment.xml
+)
+ADD_TEST(java-pingPong
+java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar pingPong/PingPongTest ${CMAKE_HOME_DIRECTORY}/examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/pingPong/pingPongDeployment.xml
+)
+
+##########################################
+# Set the  LD_LIBRARY_PATH for our tests #
+##########################################
+message(STATUS "export LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:$ENV{LD_LIBRARY_PATH}")
+
+set_tests_properties(java-basic java-pingPong
+PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:$ENV{LD_LIBRARY_PATH}")
\ No newline at end of file
diff --git a/test_java.sh b/test_java.sh
deleted file mode 100755
index 03836e62bb..0000000000
--- a/test_java.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/bash
-export LD_LIBRARY_PATH=$3/lib:$LD_LIBRARY_PATH:${SIMGRID_ROOT}/lib
-export JAVA_LIBRARY_PATH=:$3/lib:$JAVA_LIBRARY_PATH:${SIMGRID_ROOT}/lib
-cd $1
-echo "LD_LIBRARY_PATH   = $LD_LIBRARY_PATH"
-echo "JAVA_LIBRARY_PATH = $JAVA_LIBRARY_PATH"
-pwd
-echo "java -cp .:$3/simgrid.jar $2 *platform.xml $4*Deployment.xml"
-java -cp .:$3/simgrid.jar $2 *platform.xml $4*Deployment.xml