summaryrefslogtreecommitdiffstats
path: root/fortran/test
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-07-29 21:24:15 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-07-29 21:24:15 (GMT)
commit4df595c22da9c316b44a46602091fd5fe261abe9 (patch)
tree12c3d4c44f41cf3b18764a708baab2fed93fabb8 /fortran/test
parent517cadac2647bf325720c74285381045fb84be30 (diff)
parentd169391529f253a9903b8e6cacf38c59ceefab07 (diff)
downloadhdf5-4df595c22da9c316b44a46602091fd5fe261abe9.zip
hdf5-4df595c22da9c316b44a46602091fd5fe261abe9.tar.gz
hdf5-4df595c22da9c316b44a46602091fd5fe261abe9.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'd169391529f253a9903b8e6cacf38c59ceefab07': Parallel Fortran tests now use the MPI module instead of including mpif.h. First stab at gfortran versions. Tested on gfortran 7-9 so far. Moved the -std=f2008 option to gfortran 9 for now. Updated gfortran options. * Removed conclude_fc.am, which was causing verbose builds. Need to investigate more, though. * Added gfortran 9 warnings and flags. This will need to be separated into other version blocks based on when the options first appeared. * The standard is now explicitly set at 2008.
Diffstat (limited to 'fortran/test')
-rw-r--r--fortran/test/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am
index f0d7f03..e5fe7d6 100644
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@@ -100,4 +100,4 @@ H5_test_buildiface_LDADD =
fflush2.chkexe_: fflush1.chkexe_
-include $(top_srcdir)/config/conclude_fc.am
+include $(top_srcdir)/config/conclude.am