X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6a5f04303fede6c66ee161297d17a0979a8e691e..4f572f1a8b62309a9c3e3f02dfdc2a0d08ee27d2:/buildtools/Cmake/AddTests.cmake

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 6f32e72ac2..14be4ea11d 100644
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -7,7 +7,7 @@ endif(enable_smpi)
 
 if(enable_memcheck)
 	exec_program("valgrind --version " OUTPUT_VARIABLE "VALGRIND_VERSION")
-	if(VALGRIND_VERSION AND PERL_EXECUTABLE)
+	if(VALGRIND_VERSION)
 		string(REGEX MATCH "[0-9].[0-9].[0-9]" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}")
 		if(NEW_VALGRIND_VERSION)
 			exec_program("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake > ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake")
@@ -15,10 +15,10 @@ if(enable_memcheck)
 			set(enable_memcheck false)
 			message("Command valgrind not found --> enable_memcheck autoset to false.")
 		endif(NEW_VALGRIND_VERSION)
-	else(VALGRIND_VERSION AND PERL_EXECUTABLE)
+	else(VALGRIND_VERSION)
 		set(enable_memcheck false)
-		message(FATAL_ERROR "Command valgrind or perl not found --> enable_memcheck autoset to false.")
-	endif(VALGRIND_VERSION AND PERL_EXECUTABLE)
+		message(FATAL_ERROR "Command valgrind not found --> enable_memcheck autoset to false.")
+	endif(VALGRIND_VERSION)
 endif(enable_memcheck)
 
 ### For code coverage
@@ -240,15 +240,6 @@ ADD_TEST(mc-bugged2			${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/
 ADD_TEST(mc-centralized		${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh)
 endif(HAVE_MC)
 
-if(HAVE_JAVA)
-### Be sure we can execut some launch file
-exec_program("chmod a=rwx ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_java.sh" OUTPUT_VARIABLE "OKITOKI")
-# java examples
-ADD_TEST(java-basic 	${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_java.sh ${CMAKE_HOME_DIRECTORY}/examples/java/basic BasicTest ${simgrid_BINARY_DIR})
-ADD_TEST(java-pingpong 	${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_java.sh ${CMAKE_HOME_DIRECTORY}/examples/java/ping_pong PingPongTest ${simgrid_BINARY_DIR})
-ADD_TEST(java-comm_time ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_java.sh ${CMAKE_HOME_DIRECTORY}/examples/java/comm_time CommTimeTest ${simgrid_BINARY_DIR})
-ADD_TEST(java-suspend 	${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_java.sh ${CMAKE_HOME_DIRECTORY}/examples/java/suspend SuspendTest ${simgrid_BINARY_DIR})
-endif(HAVE_JAVA)
 
 ###
 ### Declare that we know that some tests are broken