From 363c6561b6288c19d8b6e89882c23814981865b5 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 13 Sep 2013 17:03:20 +0200 Subject: [PATCH] Fix errors in make distcheck. * include missing files to the archive * exclude Eclipse files from the archive * exclude ./tools/spell/* from the archive * exclude directory ./teshsuite/smpi/mpich3-test/f77/attr/ from the archive * always include ./teshsuite/smpi/mpich3-test/{f77,f90}/*/CMakeLists.txt and move test for SMPI_F2C in those files --- buildtools/Cmake/DefinePackages.cmake | 27 +++++------- buildtools/Cmake/MakeExe.cmake | 13 +++--- .../smpi/mpich3-test/f77/attr/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f77/coll/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f77/comm/CMakeLists.txt | 2 +- .../mpich3-test/f77/datatype/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f77/ext/CMakeLists.txt | 3 +- .../smpi/mpich3-test/f77/init/CMakeLists.txt | 3 +- .../smpi/mpich3-test/f77/pt2pt/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f90/coll/CMakeLists.txt | 2 +- .../mpich3-test/f90/datatype/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f90/init/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f90/pt2pt/CMakeLists.txt | 2 +- tools/check_dist_archive.exclude | 43 +++---------------- 14 files changed, 36 insertions(+), 71 deletions(-) diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 5b39edad14..017cb796aa 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -927,25 +927,20 @@ set(TESHSUITE_CMAKEFILES_TXT teshsuite/smpi/mpich3-test/group/CMakeLists.txt teshsuite/smpi/mpich3-test/init/CMakeLists.txt teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt +# teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt teshsuite/xbt/CMakeLists.txt ) -if(SMPI_F2C) - set(TESHSUITE_CMAKEFILES_TXT - ${TESHSUITE_CMAKEFILES_TXT} - teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt - teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt - teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt - teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt - teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt - teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt - teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt - teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt - teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt - teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt - ) -endif() - set(TOOLS_CMAKEFILES_TXT tools/CMakeLists.txt tools/graphicator/CMakeLists.txt diff --git a/buildtools/Cmake/MakeExe.cmake b/buildtools/Cmake/MakeExe.cmake index 2ae21da4ac..11deec72e3 100644 --- a/buildtools/Cmake/MakeExe.cmake +++ b/buildtools/Cmake/MakeExe.cmake @@ -94,18 +94,19 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/datatype) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/group) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/init) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/pt2pt) -if(SMPI_F2C) -add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/comm) + +#add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/attr) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/coll) -add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/pt2pt) -add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/ext) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/comm) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/datatype) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/ext) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/init) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/pt2pt) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f90/coll) -add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f90/pt2pt) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f90/datatype) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f90/init) -endif() +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f90/pt2pt) + add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt) add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/surf) add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt) diff --git a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt index 38dd7b2524..c19c489d21 100644 --- a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -if(enable_smpi) +if(enable_smpi AND SMPI_F2C) if(WIN32) set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") else() diff --git a/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt index 4da6a2df67..00b74e56e7 100644 --- a/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -if(enable_smpi) +if(enable_smpi AND SMPI_F2C) if(WIN32) set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") else() diff --git a/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt index 63984b2a5e..3d93a5886b 100644 --- a/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -if(enable_smpi) +if(enable_smpi AND SMPI_F2C) if(WIN32) set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") else() diff --git a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt index 7a877102f5..da9f6ac649 100644 --- a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -if(enable_smpi) +if(enable_smpi AND SMPI_F2C) if(WIN32) set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") else() diff --git a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt index c9603764f5..8c581f8382 100644 --- a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -if(enable_smpi) +if(enable_smpi AND SMPI_F2C) if(WIN32) set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") else() @@ -45,6 +45,7 @@ set(examples_src ${CMAKE_CURRENT_SOURCE_DIR}/allocmemf.f ${CMAKE_CURRENT_SOURCE_DIR}/c2f2c.c ${CMAKE_CURRENT_SOURCE_DIR}/c2f2cf.f + ${CMAKE_CURRENT_SOURCE_DIR}/c2fmult.c ${CMAKE_CURRENT_SOURCE_DIR}/ctypesfromc.c ${CMAKE_CURRENT_SOURCE_DIR}/ctypesinf.f PARENT_SCOPE diff --git a/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt index 439a7b38d0..58f7b11299 100644 --- a/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -if(enable_smpi) +if(enable_smpi AND SMPI_F2C) if(WIN32) set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") else() @@ -30,6 +30,7 @@ set(xml_files set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/baseenvf.f + ${CMAKE_CURRENT_SOURCE_DIR}/checksizes.c PARENT_SCOPE ) set(bin_files diff --git a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt index 44febfb390..ceb2d0b9f4 100644 --- a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -if(enable_smpi) +if(enable_smpi AND SMPI_F2C) if(WIN32) set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") else() diff --git a/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt index eaa09b7247..23601c4067 100644 --- a/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -if(enable_smpi) +if(enable_smpi AND SMPI_F2C) if(WIN32) set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") else() diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt index 64a321f8e3..ee9ac5052d 100644 --- a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -if(enable_smpi) +if(enable_smpi AND SMPI_F2C) if(WIN32) set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") else() diff --git a/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt index 6f4b79f3aa..06f3338f02 100644 --- a/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -if(enable_smpi) +if(enable_smpi AND SMPI_F2C) if(WIN32) set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") else() diff --git a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt index c0c3f0eb3e..53dbe4e925 100644 --- a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -if(enable_smpi) +if(enable_smpi AND SMPI_F2C) if(WIN32) set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") else() diff --git a/tools/check_dist_archive.exclude b/tools/check_dist_archive.exclude index 4ded2ab979..6112c8fa70 100644 --- a/tools/check_dist_archive.exclude +++ b/tools/check_dist_archive.exclude @@ -8,8 +8,10 @@ - Makefile - doc/html/.* ++ \.classpath + \.cproject + \.gitignore ++ \.project + README\.(coding|git) + mk_win-dist.sh @@ -37,44 +39,9 @@ + src/smpi/replace_globals\.cocci + src/smpi/replace_static\.cocci -+ teshsuite/smpi/mpich-test/coll/bcast2\.f -+ teshsuite/smpi/mpich-test/coll/nbcoll\.c -+ teshsuite/smpi/mpich-test/coll/shortint\.c -+ teshsuite/smpi/mpich-test/coll/temprun -+ teshsuite/smpi/mpich-test/context/attrt\.c -+ teshsuite/smpi/mpich-test/context/commnames\.c -+ teshsuite/smpi/mpich-test/env/argstest\.c -+ teshsuite/smpi/mpich-test/env/cmdline\.c -+ teshsuite/smpi/mpich-test/env/errhand2\.c -+ teshsuite/smpi/mpich-test/env/hang\.c -+ teshsuite/smpi/mpich-test/pt2pt/fairness/README -+ teshsuite/smpi/mpich-test/pt2pt/fairness/fairness-euih\.c -+ teshsuite/smpi/mpich-test/pt2pt/fairness/fairness\.c -+ teshsuite/smpi/mpich-test/pt2pt/fairness/fairness2\.c -+ teshsuite/smpi/mpich-test/pt2pt/fairness/fairness2m\.c -+ teshsuite/smpi/mpich-test/pt2pt/fairness/fairnessm\.c -+ teshsuite/smpi/mpich-test/pt2pt/isndrcv2\.c -+ teshsuite/smpi/mpich-test/pt2pt/mpitest\.h -+ teshsuite/smpi/mpich-test/pt2pt/systest\.c -+ teshsuite/smpi/mpich-test/pt2pt/systest1\.c -+ teshsuite/smpi/mpich-test/pt2pt/testhetero -+ teshsuite/smpi/mpich-test/topol/cart\.c -+ teshsuite/smpi/mpich-test/topol/cart1f\.f -+ teshsuite/smpi/mpich-test/topol/cart2\.c -+ teshsuite/smpi/mpich-test/topol/cart2f\.f -+ teshsuite/smpi/mpich-test/topol/cartc\.f90 -+ teshsuite/smpi/mpich-test/topol/cartf\.f -+ teshsuite/smpi/mpich-test/topol/cartf\.std -+ teshsuite/smpi/mpich-test/topol/cartmap\.c -+ teshsuite/smpi/mpich-test/topol/cartmap\.std -+ teshsuite/smpi/mpich-test/topol/cartorder\.c -+ teshsuite/smpi/mpich-test/topol/dims\.c -+ teshsuite/smpi/mpich-test/topol/graphtest\.c -+ teshsuite/smpi/mpich-test/topol/graphtest\.std -+ teshsuite/smpi/mpich-test/topol/test\.c -+ teshsuite/smpi/mpich-test/topol/test\.h -+ teshsuite/smpi/mpich-test/topol/twod\.f -+ teshsuite/smpi/mpich-test/topol/twod2\.f ++ teshsuite/smpi/mpich3-test/f77/attr/.* + tools/check_dist_archive + tools/check_dist_archive\.exclude + ++ tools/spell/.* -- 2.20.1