summaryrefslogtreecommitdiffstats
path: root/tools/h5diff
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2012-07-22 06:42:30 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2012-07-22 06:42:30 (GMT)
commit9e08a0d8c5fd8da07cf80cd979f0d0eb1469aa97 (patch)
treef5136db4b1fe57f2db92a821a21a994fa853598e /tools/h5diff
parent23d32fec2549762344d365c64fa520d9e6537212 (diff)
downloadhdf5-9e08a0d8c5fd8da07cf80cd979f0d0eb1469aa97.zip
hdf5-9e08a0d8c5fd8da07cf80cd979f0d0eb1469aa97.tar.gz
hdf5-9e08a0d8c5fd8da07cf80cd979f0d0eb1469aa97.tar.bz2
[svn-r22594] Bug fix: HDFFV-8105
Description: The test command in COPY_TESTFILES_TO_TESTDIR used the wrong operator -a which means and. It is not sufficient to test mere existence as $tstfile could have been a directory or other non-file things. If the file is not readable, the $CP command would fail but its return code was not checked. Solution: Get rid of the test command and go ahead to $CP it and then check its returned code and report errors if detected. Tested; committested. (note that ostrick still failed on errors committed by other staff).
Diffstat (limited to 'tools/h5diff')
-rwxr-xr-xtools/h5diff/testh5diff.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh
index cb91a19..a208acf 100755
--- a/tools/h5diff/testh5diff.sh
+++ b/tools/h5diff/testh5diff.sh
@@ -318,11 +318,9 @@ COPY_TESTFILES_TO_TESTDIR()
echo $tstfile | tr -d ' ' | grep '^#' > /dev/null
RET=$?
if [ $RET -eq 1 ]; then
- if [ -a $tstfile ]; then
- $CP -f $tstfile $TESTDIR
- else
+ $CP -f $tstfile $TESTDIR
+ if [ $? -ne 0 ]; then
echo "Error: FAILED to copy $tstfile ."
- echo " $tstfile doesn't exist!"
# Comment out this to CREATE expected file
exit $EXIT_FAILURE