From: Martin Quinson Date: Tue, 29 Jan 2013 22:36:26 +0000 (+0100) Subject: bunch of files missing from the archive, breaking the tests X-Git-Tag: v3_9_rc1~26 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/19676e284575c2ab70cc36622fdf1837a513ba27?hp=fdb00db083af84f44f82e6dfd98140a4b1c08c22 bunch of files missing from the archive, breaking the tests --- diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 65a93c8a32..29c2ce0257 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -699,6 +699,7 @@ set(TESHSUITE_CMAKEFILES_TXT teshsuite/simdag/platforms/CMakeLists.txt teshsuite/xbt/CMakeLists.txt teshsuite/smpi/CMakeLists.txt + teshsuite/smpi/mpich-test/CMakeLists.txt teshsuite/smpi/mpich-test/env/CMakeLists.txt teshsuite/smpi/mpich-test/coll/CMakeLists.txt teshsuite/smpi/mpich-test/context/CMakeLists.txt diff --git a/buildtools/Cmake/MakeExe.cmake b/buildtools/Cmake/MakeExe.cmake index b297061a91..f8f717494a 100644 --- a/buildtools/Cmake/MakeExe.cmake +++ b/buildtools/Cmake/MakeExe.cmake @@ -23,6 +23,7 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/env) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/coll) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/context) diff --git a/teshsuite/smpi/mpich-test/CMakeLists.txt b/teshsuite/smpi/mpich-test/CMakeLists.txt index f5c12a7742..da0de8a8e9 100644 --- a/teshsuite/smpi/mpich-test/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/CMakeLists.txt @@ -1,5 +1,6 @@ set(tesh_files ${tesh_files} + PARENT_SCOPE ) set(xml_files @@ -15,45 +16,11 @@ set(bin_files PARENT_SCOPE ) -set(stdo_std_smpi - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/context/attrt.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/context/attrerr.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/context/context.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/context/commnames.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/self.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/sndrcvrep.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/waitany.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/reqcreate.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/persistent.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/allpair2.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/typeub3.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/waitall.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/nullproc2.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/allpair.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/hindexed.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/ssendtest2.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/sendmany.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/nullproc.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/nbtest.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/sendcplx.stdo - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/hvec.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/typebase.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/typeub2.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/structf.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/typecreate.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/pt2pt/nblock.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/topol/cartmap.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/topol/graphtest.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/topol/cartf.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/env/aborttest.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/env/errstringsf.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/env/env.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/profile/ptest.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/coll/allredmany.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/coll/allred.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/coll/allredf.std - ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/coll/scatterv.std -) +#set(stdo_std_smpi +# ${CMAKE_CURRENT_SOURCE_DIR}/topol/cartmap.std +# ${CMAKE_CURRENT_SOURCE_DIR}/topol/graphtest.std +# ${CMAKE_CURRENT_SOURCE_DIR}/topol/cartf.std +#) if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}") else() @@ -67,6 +34,6 @@ endif() set(txt_files ${txt_files} - ${stdo_std_smpi} - PARENT_SCOPE - ) + ${CMAKE_CURRENT_SOURCE_DIR}/README + ${CMAKE_CURRENT_SOURCE_DIR}/runbase + PARENT_SCOPE) diff --git a/teshsuite/smpi/mpich-test/coll/CMakeLists.txt b/teshsuite/smpi/mpich-test/coll/CMakeLists.txt index 7137203026..bea91c93ca 100644 --- a/teshsuite/smpi/mpich-test/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/coll/CMakeLists.txt @@ -174,5 +174,10 @@ set(bin_files ) set(txt_files ${txt_files} + ${CMAKE_CURRENT_SOURCE_DIR}/runtests + ${CMAKE_CURRENT_SOURCE_DIR}/allredmany.std + ${CMAKE_CURRENT_SOURCE_DIR}/allred.std + ${CMAKE_CURRENT_SOURCE_DIR}/allredf.std + ${CMAKE_CURRENT_SOURCE_DIR}/scatterv.std PARENT_SCOPE ) diff --git a/teshsuite/smpi/mpich-test/context/CMakeLists.txt b/teshsuite/smpi/mpich-test/context/CMakeLists.txt index 609780277a..86f4b0a499 100644 --- a/teshsuite/smpi/mpich-test/context/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/context/CMakeLists.txt @@ -88,5 +88,10 @@ set(bin_files ) set(txt_files ${txt_files} + ${CMAKE_CURRENT_SOURCE_DIR}/runtests + ${CMAKE_CURRENT_SOURCE_DIR}/attrt.std + ${CMAKE_CURRENT_SOURCE_DIR}/attrerr.std + ${CMAKE_CURRENT_SOURCE_DIR}/context.std + ${CMAKE_CURRENT_SOURCE_DIR}/commnames.std PARENT_SCOPE ) diff --git a/teshsuite/smpi/mpich-test/env/CMakeLists.txt b/teshsuite/smpi/mpich-test/env/CMakeLists.txt index f347298782..2bd3106b1a 100644 --- a/teshsuite/smpi/mpich-test/env/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/env/CMakeLists.txt @@ -93,5 +93,9 @@ set(bin_files ) set(txt_files ${txt_files} + ${CMAKE_CURRENT_SOURCE_DIR}/runtests + ${CMAKE_CURRENT_SOURCE_DIR}/aborttest.std + ${CMAKE_CURRENT_SOURCE_DIR}/errstringsf.std + ${CMAKE_CURRENT_SOURCE_DIR}/env.std PARENT_SCOPE ) diff --git a/teshsuite/smpi/mpich-test/profile/CMakeLists.txt b/teshsuite/smpi/mpich-test/profile/CMakeLists.txt index 5d904ae1d2..60b8d47bf2 100644 --- a/teshsuite/smpi/mpich-test/profile/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/profile/CMakeLists.txt @@ -39,5 +39,7 @@ set(bin_files ) set(txt_files ${txt_files} + ${CMAKE_CURRENT_SOURCE_DIR}/runtests + ${CMAKE_CURRENT_SOURCE_DIR}/ptest.std PARENT_SCOPE ) diff --git a/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt index 4c431ef6d4..1572fbf84c 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt @@ -401,5 +401,29 @@ set(bin_files ) set(txt_files ${txt_files} - PARENT_SCOPE + ${CMAKE_CURRENT_SOURCE_DIR}/runtests + ${CMAKE_CURRENT_SOURCE_DIR}/self.std + ${CMAKE_CURRENT_SOURCE_DIR}/sndrcvrep.std + ${CMAKE_CURRENT_SOURCE_DIR}/waitany.std + ${CMAKE_CURRENT_SOURCE_DIR}/reqcreate.std + ${CMAKE_CURRENT_SOURCE_DIR}/persistent.std + ${CMAKE_CURRENT_SOURCE_DIR}/allpair2.std + ${CMAKE_CURRENT_SOURCE_DIR}/typeub3.std + ${CMAKE_CURRENT_SOURCE_DIR}/waitall.std + ${CMAKE_CURRENT_SOURCE_DIR}/nullproc2.std + ${CMAKE_CURRENT_SOURCE_DIR}/allpair.std + ${CMAKE_CURRENT_SOURCE_DIR}/hindexed.std + ${CMAKE_CURRENT_SOURCE_DIR}/ssendtest2.std + ${CMAKE_CURRENT_SOURCE_DIR}/sendmany.std + ${CMAKE_CURRENT_SOURCE_DIR}/nullproc.std + ${CMAKE_CURRENT_SOURCE_DIR}/nbtest.std + ${CMAKE_CURRENT_SOURCE_DIR}/sendcplx.std + ${CMAKE_CURRENT_SOURCE_DIR}/hvec.std + ${CMAKE_CURRENT_SOURCE_DIR}/typebase.std + ${CMAKE_CURRENT_SOURCE_DIR}/typeub2.std + ${CMAKE_CURRENT_SOURCE_DIR}/structf.std + ${CMAKE_CURRENT_SOURCE_DIR}/typecreate.std + ${CMAKE_CURRENT_SOURCE_DIR}/nblock.std + +PARENT_SCOPE )