Merge pull request #1229 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit 'cd35778542c3c6e51ad334e6e4cf4be9f08bcaf8':
  Correct names
  Call new function
This commit is contained in:
Allen Byrne 2018-08-30 13:00:21 -05:00
commit e12f770b3e

View File

@ -148,7 +148,6 @@ CLEAN_LIBFILES_AND_BLDLIBDIR()
}
COPY_DATAFILES="$LIST_DATA_FILES"
COPY_ITERFILES="$LIST_ITER_FILES"
COPY_DATAFILES_TO_BLDDIR()
{
@ -255,7 +254,7 @@ JAVAEXEFLAGS=@H5_JAVAFLAGS@
# prepare for test
COPY_LIBFILES_TO_BLDLIBDIR
COPY_DATAFILES_TO_BLDDIR
COPY_REFFILES_TO_BLDITERDIR
COPY_ITERFILES_TO_BLDITERDIR
CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-1.7.25.jar:"$BLDLIBDIR"/slf4j-simple-1.7.25.jar:"$TESTJARFILE""
@ -367,9 +366,9 @@ else
fi
# Clean up temporary files/directories
CLEAN_ITERFILES_AND_BLDITERDIR
CLEAN_LIBFILES_AND_BLDLIBDIR
CLEAN_DATAFILES_AND_BLDDIR
CLEAN_ITERFILES_AND_BLDITERDIR
# Report test results and exit
if test $nerrors -eq 0 ; then