From ba396a22c7708838392f2d9210c4d55ea655808c Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 9 Mar 2010 14:42:25 +0000 Subject: [PATCH] Include all files called by tests. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7209 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/CPACK/src/CMakeDefinePackages.txt | 76 +++++++++++++++++++- buildtools/CPACK/src/CMakeDistrib.txt | 6 +- buildtools/CPACK/src/CMakeOption.txt | 28 +++++++- buildtools/CPACK/src/CMakeTest.txt | 3 + 4 files changed, 107 insertions(+), 6 deletions(-) diff --git a/buildtools/CPACK/src/CMakeDefinePackages.txt b/buildtools/CPACK/src/CMakeDefinePackages.txt index 265f4e53ac..4aa0ce7fd8 100644 --- a/buildtools/CPACK/src/CMakeDefinePackages.txt +++ b/buildtools/CPACK/src/CMakeDefinePackages.txt @@ -393,7 +393,6 @@ else(${HAVE_RUBY_H}) ) endif(${HAVE_RUBY_H}) - file(GLOB_RECURSE add_src_files "${PROJECT_DIRECTORY}/examples/*.c" "${PROJECT_DIRECTORY}/teshsuite/*.c" @@ -407,6 +406,7 @@ file(GLOB_RECURSE add_src_files "${PROJECT_DIRECTORY}/teshsuite/*CMakeLists.txt" "${PROJECT_DIRECTORY}/testsuite/*CMakeLists.txt" "${PROJECT_DIRECTORY}/tools/*CMakeLists.txt" +"${PROJECT_DIRECTORY}/examples/*.java" ) #message("\n\nadd_src_files:\n${add_src_files}") @@ -430,3 +430,77 @@ file(GLOB_RECURSE xml_files "${PROJECT_DIRECTORY}/tools/*.xml" ) #message("\n\nxml:\n${xml_files}") + +file(GLOB_RECURSE tesh_files +"${PROJECT_DIRECTORY}/examples/*.tesh" +"${PROJECT_DIRECTORY}/include/*.tesh" +"${PROJECT_DIRECTORY}/src/*.tesh" +"${PROJECT_DIRECTORY}/teshsuite/*.tesh" +"${PROJECT_DIRECTORY}/testsuite/*.tesh" +"${PROJECT_DIRECTORY}/tools/*.tesh" +) +#message("\n\ntesh:\n${tesh_files}") + +file(GLOB_RECURSE txt_files +"${PROJECT_DIRECTORY}/testsuite/surf/trace*.txt" +"${PROJECT_DIRECTORY}/testsuite/simdag/availability_tremblay.txt" +"${PROJECT_DIRECTORY}/examples/smpi/hostfile" +"${PROJECT_DIRECTORY}/examples/msg/*.trace" +"${PROJECT_DIRECTORY}/examples/msg/migration/migration.deploy" +"${PROJECT_DIRECTORY}/examples/java/runtest" +"${PROJECT_DIRECTORY}/teshsuite/gras/datadesc/datadesc.little32_4" +"${PROJECT_DIRECTORY}/teshsuite/gras/datadesc/datadesc.little64" +"${PROJECT_DIRECTORY}/teshsuite/gras/datadesc/datadesc.big32_8" +"${PROJECT_DIRECTORY}/teshsuite/gras/datadesc/datadesc.big32_8_4" +"${PROJECT_DIRECTORY}/teshsuite/gras/datadesc/datadesc.big32_2" +"${PROJECT_DIRECTORY}/teshsuite/gras/datadesc/mk_datadesc_structs.pl" +"${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/test_rl" +"${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/test_sg_32" +"${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/test_sg_64" +"${PROJECT_DIRECTORY}/teshsuite/gras/empty_main/test_rl" +"${PROJECT_DIRECTORY}/teshsuite/gras/empty_main/test_sg" +"${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep/test_sg_32" +"${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep/test_sg_64" +"${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/bob.fail" +"${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/bob.trace" +"${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/link1.bw" +"${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/link1.fail" +"${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/link1.lat" +"${PROJECT_DIRECTORY}/examples/gras/ping/test_rl" +"${PROJECT_DIRECTORY}/examples/gras/rpc/test_rl" +"${PROJECT_DIRECTORY}/examples/gras/spawn/test_rl" +"${PROJECT_DIRECTORY}/examples/gras/timer/test_rl" +"${PROJECT_DIRECTORY}/examples/gras/chrono/test_rl" +"${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_rl" +"${PROJECT_DIRECTORY}/examples/gras/mmrpc/test_rl" +"${PROJECT_DIRECTORY}/examples/gras/all2all/test_rl" +"${PROJECT_DIRECTORY}/examples/gras/pmm/test_rl" +"${PROJECT_DIRECTORY}/examples/gras/synchro/test_rl" +"${PROJECT_DIRECTORY}/examples/gras/properties/test_rl" +"${PROJECT_DIRECTORY}/examples/gras/ping/test_sg_32" +"${PROJECT_DIRECTORY}/examples/gras/rpc/test_sg_32" +"${PROJECT_DIRECTORY}/examples/gras/spawn/test_sg_32" +"${PROJECT_DIRECTORY}/examples/gras/timer/test_sg_32" +"${PROJECT_DIRECTORY}/examples/gras/chrono/test_sg_32" +"${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_sg_32" +"${PROJECT_DIRECTORY}/examples/gras/mmrpc/test_sg_32" +"${PROJECT_DIRECTORY}/examples/gras/all2all/test_sg_32" +"${PROJECT_DIRECTORY}/examples/gras/pmm/test_sg_32" +"${PROJECT_DIRECTORY}/examples/gras/synchro/test_sg_32" +"${PROJECT_DIRECTORY}/examples/gras/ping/test_sg_64" +"${PROJECT_DIRECTORY}/examples/gras/rpc/test_sg_64" +"${PROJECT_DIRECTORY}/examples/gras/spawn/test_sg_64" +"${PROJECT_DIRECTORY}/examples/gras/timer/test_sg_64" +"${PROJECT_DIRECTORY}/examples/gras/chrono/test_sg_64" +"${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_sg_64" +"${PROJECT_DIRECTORY}/examples/gras/mmrpc/test_sg_64" +"${PROJECT_DIRECTORY}/examples/gras/all2all/test_sg_64" +"${PROJECT_DIRECTORY}/examples/gras/pmm/test_sg_64" +"${PROJECT_DIRECTORY}/examples/gras/synchro/test_sg_64" +"${PROJECT_DIRECTORY}/examples/gras/properties/test_sg" +"${PROJECT_DIRECTORY}/examples/java/basic/BasicTest" +"${PROJECT_DIRECTORY}/examples/java/ping_pong/PingPongTest" +"${PROJECT_DIRECTORY}/examples/java/comm_time/CommTimeTest" +"${PROJECT_DIRECTORY}/examples/java/suspend/SuspendTest" +) +#message("\n\ntesh:\n${txt_files}") diff --git a/buildtools/CPACK/src/CMakeDistrib.txt b/buildtools/CPACK/src/CMakeDistrib.txt index 06401cce5f..20e7d237b8 100644 --- a/buildtools/CPACK/src/CMakeDistrib.txt +++ b/buildtools/CPACK/src/CMakeDistrib.txt @@ -27,6 +27,8 @@ set(to_svg ${add_src_files} ${include_files} ${xml_files} + ${tesh_files} + ${txt_files} ${PROJECT_DIRECTORY}/./CMakeLists.txt ${PROJECT_DIRECTORY}/./AUTHORS ${PROJECT_DIRECTORY}/./ChangeLog @@ -47,7 +49,7 @@ endforeach(file ${EXTRA_DIST}) ###copy doc install(DIRECTORY "${PROJECT_DIRECTORY}/doc/" -DESTINATION "doc/" +DESTINATION "/doc/" PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE PATTERN "*~" EXCLUDE @@ -55,7 +57,7 @@ PATTERN "*~" EXCLUDE ###buildtools install(DIRECTORY "${PROJECT_DIRECTORY}/buildtools/CPACK/" -DESTINATION "buildtools/CPACK/" +DESTINATION "/buildtools/CPACK/" PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE PATTERN "*~" EXCLUDE diff --git a/buildtools/CPACK/src/CMakeOption.txt b/buildtools/CPACK/src/CMakeOption.txt index 4ce56719c1..10512d3525 100644 --- a/buildtools/CPACK/src/CMakeOption.txt +++ b/buildtools/CPACK/src/CMakeOption.txt @@ -1,9 +1,7 @@ ### ARGs use -D[var]=[ON/OFF] or [1/0] or [true/false](see after) ### ex: cmake -Ddisable_java=ON -Ddisable_gtnets=ON ./ -if(disable_gtnets) - set(gtnets_path "none" CACHE TYPE INTERNAL FORCE) -endif(disable_gtnets) +set(gtnets_path ${gtnets_path} CACHE PATH "Path to gtnets lib") if(NOT with_context) set(with_context "auto" CACHE TYPE INTERNAL FORCE) @@ -17,3 +15,27 @@ option(enable_compile_warnings "" off) option(enable_compile_optimizations "" off) option(disable_gtnets "This variable set the gtnets context." off) option(disable_ruby "This variable set ruby use." on) + +mark_as_advanced(CLEAR gtnets_path) +mark_as_advanced(BUILDNAME) +mark_as_advanced(ADDR2LINE) +mark_as_advanced(BIBTOOL_PATH) +mark_as_advanced(BUILD_TESTING) +mark_as_advanced(CAT_EXE) +mark_as_advanced(CMAKE_BUILD_TYPE) +mark_as_advanced(CMAKE_INSTALL_PREFIX) +mark_as_advanced(DART_ROOT) +mark_as_advanced(DOXYGEN_PATH) +mark_as_advanced(FIG2DEV_PATH) +mark_as_advanced(FLEXML_EXE) +mark_as_advanced(FLEX_EXE) +mark_as_advanced(GCC_PATH) +mark_as_advanced(GCOV_PATH) +mark_as_advanced(ICONV_PATH) +mark_as_advanced(MAKE_PATH) +mark_as_advanced(PWD_EXE) +mark_as_advanced(SED_EXE) +mark_as_advanced(SET_MAKE) +mark_as_advanced(SH_EXE) +mark_as_advanced(SVN) +mark_as_advanced(VALGRIND_PATH) diff --git a/buildtools/CPACK/src/CMakeTest.txt b/buildtools/CPACK/src/CMakeTest.txt index 7899081413..a1dafa333a 100644 --- a/buildtools/CPACK/src/CMakeTest.txt +++ b/buildtools/CPACK/src/CMakeTest.txt @@ -227,3 +227,6 @@ IF(${ARCH_32_BITS}) set_tests_properties(amok-bandwidth-sg-32 PROPERTIES WILL_FAIL true) set_tests_properties(amok-saturate-sg-32 PROPERTIES WILL_FAIL true) ENDIF(${ARCH_32_BITS}) + +### Be sure we can execut some launch file +exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/buildtools/CPACK/test_java.sh ${PROJECT_DIRECTORY}/src/smpi/smpirun") -- 2.20.1