From 1e91849e851e7b332bffc7dd1730f20f2eb17cd7 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 11 Jul 2007 16:01:34 -0500 Subject: [svn-r13964] Purpose: Bug fix. Description: It used to clean out all *.h5 when done but this could cause a racing condition error if parallel make (e.g., gmake -j ...) is used because the "rm ... *.h5 ..." would remove *.h5 generaged and are still used by other test programs (e.g. xx_write/xx_read). Solution: Removed "*.h5" from the cleanup list since the test program has already taken care of removing temporary *.h5 generated. Tested platform: smirom. Not triple platforms tested since this is just a simple shell script change. --- c++/examples/testh5c++.sh.in | 6 +++++- fortran/examples/testh5fc.sh.in | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/c++/examples/testh5c++.sh.in b/c++/examples/testh5c++.sh.in index cfab0f0..c9474bf 100755 --- a/c++/examples/testh5c++.sh.in +++ b/c++/examples/testh5c++.sh.in @@ -55,9 +55,13 @@ prog2_o=${H5TOOL}_prog2.o applib=libapp${H5TOOL}.a # short hands +# Caution: if some *.h5 files must be cleaned here, list them by names. +# Don't use the wildcard form of *.h5 as it will wipe out even *.h5 generated +# by otehr test programs. This will cause a racing condition error when +# parallel make (e.g., gmake -j 4) is used. temp_SRC="$hdf5main $appmain $prog1 $prog2" temp_OBJ=`echo $temp_SRC | sed -e "s/\.${suffix}/.o/g"` -temp_FILES="a.out *.h5 $applib" +temp_FILES="a.out $applib" # Generate appmain: # An application Main that calls hdf5 and application's own functions. diff --git a/fortran/examples/testh5fc.sh.in b/fortran/examples/testh5fc.sh.in index 5db1580..9f2d9bf 100755 --- a/fortran/examples/testh5fc.sh.in +++ b/fortran/examples/testh5fc.sh.in @@ -60,9 +60,13 @@ prog2_o=${H5TOOL}_prog2.o applib=libapp${H5TOOL}.a # short hands +# Caution: if some *.h5 files must be cleaned here, list them by names. +# Don't use the wildcard form of *.h5 as it will wipe out even *.h5 generated +# by otehr test programs. This will cause a racing condition error when +# parallel make (e.g., gmake -j 4) is used. temp_SRC="$hdf5main $appmain $prog1 $prog2" temp_OBJ=`echo $temp_SRC | sed -e "s/\.${suffix}/.o/g"` -temp_FILES="a.out *.h5 $applib" +temp_FILES="a.out $applib" # Generate appmain: # An application Main that calls hdf5 and application's own functions. -- cgit v0.12