From f15c901b8f95648603e1d10313d0b9b3b843d6b2 Mon Sep 17 00:00:00 2001 From: Elena Pourmal Date: Tue, 27 May 2008 11:06:23 -0500 Subject: [svn-r15074] Maintenance: This check-in should fix daily tests failures: Uninstall target had non-existant file to remove; error_handler module triggered a race condition for parallel make with Intel and PGI compilers, therefore we removed the module and created a subroutine instead. Platforms tested: kagiso with GNU, Intel and PGI compilers. --- fortran/test/Makefile.am | 33 ----------------- fortran/test/Makefile.in | 69 +++++++++--------------------------- fortran/test/fortranlib_test.f90 | 1 - fortran/test/fortranlib_test_1_8.f90 | 1 - fortran/test/tH5A_1_8.f90 | 1 - fortran/test/tH5G_1_8.f90 | 1 - fortran/test/tf.f90 | 21 +++++------ 7 files changed, 25 insertions(+), 102 deletions(-) diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am index 0c4d06c..ca0a1b4 100644 --- a/fortran/test/Makefile.am +++ b/fortran/test/Makefile.am @@ -63,30 +63,6 @@ LDADD=libh5test_fortran.la $(LIBH5TEST) $(LIBH5F) $(LIBHDF5) CHECK_CLEANFILES+=*.h5 MOSTLYCLEANFILES=*.tmp -# Fortran module files can have different extensions and different names -# (e.g., different capitalizations) on different platforms. Write rules -# for them explicitly rather than trying to teach automake about them. -# They should be installed as headers and removed during clean. -maintainer-clean-local: clean-local -distclean-local: clean-local -clean-local: - @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ - $(RM) *.$(F9XMODEXT); \ - fi - -install-data-local: - @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ - $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \ - fi - -uninstall-local: - @if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \ - if test -f "$(includedir)/error_handler.$(F9XMODEXT)" -o -f "$(includedir)/ERROR_HANDLER.$(F9XMODEXT)"; then \ - set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \ - fi; \ - fi; \ - $(RM) $(bindir)/$(H5FC_NAME) - # Mark this directory as part of the Fortran API (this affects output # from tests in conclude.am) FORTRAN_API=yes @@ -94,14 +70,5 @@ FORTRAN_API=yes # fflush2 depends on files created by fflush1 fflush2.chkexe_: fflush1.chkexe_ -# Hardcode the dependencies of these files. There isn't a known way of -# determining this automagically (like we do with the C files). So, when -# doing a parallel make, some modules could be made way before the -# modules they depend upon are actually made. *sigh* -fortranlib_test.lo: $(srcdir)/fortranlib_test.f90 tf.lo -fortranlib_test_1_8.lo: $(srcdir)/fortranlib_test_1_8.f90 tf.lo -tH5A_1_8.lo: $(srcdir)/tH5A_1_8.f90 tf.lo -tH5G_1_8.lo: $(srcdir)/tH5G_1_8.f90 tf.lo -tf.lo: $(srcdir)/tf.f90 include $(top_srcdir)/config/conclude.am diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 9e66a6e..43f713b 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -731,14 +731,14 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-local distclean-tags + distclean-tags dvi: dvi-am @@ -750,7 +750,7 @@ info: info-am info-am: -install-data-am: install-data-local +install-data-am: install-dvi: install-dvi-am @@ -771,8 +771,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am -rm -rf ./$(DEPDIR) -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic \ - maintainer-clean-local +maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -787,25 +786,23 @@ ps: ps-am ps-am: -uninstall-am: uninstall-local +uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \ clean clean-checkPROGRAMS clean-generic clean-libtool \ - clean-local clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-local distclean-tags distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-data-local install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic maintainer-clean-local mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - mostlyclean-local pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-local + clean-noinstLTLIBRARIES ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ + pdf-am ps ps-am tags uninstall uninstall-am # List all build rules defined by HDF5 Makefiles as "PHONY" targets here. @@ -819,43 +816,9 @@ uninstall-am: uninstall-local help: @$(top_srcdir)/bin/makehelp -# Fortran module files can have different extensions and different names -# (e.g., different capitalizations) on different platforms. Write rules -# for them explicitly rather than trying to teach automake about them. -# They should be installed as headers and removed during clean. -maintainer-clean-local: clean-local -distclean-local: clean-local -clean-local: - @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ - $(RM) *.$(F9XMODEXT); \ - fi - -install-data-local: - @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ - $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \ - fi - -uninstall-local: - @if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \ - if test -f "$(includedir)/error_handler.$(F9XMODEXT)" -o -f "$(includedir)/ERROR_HANDLER.$(F9XMODEXT)"; then \ - set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \ - fi; \ - fi; \ - $(RM) $(bindir)/$(H5FC_NAME) - # fflush2 depends on files created by fflush1 fflush2.chkexe_: fflush1.chkexe_ -# Hardcode the dependencies of these files. There isn't a known way of -# determining this automagically (like we do with the C files). So, when -# doing a parallel make, some modules could be made way before the -# modules they depend upon are actually made. *sigh* -fortranlib_test.lo: $(srcdir)/fortranlib_test.f90 tf.lo -fortranlib_test_1_8.lo: $(srcdir)/fortranlib_test_1_8.f90 tf.lo -tH5A_1_8.lo: $(srcdir)/tH5A_1_8.f90 tf.lo -tH5G_1_8.lo: $(srcdir)/tH5G_1_8.f90 tf.lo -tf.lo: $(srcdir)/tf.f90 - # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. build-lib: $(LIB) diff --git a/fortran/test/fortranlib_test.f90 b/fortran/test/fortranlib_test.f90 index b82b3fe..2bc2ab7 100644 --- a/fortran/test/fortranlib_test.f90 +++ b/fortran/test/fortranlib_test.f90 @@ -20,7 +20,6 @@ PROGRAM fortranlibtest USE HDF5 - USE error_handler IMPLICIT NONE INTEGER :: total_error = 0 diff --git a/fortran/test/fortranlib_test_1_8.f90 b/fortran/test/fortranlib_test_1_8.f90 index 73f8ac0..4ff3e0f 100644 --- a/fortran/test/fortranlib_test_1_8.f90 +++ b/fortran/test/fortranlib_test_1_8.f90 @@ -20,7 +20,6 @@ PROGRAM fortranlibtest USE HDF5 - USE error_handler IMPLICIT NONE INTEGER :: total_error = 0 diff --git a/fortran/test/tH5A_1_8.f90 b/fortran/test/tH5A_1_8.f90 index 01ac2b7..a74b63f 100644 --- a/fortran/test/tH5A_1_8.f90 +++ b/fortran/test/tH5A_1_8.f90 @@ -22,7 +22,6 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error) ! USE HDF5 ! This module contains all necessary modules - USE error_handler IMPLICIT NONE LOGICAL, INTENT(IN) :: cleanup diff --git a/fortran/test/tH5G_1_8.f90 b/fortran/test/tH5G_1_8.f90 index 832ba43..aea5248 100644 --- a/fortran/test/tH5G_1_8.f90 +++ b/fortran/test/tH5G_1_8.f90 @@ -15,7 +15,6 @@ ! SUBROUTINE group_test(cleanup, total_error) USE HDF5 ! This module contains all necessary modules - USE error_handler IMPLICIT NONE LOGICAL, INTENT(IN) :: cleanup diff --git a/fortran/test/tf.f90 b/fortran/test/tf.f90 index b69152e..2b539a4 100644 --- a/fortran/test/tf.f90 +++ b/fortran/test/tf.f90 @@ -18,17 +18,7 @@ ! This file contains subroutines which are used in ! all the hdf5 fortran tests ! -MODULE error_handler -! Controls the output style for reporting test results - - CHARACTER(LEN=8) :: error_string - CHARACTER(LEN=8), PARAMETER :: success = ' PASSED ' - CHARACTER(LEN=8), PARAMETER :: failure = '*FAILED*' - CHARACTER(LEN=8), PARAMETER :: skip = '--SKIP--' - CHARACTER(LEN=4), PARAMETER :: e_format ='(8a)' - -CONTAINS !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -47,6 +37,15 @@ CONTAINS CHARACTER(LEN=*), INTENT(IN) :: test_title ! Short description of test INTEGER, INTENT(INOUT) :: total_error ! Accumulated error +! Controls the output style for reporting test results + + CHARACTER(LEN=8) :: error_string + CHARACTER(LEN=8), PARAMETER :: success = ' PASSED ' + CHARACTER(LEN=8), PARAMETER :: failure = '*FAILED*' + CHARACTER(LEN=8), PARAMETER :: skip = '--SKIP--' + CHARACTER(LEN=4), PARAMETER :: e_format ='(8a)' + + error_string = failure IF (test_result == 0) THEN error_string = success @@ -61,8 +60,6 @@ CONTAINS END SUBROUTINE write_test_status -END MODULE error_handler - !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) -- cgit v0.12