From 35ee86436a225f8544dfe1ae58af4ed174bd6d2d Mon Sep 17 00:00:00 2001 From: navarrop Date: Mon, 31 May 2010 11:38:02 +0000 Subject: [PATCH] Add notes to cdash. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7811 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- CMakeLists.txt | 18 +----------------- buildtools/Cmake/PrintArgs.cmake | 5 +++++ buildtools/pipol/Nightly_simgrid.sh | 2 ++ buildtools/pipol/liste_install.sh | 2 +- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 70815de510..c4f7f48a88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,6 @@ set(release_version "3.5") set(libsimgrid_version "${release_version}") set(libgras_version "${release_version}") set(libsmpi_version "${release_version}") -exec_program("${CMAKE_COMMAND} -E remove -f ${simgrid_BINARY_DIR}/CTestTestfile.cmake" OUTPUT_VARIABLE rmok) if(WIN32) message(" Be sure all those variables are correctely set.") @@ -81,19 +80,4 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/Distrib.cmake) ### Print ARGS include(${PROJECT_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake) -INCLUDE(Dart) - -exec_program("ctest -N" OUTPUT_VARIABLE LIST_OF_TEST) -string(REPLACE "\n" ";" LIST_OF_TEST ${LIST_OF_TEST}) -foreach(test ${LIST_OF_TEST}) - string(REGEX REPLACE "^.*Test.*project.*" " " test ${test}) - string(REGEX REPLACE "^.*Total.*Tests:.*" " " test ${test}) - string(REGEX MATCH "^.*Testing.*" test_ok_1 ${test}) #for ctest version 2.6 (xxx/xxx Testing) - string(REGEX MATCH "^.*Test.*\\:+" test_ok_2 ${test}) #for ctest version 2.8 (Test #xxx) - if(test_ok_1 OR test_ok_2) - string(REGEX REPLACE "^.*Testing" " " test ${test}) #for ctest version 2.6 - string(REGEX REPLACE "^.*Test.*\\:+" " " test ${test}) #for ctest version 2.8 - string(STRIP ${test} test) - set_tests_properties(${test} PROPERTIES LABELS "rev${SVN_VERSION}") - endif(test_ok_1 OR test_ok_2) -endforeach(test ${LIST_OF_TEST}) +INCLUDE(Dart) \ No newline at end of file diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake index 1a63324597..90d33b69ce 100644 --- a/buildtools/Cmake/PrintArgs.cmake +++ b/buildtools/Cmake/PrintArgs.cmake @@ -141,3 +141,8 @@ message(" Smpi dependencies : ${SMPI_DEP}") message("") message(" INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") message("") + +exec_program("${CMAKE_COMMAND} -E make_directory ${simgrid_BINARY_DIR}/Testing/Notes/") +file(WRITE ${simgrid_BINARY_DIR}/Testing/Notes/Build "svn version : ${SVN_VERSION}") +file(APPEND ${simgrid_BINARY_DIR}/Testing/Notes/Build "Release : simgrid-${release_version}~rev${SVN_VERSION}" + diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh index 7b872dd402..fa5eef7846 100644 --- a/buildtools/pipol/Nightly_simgrid.sh +++ b/buildtools/pipol/Nightly_simgrid.sh @@ -2,6 +2,8 @@ #PRE-PIPOL /home/mescal/navarro/pre-simgrid.sh +#PIPOL esn i386_mac-mac-osx-server-leopard.dd.gz none 02:00 --user --quiet + #PIPOL esn i386-linux-ubuntu-intrepid.dd.gz none 02:00 --user --quiet #PIPOL esn i386-linux-ubuntu-jaunty.dd.gz none 02:00 --user --quiet diff --git a/buildtools/pipol/liste_install.sh b/buildtools/pipol/liste_install.sh index d9070e2608..90daa775bf 100644 --- a/buildtools/pipol/liste_install.sh +++ b/buildtools/pipol/liste_install.sh @@ -84,7 +84,7 @@ if [ x$which_lua = x ] ; then sudo yum -y install lua-devel fi if [ x$arch = xDarwin ] ; then - sudo fink -y install lua51-dev + sudo fink -y install lua51-dev lua51 fi fi -- 2.20.1