h5 compiler wrappers now pass all arguments passed to it to the compile line (#3954)

* The issue was that the "allargs" variable was not being used in the final command of the compiler wrapper. Any entries containing an escaped quote (\", \') or other non-matching argument (*) would not be passed to the compile line. I have fixed this problem by ensuring all arguments passed to the compiler wrapper are now included in the compile line.

* added testing for compiler wrappers

2 files changed, 37 insertions, 14 deletions

diff --git a/fortran/examples/testh5fc.sh.in b/fortran/examples/testh5fc.sh.in
index 0328bbb..5b6a9de 100644
--- a/fortran/examples/testh5fc.sh.in
+++ b/fortran/examples/testh5fc.sh.in
@@ -42,11 +42,13 @@ myos=`uname -s`
 myhostnama=`uname -n`
 
 # Generate some source files and library for tests.
-suffix=f90		# source file suffix
+suffix=F90		# source file suffix
 hdf5main=${H5TOOL}_hdf5main.$suffix
 hdf5main_o=${H5TOOL}_hdf5main.o
 appmain=${H5TOOL}_appmain.$suffix
 appmain_o=${H5TOOL}_appmain.o
+args=${H5TOOL}_args.$suffix
+args_o=${H5TOOL}_args.o
 prog1=${H5TOOL}_prog1.$suffix
 prog1_o=${H5TOOL}_prog1.o
 prog2=${H5TOOL}_prog2.$suffix
@@ -106,7 +108,7 @@ cat > $hdf5main <<EOF
 
      IMPLICIT NONE
 
-     CHARACTER(LEN=8), PARAMETER :: filename = "apptmp.h5" ! File name
+     CHARACTER(LEN=9), PARAMETER :: filename = "apptmp.h5" ! File name
      INTEGER(HID_T) :: file_id                            ! File identifier
 
      INTEGER     ::   error  ! Error flag
@@ -118,17 +120,38 @@ cat > $hdf5main <<EOF
      END PROGRAM FILEEXAMPLE
 EOF
 
+# Generate an args Main Program:
+# An application main that test misc command line arguments being passed.
+cat > $args <<EOF
+     PROGRAM ARGS
+     USE HDF5 ! This module contains all necessary modules
+
+     IMPLICIT NONE
+     CHARACTER(LEN=1), PARAMETER :: chr1 = SGL_QUOTE ! 'H'
+     CHARACTER(LEN=3), PARAMETER :: chr3 = DBL_QUOTE ! "HDF"
+     INTEGER, PARAMETER :: val = MISC ! 42
 
+     CHARACTER(LEN=9), PARAMETER :: filename = "argtmp.h5" ! File name
+     INTEGER(HID_T) :: file_id                             ! File identifier
+
+     INTEGER     ::   error  ! Error flag
+
+     CALL h5open_f (error)
+     CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
+     CALL h5fclose_f(file_id, error)
+     CALL h5close_f(error)
+     END PROGRAM ARGS
+EOF
 
 # Parse option
 #   None
 
-# Print a line-line message left justified in a field of 70 characters
+# Print a line-line message left justified in a field of 73 characters
 # beginning with the word "Testing".
 #
 TESTING() {
    SPACES="                                                               "
-   echo "Testing $* $SPACES" | cut -c1-70 | tr -d '\012'
+   echo "Testing $* $SPACES" | cut -c1-73 | tr -d '\012'
 }
 
 
@@ -199,6 +222,10 @@ $RANLIB $applib
 TOOLTEST $appmain $applib
 TOOLTEST $appmain_o $applib
 
+#  HDF5 program that depends on input args.
+echo "***"Simple Compile and Link in one step with user-supplied arguments.
+TOOLTEST -DSGL_QUOTE=\'H\' -DDBL_QUOTE=\"HDF\" -DMISC=42 $args
+
 # No preprocess test since -E is not a common option for Fortran compilers.
 
 ##############################################################################
diff --git a/fortran/src/h5fc.in b/fortran/src/h5fc.in
index c5da815..6d7329a 100644
--- a/fortran/src/h5fc.in
+++ b/fortran/src/h5fc.in
@@ -60,7 +60,7 @@ host_os="@host_os@"
 
 prog_name="`basename $0`"
 
-allargs=""
+misc_args=""
 compile_args=""
 link_args=""
 link_objs=""
@@ -176,7 +176,6 @@ for arg in $@ ; do
 
   case "$arg" in
     -c)
-      allargs="$allargs $arg"
       compile_args="$compile_args $arg"
 
       if test "x$do_link" = "xyes" -a -n "$output_file"; then
@@ -187,7 +186,6 @@ for arg in $@ ; do
       dash_c="yes"
       ;;
     -o)
-      allargs="$allargs $arg"
       dash_o="yes"
 
       if test "x$dash_c" = "xyes"; then
@@ -199,14 +197,12 @@ for arg in $@ ; do
       fi
       ;;
     -E|-M|-MT)
-      allargs="$allargs $arg"
       compile_args="$compile_args $arg"
       dash_c="yes"
       do_link="no"
       ;;
     -l*)
       link_args="$link_args $arg"
-      allargs="$allargs $arg"
       ;;
     -prefix=*)
       prefix="`expr "$arg" : '-prefix=\(.*\)'`"
@@ -238,14 +234,14 @@ for arg in $@ ; do
       ;;
     *\"*)
       qarg="'"$arg"'"
-      allargs="$allargs $qarg"
+      misc_args="$misc_args $qarg"
       ;;
     *\'*)
-      qarg='\"'"$arg"'\"'
-      allargs="$allargs $qarg"
+      qarg='"'"$arg"'"'
+      misc_args="$misc_args $qarg"
       ;;
 
-        *) allargs="$allargs $arg"
+        *) misc_args="$misc_args $arg"
 	if [ -s "$arg" ] ; then
 	    ext=`expr "$arg" : '.*\(\..*\)'`
 	    if [ "$ext" = ".f" -o "$ext" = ".F" -o \
@@ -293,7 +289,7 @@ if test "x$do_compile" = "xyes"; then
   fi
 
 
-  $SHOW $FC $H5BLD_FCFLAGS $FCFLAGS ${F9XSUFFIXFLAG} ${fmodules} $compile_args
+  $SHOW $FC $H5BLD_FCFLAGS $FCFLAGS ${F9XSUFFIXFLAG} ${fmodules} $misc_args $compile_args
   status=$?
 
   if test "$status" != "0"; then