From: mquinson Date: Thu, 2 Dec 2010 13:57:44 +0000 (+0000) Subject: SimGrid now refuse to get compiled without Perl. Removing redundent tests X-Git-Tag: v3.6_beta2~1026 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7ce4c8b29c65ff5537f92a3804d45979af9a060d SimGrid now refuse to get compiled without Perl. Removing redundent tests git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8886 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/CMakeLists.txt b/CMakeLists.txt index afea7e7b6c..bb26cff8ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ FIND_PROGRAM(GCOV_PATH gcov) FIND_PROGRAM(VALGRIND_PATH valgrind) include(FindPerl) if(NOT PERL_EXECUTABLE) - message(FATAL_ERROR "-- SIMGRID NEED PERL") + message(FATAL_ERROR "-- SimGrid cannot be compiled without Perl installed -- sorry. Bailling out.") endif(NOT PERL_EXECUTABLE) diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index 6f32e72ac2..081c5c1380 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 diff --git a/buildtools/Cmake/AddTestsWin.cmake b/buildtools/Cmake/AddTestsWin.cmake index 4666bfbea6..11d94dae80 100644 --- a/buildtools/Cmake/AddTestsWin.cmake +++ b/buildtools/Cmake/AddTestsWin.cmake @@ -1,6 +1,6 @@ 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") @@ -8,10 +8,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 diff --git a/buildtools/Cmake/Supernovae.cmake b/buildtools/Cmake/Supernovae.cmake index 8708389447..129f4abbe2 100644 --- a/buildtools/Cmake/Supernovae.cmake +++ b/buildtools/Cmake/Supernovae.cmake @@ -19,7 +19,7 @@ set(gras_fragile_sources ##################################################### ### Rebuild the supernovae source files -if (PERL_EXECUTABLE AND enable_supernovae) # I need supernovae and can use it +if (enable_supernovae) # I need supernovae # supernovae files are generated. I promise set_source_files_properties(${CMAKE_HOME_DIRECTORY}/src/supernovae_sg.c @@ -64,9 +64,4 @@ if (PERL_EXECUTABLE AND enable_supernovae) # I need supernovae and can use it set(SMPI_SRC ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_smpi.c) -else(PERL_EXECUTABLE AND enable_supernovae) # I need supernovae and can use it - if (enable_supernovae) - message("You need Perl to activate supernovae") - set(enable_supernovae 0) - endif(enable_supernovae) -endif(PERL_EXECUTABLE AND enable_supernovae) # I need supernovae and can use it +endif(enable_supernovae) # I need supernovae diff --git a/buildtools/Cmake/UnitTesting.cmake b/buildtools/Cmake/UnitTesting.cmake index 8c5823c884..bbbb3ec786 100644 --- a/buildtools/Cmake/UnitTesting.cmake +++ b/buildtools/Cmake/UnitTesting.cmake @@ -32,37 +32,22 @@ set(TEST_UNITS -if(PERL_EXECUTABLE) - - ADD_CUSTOM_COMMAND( - OUTPUT ${TEST_UNITS} - - DEPENDS ${CMAKE_HOME_DIRECTORY}/tools/sg_unit_extractor.pl - ${TEST_CFILES} - - COMMAND ${CMAKE_COMMAND} -E remove -f ${TEST_UNITS} - - COMMAND chmod +x ${CMAKE_HOME_DIRECTORY}/tools/sg_unit_extractor.pl - - COMMAND ${CMAKE_HOME_DIRECTORY}/tools/sg_unit_extractor.pl --root=src/ --outdir=${CMAKE_CURRENT_BINARY_DIR}/src/ ${TEST_CFILES} - - WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY} - - COMMENT "Generating *_units files for testall..." - ) - - -else(PERL_EXECUTABLE) - ADD_CUSTOM_COMMAND( +ADD_CUSTOM_COMMAND( OUTPUT ${TEST_UNITS} - - DEPENDS ${CMAKE_HOME_DIRECTORY}/tools/sg_unit_extractor.pl - ${TEST_CFILES} - - COMMAND ${CMAKE_COMMAND} message WARNING "Unit files need to be regenerated, but no Perl installed") -endif(PERL_EXECUTABLE) + + DEPENDS ${CMAKE_HOME_DIRECTORY}/tools/sg_unit_extractor.pl + ${TEST_CFILES} + + COMMAND ${CMAKE_COMMAND} -E remove -f ${TEST_UNITS} + + COMMAND chmod +x ${CMAKE_HOME_DIRECTORY}/tools/sg_unit_extractor.pl + COMMAND ${CMAKE_HOME_DIRECTORY}/tools/sg_unit_extractor.pl --root=src/ --outdir=${CMAKE_CURRENT_BINARY_DIR}/src/ ${TEST_CFILES} + WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY} + + COMMENT "Generating *_units files for testall..." +) ### Ensure the build of testall