[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1b1-170-gb7186c7

mysql vizuser noreply at mpich.org
Thu Oct 31 19:08:43 CDT 2013 

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  b7186c70b37eed8f9d8a606dc3e80eff404de339 (commit)
      from  3b56a29cdfd5407c73dc6b836e15c0d460d35d82 (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/b7186c70b37eed8f9d8a606dc3e80eff404de339

commit b7186c70b37eed8f9d8a606dc3e80eff404de339
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date:   Thu Oct 31 17:08:13 2013 -0500

    Move the errors/f77/errhan directory to an iodir.
    
    The test file was using MPI-I/O functions that the MPICH test suite
    allows us to enable/disable.  This patch moves the test to an iodir
    format, so it is not run when configured with --disable-romio.
    
    The correct longer term fix for this is to allow multiple conditions
    to disable a given test.  For example, we could have configure set the
    @enable_io@ macro to either '' or '#', and different tests that rely
    on I/O would add them to the start of the line in the test file.  That
    way, a test that uses both F77 and I/O would be disabled when support
    for either one is not present.
    
    Signed-off-by: Junchao Zhang <jczhang at mcs.anl.gov>

diff --git a/test/mpi/configure.ac b/test/mpi/configure.ac
index b800b14..036e1bc 100644
--- a/test/mpi/configure.ac
+++ b/test/mpi/configure.ac
@@ -1535,11 +1535,11 @@ AC_OUTPUT(maint/testmerge \
           errors/cxx/errhan/Makefile \
           errors/cxx/io/Makefile \
           errors/f77/Makefile \
-	  errors/f77/errhan/Makefile \
-          errors/f77/errhan/addsize.h \
-	  errors/f77/errhan/iooffset.h \
+          errors/f77/io/Makefile \
+          errors/f77/io/addsize.h \
+          errors/f77/io/iooffset.h \
           errors/f90/Makefile \
-	  errors/f90/errhan/Makefile \
+	  errors/f90/io/Makefile \
 	  ckpoint/Makefile \
 	  ft/Makefile \
           manual/Makefile \
@@ -1554,6 +1554,8 @@ AC_OUTPUT(maint/testmerge \
           threads/testlist \
           errors/testlist \
           errors/cxx/testlist \
+          errors/f77/testlist \
+          errors/f90/testlist \
           impls/testlist \
           impls/Makefile \
           impls/mpich/Makefile \
diff --git a/test/mpi/errors/f77/Makefile.am b/test/mpi/errors/f77/Makefile.am
index 9b9a68a..1cb612a 100644
--- a/test/mpi/errors/f77/Makefile.am
+++ b/test/mpi/errors/f77/Makefile.am
@@ -9,6 +9,6 @@ include $(top_srcdir)/Makefile_f77.mtest
 
 EXTRA_DIST = testlist
 
-SUBDIRS = errhan
-DIST_SUBDIRS = errhan
+SUBDIRS = @iodir@
+DIST_SUBDIRS = io
 
diff --git a/test/mpi/errors/f77/errhan/Makefile.am b/test/mpi/errors/f77/io/Makefile.am
similarity index 100%
rename from test/mpi/errors/f77/errhan/Makefile.am
rename to test/mpi/errors/f77/io/Makefile.am
diff --git a/test/mpi/errors/f77/errhan/addsize.h.in b/test/mpi/errors/f77/io/addsize.h.in
similarity index 100%
rename from test/mpi/errors/f77/errhan/addsize.h.in
rename to test/mpi/errors/f77/io/addsize.h.in
diff --git a/test/mpi/errors/f77/errhan/iooffset.h.in b/test/mpi/errors/f77/io/iooffset.h.in
similarity index 100%
rename from test/mpi/errors/f77/errhan/iooffset.h.in
rename to test/mpi/errors/f77/io/iooffset.h.in
diff --git a/test/mpi/errors/f77/errhan/testlist b/test/mpi/errors/f77/io/testlist
similarity index 100%
rename from test/mpi/errors/f77/errhan/testlist
rename to test/mpi/errors/f77/io/testlist
diff --git a/test/mpi/errors/f77/errhan/uerrhandf.f b/test/mpi/errors/f77/io/uerrhandf.f
similarity index 100%
rename from test/mpi/errors/f77/errhan/uerrhandf.f
rename to test/mpi/errors/f77/io/uerrhandf.f
diff --git a/test/mpi/errors/f77/testlist b/test/mpi/errors/f77/testlist
deleted file mode 100644
index 4723c12..0000000
--- a/test/mpi/errors/f77/testlist
+++ /dev/null
@@ -1 +0,0 @@
-errhan
diff --git a/test/mpi/errors/f77/testlist.in b/test/mpi/errors/f77/testlist.in
new file mode 100644
index 0000000..f1ddc59
--- /dev/null
+++ b/test/mpi/errors/f77/testlist.in
@@ -0,0 +1 @@
+ at iodir@
diff --git a/test/mpi/errors/f90/Makefile.am b/test/mpi/errors/f90/Makefile.am
index 1c8b9ed..6824021 100644
--- a/test/mpi/errors/f90/Makefile.am
+++ b/test/mpi/errors/f90/Makefile.am
@@ -9,5 +9,5 @@ include $(top_srcdir)/Makefile_f90.mtest
 
 EXTRA_DIST = testlist
 
-SUBDIRS = errhan
-DIST_SUBDIRS = errhan
+SUBDIRS = @iodir@
+DIST_SUBDIRS = io
diff --git a/test/mpi/errors/f90/testlist b/test/mpi/errors/f90/testlist
deleted file mode 100644
index 4723c12..0000000
--- a/test/mpi/errors/f90/testlist
+++ /dev/null
@@ -1 +0,0 @@
-errhan
diff --git a/test/mpi/errors/f90/testlist.in b/test/mpi/errors/f90/testlist.in
new file mode 100644
index 0000000..f1ddc59
--- /dev/null
+++ b/test/mpi/errors/f90/testlist.in
@@ -0,0 +1 @@
+ at iodir@

-----------------------------------------------------------------------

Summary of changes:
 test/mpi/configure.ac                            |   10 ++++++----
 test/mpi/errors/f77/Makefile.am                  |    4 ++--
 test/mpi/errors/f77/{errhan => io}/Makefile.am   |    0
 test/mpi/errors/f77/{errhan => io}/addsize.h.in  |    0
 test/mpi/errors/f77/{errhan => io}/iooffset.h.in |    0
 test/mpi/errors/f77/{errhan => io}/testlist      |    0
 test/mpi/errors/f77/{errhan => io}/uerrhandf.f   |    0
 test/mpi/errors/f77/testlist                     |    1 -
 test/mpi/errors/f77/testlist.in                  |    1 +
 test/mpi/errors/f90/Makefile.am                  |    4 ++--
 test/mpi/errors/f90/testlist                     |    1 -
 test/mpi/errors/f90/testlist.in                  |    1 +
 12 files changed, 12 insertions(+), 10 deletions(-)
 rename test/mpi/errors/f77/{errhan => io}/Makefile.am (100%)
 rename test/mpi/errors/f77/{errhan => io}/addsize.h.in (100%)
 rename test/mpi/errors/f77/{errhan => io}/iooffset.h.in (100%)
 rename test/mpi/errors/f77/{errhan => io}/testlist (100%)
 rename test/mpi/errors/f77/{errhan => io}/uerrhandf.f (100%)
 delete mode 100644 test/mpi/errors/f77/testlist
 create mode 100644 test/mpi/errors/f77/testlist.in
 delete mode 100644 test/mpi/errors/f90/testlist
 create mode 100644 test/mpi/errors/f90/testlist.in


hooks/post-receive
-- 
MPICH primary repository

More information about the commits mailing list