diff options
| author | Elena Pourmal <epourmal@hdfgroup.org> | 2002-09-23 22:06:01 (GMT) |
|---|---|---|
| committer | Elena Pourmal <epourmal@hdfgroup.org> | 2002-09-23 22:06:01 (GMT) |
| commit | f5096c200093eaf5b7dae72a3f672b2d7f457ca6 (patch) | |
| tree | 457ebff96156da5e20133905167b7ac714428c30 /fortran/testpar/Makefile.in | |
| parent | 47fc4908325071261476bbdabb1be696323f9298 (diff) | |
| download | hdf5-f5096c200093eaf5b7dae72a3f672b2d7f457ca6.zip hdf5-f5096c200093eaf5b7dae72a3f672b2d7f457ca6.tar.gz hdf5-f5096c200093eaf5b7dae72a3f672b2d7f457ca6.tar.bz2 | |
[svn-r5940]
Purpose:
Bug fix, code improvement
Description:
Fortran tests didn't cleanup created files. Also HDF5_PREFIX and
HDF5_PARAPREFIX were not used to specify location of the files.
There was a redundant file in the testpar directory that contained
an error reporting function used by both serial and parallel tests.
Solution:
Created library h5test_fortran.a that contains functions used by the
serial and parallel tests. It includes Fortran and C functions that
may be called from Fortran programs to report errors, to modify
file names and to cleanup files after run. Modified test code to
use new functions.
Platforms tested:
Linux 2.2 (eirene) serial
IRIX64 (modi4) parallel with HDF5_PREFIX and HDF5_PARAPREFIX set to $SCR
Solris 2.7 with mpich 1.2.4 with HDF5_PARAPREFIX set to /tmp/epourmal
Diffstat (limited to 'fortran/testpar/Makefile.in')
| -rw-r--r-- | fortran/testpar/Makefile.in | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 4f5de0e..2ee682a 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -1,8 +1,18 @@ ## HDF5 Fortran Parallel Library Test Makefile(.in) ## -## Copyright (C) 2000 National Center for Supercomputing Applications -## All rights reserved + +## +## Copyright by the Board of Trustees of the University of Illinois. +## All rights reserved. ## +## This file is part of HDF5. The full HDF5 copyright notice, including +## terms governing use, modification, and redistribution, is contained in +## the files COPYING and Copyright.html. COPYING can be found at the root +## of the source code distribution tree; Copyright.html can be found at the +## root level of an installed copy of the electronic HDF5 document set and +## is linked from the top-level documents page. It can also be found at +## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have +## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. ## top_srcdir=@top_srcdir@/.. top_builddir=../.. @@ -16,6 +26,8 @@ hdf5_builddir=$(top_builddir)/src LT_LINK_LIB=$(LT) --mode=link $(F9X) -static -rpath $(libdir) LIBFORTRAN=../src/libhdf5_fortran.la LIBHDF5=$(hdf5_builddir)/libhdf5.la +FTLIB = ../test/libh5test_fortran.la +CTLIB = ../../test/.libs/libh5test.a ## These tests are parallel RUNTEST=$(RUNPARALLEL) @@ -28,7 +40,7 @@ MOSTLYCLEAN=ParaEg[123].h5f DISTCLEAN=go ## Test source files -TEST_PFORTRAN_SRC=ptesthdf5_fortran.f90 thdf5.f90 tcheck.f90 thyperslab_wr.f90 +TEST_PFORTRAN_SRC=ptesthdf5_fortran.f90 thdf5.f90 thyperslab_wr.f90 TEST_PFORTRAN_OBJ=$(TEST_PFORTRAN_SRC:.f90=.lo) TEST_SRC=$(TEST_PFORTRAN_SRC) TEST_OBJ=$(TEST_SRC:.f90=.lo) @@ -44,7 +56,7 @@ $(TEST_OBJ): $(TEST_HDR) thyperslab_wr.lo: $(srcdir)/thyperslab_wr.f90 thdf5.lo ptesthdf5_fortran.lo: $(srcdir)/ptesthdf5_fortran.f90 thdf5.lo -ptesthdf5_fortran: thdf5.lo thyperslab_wr.lo tcheck.lo ptesthdf5_fortran.lo - @$(LT_LINK_FEXE) $(FFLAGS) -o $@ ptesthdf5_fortran.lo thdf5.lo thyperslab_wr.lo tcheck.lo $(LIBFORTRAN) $(LIBHDF5) $(LIBS) +ptesthdf5_fortran: thdf5.lo thyperslab_wr.lo ptesthdf5_fortran.lo + @$(LT_LINK_FEXE) $(FFLAGS) -o $@ ptesthdf5_fortran.lo thdf5.lo thyperslab_wr.lo $(FTLIB) $(CTLIB) $(LIBFORTRAN) $(LIBHDF5) $(LIBS) @CONCLUDE@ |