From fc13655cd995ed29d80dcd7b3427e0a4f3717f51 Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 20 Apr 2010 13:23:45 +0000 Subject: [PATCH 1/1] Add revision to test labels into cdash and forced to use svn revision and not git revision. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7617 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- CMakeLists.txt | 23 +++++++++++-------- buildtools/Cmake/generate_memcheck_tests.pl | 3 ++- buildtools/Cmake/src/CMakeCompleteInFiles.txt | 14 ++++++++++- buildtools/Cmake/src/CMakeDistrib.txt | 2 +- buildtools/Cmake/src/CMakePrintArgs.txt | 7 ++++-- buildtools/Cmake/src/CMakeTest.txt | 4 +--- buildtools/Cmake/src/memcheck_tests.txt | 21 ++++++++++++++--- .../pipol/Experimental_all_simgrid_gt.sh | 8 ------- buildtools/pipol/Nightly_simgrid.sh | 9 -------- 9 files changed, 53 insertions(+), 38 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d99e80dda9..00dcea7e07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,9 @@ cmake_minimum_required(VERSION 2.6) SET(CMAKE_LANGUAGE "Cxx") +PROJECT(Simgrid) SET(PROJECT_NAME "Simgrid") +SET(PROJECT_LABEL "Simgrid") set(simgrid_version "3.4") - set(USE_RPATH false) ### Find programs and paths @@ -16,10 +17,6 @@ find_path(GCC_PATH NAMES gcc PATHS NO_DEFAULT_PATHS) find_path(GCOV_PATH NAMES gcov PATHS NO_DEFAULT_PATHS) find_path(VALGRIND_PATH NAMES valgrind PATHS NO_DEFAULT_PATHS) -### AUTO DETECT THE PROJECT_DIRECTORY -message("Project_BINARY_DIR : ${Project_BINARY_DIR}") -message("CMAKE_HOME_DIRECTORY : ${CMAKE_HOME_DIRECTORY}") - ### SET THE PROJECT_DIRECTORY SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}") @@ -64,10 +61,16 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDistrib.txt) ### Print ARGS include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakePrintArgs.txt) -set_property(GLOBAL PROPERTY LABELS "${SVN_VERSION}${GIT_VERSION}") -set_property(GLOBAL PROPERTY PROJECT_LABEL "${SVN_VERSION}${GIT_VERSION}") -set(PROJECT_LABEL "${SVN_VERSION}${GIT_VERSION}") - 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 REPLACE "^.*Test.*\\:+" " " test ${test}) + string(STRIP ${test} test) + if(test) + set_tests_properties(${test} PROPERTIES LABELS "rev${SVN_VERSION}") + endif(test) +endforeach(test ${LIST_OF_TEST}) diff --git a/buildtools/Cmake/generate_memcheck_tests.pl b/buildtools/Cmake/generate_memcheck_tests.pl index c21936a124..6b1d9a5944 100755 --- a/buildtools/Cmake/generate_memcheck_tests.pl +++ b/buildtools/Cmake/generate_memcheck_tests.pl @@ -14,6 +14,7 @@ my(@test_list)=(); my($line); my($dump)=0; +print "if(enable_memcheck)\n"; while(defined($line=)) { chomp $line; if($line =~ /BEGIN TESH TESTS/) { @@ -67,7 +68,7 @@ while(defined($line=)) { } } close(MAKETEST); - +print "endif(enable_memcheck)\n"; #print "set(MEMCHECK_LIST\n"; #print (join("\n", @test_list)); #print ")\n"; diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt index a81b494c81..bc08f0106f 100644 --- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt +++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt @@ -313,16 +313,28 @@ endif(enable_lua) if(IS_DIRECTORY ${PROJECT_DIRECTORY}/.svn) find_file(SVN ".svn" ${PROJECT_DIRECTORY}) exec_program("svnversion ${PROJECT_DIRECTORY}" OUTPUT_VARIABLE "SVN_VERSION") + message("SVN_VERSION : ${SVN_VERSION}") endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.svn) if(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git) find_file(GIT ".git" ${PROJECT_DIRECTORY}) exec_program("git --git-dir=${PROJECT_DIRECTORY}/.git log --oneline -1 | sed 's| .*||'" OUTPUT_VARIABLE "GIT_VERSION") exec_program("git --git-dir=${PROJECT_DIRECTORY}/.git log -n 1 --format=%ai ." OUTPUT_VARIABLE "GIT_DATE") + exec_program("git svn info" ${PROJECT_DIRECTORY} OUTPUT_VARIABLE "GIT_SVN_VERSION") + string(REPLACE "\n" ";" GIT_SVN_VERSION ${GIT_SVN_VERSION}) STRING(REPLACE " +0000" "" GIT_DATE ${GIT_DATE}) STRING(REPLACE " " "~" GIT_DATE ${GIT_DATE}) STRING(REPLACE ":" "-" GIT_DATE ${GIT_DATE}) - message("GIT_DATE : ${GIT_DATE}") + message("GIT_DATE : ${GIT_DATE}") + message("GIT_VERSION : ${GIT_VERSION}") + foreach(line ${GIT_SVN_VERSION}) + string(REGEX MATCH "^Revision:.*" line_good ${line}) + if(line_good) + string(REPLACE "Revision: " "" line_good ${line_good}) + set(SVN_VERSION ${line_good}) + endif(line_good) + endforeach(line ${GIT_SVN_VERSION}) + message("GIT_SVN_VERSION : ${SVN_VERSION}") endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git) ################################### diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt index 20db09f486..76ba352c76 100755 --- a/buildtools/Cmake/src/CMakeDistrib.txt +++ b/buildtools/Cmake/src/CMakeDistrib.txt @@ -1,7 +1,7 @@ set(CMAKE_PROJECT_NAME "${PROJECT_NAME}") set(CPACK_PACKAGE_NAME "${PROJECT_NAME}") set(CPACK_PROJECT_NAME "${PROJECT_NAME}") -set(CPACK_PACKAGE_FILE_NAME "simgrid-${simgrid_version}~${SVN_VERSION}${GIT_DATE}") +set(CPACK_PACKAGE_FILE_NAME "simgrid-${simgrid_version}~${SVN_VERSION}") set(CPACK_GENERATOR "TBZ2") #;TGZ;TZ;ZIP foreach(file ${script_to_install}) diff --git a/buildtools/Cmake/src/CMakePrintArgs.txt b/buildtools/Cmake/src/CMakePrintArgs.txt index 61f46d6b98..c8d08b328a 100644 --- a/buildtools/Cmake/src/CMakePrintArgs.txt +++ b/buildtools/Cmake/src/CMakePrintArgs.txt @@ -5,6 +5,9 @@ if(enable_print_message) message("") message("________________________________________________________________________________") message("________________________________________________________________________________ DEBUG") + message("Project_BINARY_DIR : ${Project_BINARY_DIR}") + message("CMAKE_HOME_DIRECTORY : ${CMAKE_HOME_DIRECTORY}") + message("") message("SIZEOF_MAX : ${SIZEOF_MAX}") message("PTH_STACKGROWTH ${PTH_STACKGROWTH}") message("need_getline ${need_getline}") @@ -77,10 +80,10 @@ if(enable_print_message) message("") endif(enable_print_message) -message("\nConfiguration of package `simgrid' (revision ${SVN_VERSION}${GIT_VERSION}) on arch (=${GRAS_THISARCH}):") +message("\nConfiguration of package `simgrid' (revision ${SVN_VERSION}) on arch (=${GRAS_THISARCH}):") message(" BUILDNAME : ${BUILDNAME}") message(" SITE : ${SITE}") -message(" Release : simgrid-${simgrid_version}~${SVN_VERSION}${GIT_DATE}") +message(" Release : simgrid-${simgrid_version}~rev${SVN_VERSION}") message("") message(" Compiler: c++ : ${CMAKE_CXX_COMPILER}") message(" version: ${COMPILER_CXX_VERSION}") diff --git a/buildtools/Cmake/src/CMakeTest.txt b/buildtools/Cmake/src/CMakeTest.txt index 917e5c1934..54471516d7 100644 --- a/buildtools/Cmake/src/CMakeTest.txt +++ b/buildtools/Cmake/src/CMakeTest.txt @@ -252,6 +252,4 @@ add_test(test-simdag-3 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path: add_test(testall ${PROJECT_DIRECTORY}/src/testall) -if(enable_memcheck) - include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/memcheck_tests.txt) -endif(enable_memcheck) +include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/memcheck_tests.txt) diff --git a/buildtools/Cmake/src/memcheck_tests.txt b/buildtools/Cmake/src/memcheck_tests.txt index 7f832e15e2..d0a6568e76 100644 --- a/buildtools/Cmake/src/memcheck_tests.txt +++ b/buildtools/Cmake/src/memcheck_tests.txt @@ -1,3 +1,4 @@ +if(enable_memcheck) # teshsuite/xbt ADD_TEST(memcheck-tesh-log-large-0 xbt/log_large_test --log=root.fmt:%m%n --cd ${PROJECT_DIRECTORY}/teshsuite/) @@ -113,10 +114,12 @@ ADD_TEST(memcheck-msg-sendrecv_CLM03-0 sendrecv/sendrecv ./sendrecv/platform_sen ADD_TEST(memcheck-msg-sendrecv_Vegas-0 sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Vegas" --cd ${PROJECT_DIRECTORY}/examples/msg/) ADD_TEST(memcheck-msg-sendrecv_Reno-0 sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical --cd ${PROJECT_DIRECTORY}/examples/msg/) ADD_TEST(memcheck-msg-suspend-0 suspend/suspend ./msg_platform.xml ./suspend/deployment_suspend.xml --cd ${PROJECT_DIRECTORY}/examples/msg/) -ADD_TEST(memcheck-msg-masterslave-0 masterslave/masterslave_forwarder ./small_platform.xml ./masterslave/deployment_masterslave.xml --cd ${PROJECT_DIRECTORY}/examples/msg/) +ADD_TEST(memcheck-msg-masterslave-0 masterslave/masterslave_forwarder ./small_platform_with_routers.xml ./masterslave/deployment_masterslave.xml --trace --cd ${PROJECT_DIRECTORY}/examples/msg/) ADD_TEST(memcheck-msg-masterslave-forwarder-0 masterslave/masterslave_forwarder ./msg_platform.xml ./masterslave/deployment_masterslave_forwarder.xml --cd ${PROJECT_DIRECTORY}/examples/msg/) ADD_TEST(memcheck-msg-masterslave-failure-0 masterslave/masterslave_failure --log=xbt_cfg.thres:critical --log=no_loc ./small_platform_with_failures.xml ./masterslave/deployment_masterslave.xml --cfg=path:${PROJECT_DIRECTORY}/src --cd ${PROJECT_DIRECTORY}/examples/msg/) ADD_TEST(memcheck-msg-masterslave-bypass-0 masterslave/masterslave_bypass --log=no_loc --cd ${PROJECT_DIRECTORY}/examples/msg/) +ADD_TEST(memcheck-msg-masterslave-mailbox-0 masterslave/masterslave_mailbox ./small_platform_with_routers.xml ./masterslave/deployment_masterslave_mailbox.xml --trace --cd ${PROJECT_DIRECTORY}/examples/msg/) +ADD_TEST(memcheck-msg-masterslave-vivaldi-0 ./masterslave/masterslave_mailbox --cfg=network/model:Vivaldi ../platforms/vivaldi.xml ./masterslave/deployment_masterslave_vivaldi.xml --cd ${PROJECT_DIRECTORY}/examples/msg/) ADD_TEST(memcheck-msg-migration-0 migration/migration ./msg_platform.xml ./migration/migration.deploy --cd ${PROJECT_DIRECTORY}/examples/msg/) ADD_TEST(memcheck-msg-ptask-0 parallel_task/parallel_task ./small_platform.xml --cd ${PROJECT_DIRECTORY}/examples/msg/) ADD_TEST(memcheck-msg-ptask-1 parallel_task/test_ptask ./parallel_task/test_ptask_platform.xml ./parallel_task/test_ptask_deployment.xml --cd ${PROJECT_DIRECTORY}/examples/msg/) @@ -138,6 +141,14 @@ ADD_TEST(memcheck-msg-masterslave_cpu_ti-1 masterslave/masterslave_forwarder ./m ADD_TEST(memcheck-msg-masterslave_cpu_ti-2 masterslave/masterslave_failure --log=xbt_cfg.thres:critical --log=no_loc ./small_platform_with_failures.xml ./masterslave/deployment_masterslave.xml --cfg=path:${PROJECT_DIRECTORY}/src --cfg=cpu/model:CpuTI --cd ${PROJECT_DIRECTORY}/examples/msg/) ADD_TEST(memcheck-msg-masterslave_cpu_ti-3 masterslave/masterslave_bypass --log=no_loc --cfg=cpu/model:CpuTI --cd ${PROJECT_DIRECTORY}/examples/msg/) +IF(HAVE_TRACING) +ADD_TEST(memcheck-tracing-ms-0 tracing/ms ./tracing/platform.xml ./tracing/deployment.xml --cd ${PROJECT_DIRECTORY}/examples/msg/) +ADD_TEST(memcheck-tracing-ms-1 cat ./tracing/../simulation.trace --cd ${PROJECT_DIRECTORY}/examples/msg/) +ADD_TEST(memcheck-tracing-categories-0 tracing/categories ./tracing/platform.xml ./tracing/deployment.xml --cd ${PROJECT_DIRECTORY}/examples/msg/) +ADD_TEST(memcheck-tracing-categories-1 cat ./tracing/../categories.trace --cd ${PROJECT_DIRECTORY}/examples/msg/) +ENDIF(HAVE_TRACING) + + IF(${ARCH_32_BITS}) ADD_TEST(memcheck-gras-ping-sg-32-0 ./ping_simulator ./../../msg/small_platform.xml ./ping.xml --cd ${PROJECT_DIRECTORY}/examples/gras/ping/) ADD_TEST(memcheck-gras-rpc-sg-32-0 ./rpc_simulator ./../../msg/small_platform.xml ./rpc.xml --log=root.fmt:"'[%h:%P:(%i)] [%c/%p] %m%n'" --cd ${PROJECT_DIRECTORY}/examples/gras/rpc/) @@ -195,11 +206,15 @@ ADD_TEST(memcheck-msg-gtnets-onelink-lv08-0 gtnets/gtnets gtnets/onelink-p.xml g endif(HAVE_GTNETS) # Lua examples +if(HAVE_LUA) ADD_TEST(memcheck-lua-masterslave-0 lua master_slave.lua --cd ${PROJECT_DIRECTORY}/examples/lua/) -ADD_TEST(memcheck-lua-mult_matrix-0 lua master_slave.lua --cd ${PROJECT_DIRECTORY}/examples/lua/) +ADD_TEST(memcheck-lua-mult_matrix-0 lua mult_matrix.lua --cd ${PROJECT_DIRECTORY}/examples/lua/) +endif(HAVE_LUA) # Ruby examples +if(HAVE_RUBY) ADD_TEST(memcheck-ruby-masterslave-0 ruby -I../../src/bindings/ruby MasterSlave.rb --cd ${PROJECT_DIRECTORY}/examples/ruby/) ADD_TEST(memcheck-ruby-ping_pong-0 ruby -I ../../src/bindings/ruby PingPong.rb --cd ${PROJECT_DIRECTORY}/examples/ruby/) ADD_TEST(memcheck-ruby-quicksort-0 ruby -I ../../src/bindings/ruby Quicksort.rb --cd ${PROJECT_DIRECTORY}/examples/ruby/) - +endif(HAVE_RUBY) +endif(enable_memcheck) diff --git a/buildtools/pipol/Experimental_all_simgrid_gt.sh b/buildtools/pipol/Experimental_all_simgrid_gt.sh index 01ed1a1a7d..888a3c3859 100644 --- a/buildtools/pipol/Experimental_all_simgrid_gt.sh +++ b/buildtools/pipol/Experimental_all_simgrid_gt.sh @@ -130,11 +130,3 @@ if [ $SYSTEM = Linux ] ; then make clean fi fi -#Make the memcheck -cmake -Denable_memcheck=on ./ -ctest -D ExperimentalStart -ctest -D ExperimentalConfigure -ctest -D ExperimentalBuild -ctest -D ExperimentalCoverage -ctest -D ExperimentalMemCheck -ctest -D ExperimentalSubmit diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh index 78c805c754..7045f17b6c 100644 --- a/buildtools/pipol/Nightly_simgrid.sh +++ b/buildtools/pipol/Nightly_simgrid.sh @@ -150,12 +150,3 @@ if [ $SYSTEM = Linux ] ; then make clean fi fi - -#Make the memcheck -cmake -Denable_memcheck=on ./ -ctest -D NightlyStart -ctest -D NightlyConfigure -ctest -D NightlyBuild -ctest -D NightlyCoverage -ctest -D NightlyMemCheck -ctest -D NightlySubmit -- 2.20.1