This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via b32189fc43f52312625648e9c1638d12a82b2bce (commit) from 61503283620d4a08b94b5c55e26ff96bc664f4e3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/b32189fc43f52312625648e9c1638d12a8... commit b32189fc43f52312625648e9c1638d12a82b2bce Author: Wesley Bland <[email protected]> Date: Mon Jan 5 12:58:58 2015 -0600 Bring test suite version in line with MPICH Instead of using its own versioning system that wasn't getting updated with any regularity, now the test suite will use the same versioning scheme as mainline MPICH. This is consistent with other parts of MPICH that get distributed separately (MPL, ROMIO, Hydra). Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/.gitignore b/.gitignore index 9712189..113379a 100644 --- a/.gitignore +++ b/.gitignore @@ -119,6 +119,7 @@ tags /src/pm/hydra/mpl/confdb /src/mpi/romio/version.m4 /src/pm/hydra/version.m4 +/test/mpi/version.m4 # created by the build process in the test dirs gen-src-stamp diff --git a/autogen.sh b/autogen.sh index a286f5e..cdbd09d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -105,6 +105,7 @@ done if [ -f maint/version.m4 ] ; then cp -pPR maint/version.m4 src/pm/hydra/version.m4 cp -pPR maint/version.m4 src/mpi/romio/version.m4 + cp -pPR maint/version.m4 test/mpi/version.m4 fi # Now sanity check that some of the above sync was successful diff --git a/test/mpi/configure.ac b/test/mpi/configure.ac index 26a9d95..02ea53c 100644 --- a/test/mpi/configure.ac +++ b/test/mpi/configure.ac @@ -11,8 +11,13 @@ dnl dnl The file name here refers to a file in the source being configured dnl FIXME this is the old style, needs updating to new style dnl AC_INIT(include/mpitest.h) -dnl FIXME duplication with VERSION variable below -AC_INIT([mpich-testsuite],[1.2]) +m4_include([version.m4]) +AC_INIT([mpich-testsuite], + MPICH_VERSION_m4, + [[email protected]], + [mpich-testsuite], + [http://www.mpich.org/]) + AC_CONFIG_HEADER(include/mpitestconf.h) AH_TOP([/* -*- Mode: C; c-basic-offset:4 ; -*- */ /* @@ -23,11 +28,8 @@ AH_TOP([/* -*- Mode: C; c-basic-offset:4 ; -*- */ #define MPITESTCONF_H_INCLUDED ]) AH_BOTTOM([#endif]) -# This version is the version of the test suite. -# 1.0: Initial version (all versions) before independent release -# 1.1: Initial version that is independent of MPICH 11/08 -# 1.2: Automake replaces simplemake -VERSION=1.2 + +VERSION=MPICH_VERSION_m4 AC_SUBST(VERSION) AC_CONFIG_AUX_DIR([confdb]) AC_CONFIG_MACRO_DIR([confdb]) ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + autogen.sh | 1 + test/mpi/configure.ac | 16 +++++++++------- 3 files changed, 11 insertions(+), 7 deletions(-) hooks/post-receive -- MPICH primary repository