diff options
Diffstat (limited to 'java/examples/groups/JavaGroupExample.sh.in')
-rw-r--r-- | java/examples/groups/JavaGroupExample.sh.in | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/java/examples/groups/JavaGroupExample.sh.in b/java/examples/groups/JavaGroupExample.sh.in index b4e21bd..a4d3959 100644 --- a/java/examples/groups/JavaGroupExample.sh.in +++ b/java/examples/groups/JavaGroupExample.sh.in @@ -34,13 +34,13 @@ nerrors=0 # where the libs exist HDFLIB_HOME="$top_srcdir/java/lib" BLDLIBDIR="$top_builddir/hdf5/lib" -BLDREFDIR="./groups" +BLDITERDIR="./groups" BLDDIR="." HDFTEST_HOME="$top_srcdir/java/examples/groups" JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar TESTJARFILE=jar@PACKAGE_TARNAME@groups.jar test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR -test -d $BLDREFDIR || mkdir -p $BLDREFDIR +test -d $BLDITERDIR || mkdir -p $BLDITERDIR ###################################################################### # library files @@ -59,9 +59,11 @@ LIST_JAR_TESTFILES=" $HDFLIB_HOME/slf4j-api-1.7.25.jar $HDFLIB_HOME/ext/slf4j-simple-1.7.25.jar " -LIST_DATA_FILES=" +LIST_ITER_FILES=" $HDFTEST_HOME/h5ex_g_iterate.h5 $HDFTEST_HOME/h5ex_g_visit.h5 +" +LIST_DATA_FILES=" $HDFTEST_HOME/../testfiles/examples.groups.H5Ex_G_Create.txt $HDFTEST_HOME/../testfiles/examples.groups.H5Ex_G_Iterate.txt $HDFTEST_HOME/../testfiles/examples.groups.H5Ex_G_Compact.txt @@ -146,6 +148,7 @@ CLEAN_LIBFILES_AND_BLDLIBDIR() } COPY_DATAFILES="$LIST_DATA_FILES" +COPY_ITERFILES="$LIST_ITER_FILES" COPY_DATAFILES_TO_BLDDIR() { @@ -190,12 +193,12 @@ CLEAN_DATAFILES_AND_BLDDIR() fi } -COPY_REFFILES="$LIST_REF_FILES" +COPY_ITERFILES="$LIST_ITER_FILES" -COPY_REFFILES_TO_BLDREFDIR() +COPY_ITERFILES_TO_BLDITERDIR() { # copy test files. Used -f to make sure get a new copy - for tstfile in $COPY_REFFILES + for tstfile in $COPY_ITERFILES do # ignore '#' comment echo $tstfile | tr -d ' ' | grep '^#' > /dev/null @@ -206,9 +209,9 @@ COPY_REFFILES_TO_BLDREFDIR() # make cp fail SDIR=`$DIRNAME $tstfile` INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` - INODE_DDIR=`$LS -i -d $BLDREFDIR | $AWK -F' ' '{print $1}'` + INODE_DDIR=`$LS -i -d $BLDITERDIR | $AWK -F' ' '{print $1}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then - $CP -f $tstfile $BLDREFDIR + $CP -f $tstfile $BLDITERDIR if [ $? -ne 0 ]; then echo "Error: FAILED to copy $tstfile ." @@ -220,16 +223,16 @@ COPY_REFFILES_TO_BLDREFDIR() done } -CLEAN_REFFILES_AND_BLDREFDIR() +CLEAN_ITERFILES_AND_BLDITERDIR() { # skip rm if srcdir is same as destdir # this occurs when build/test performed in source dir and # make cp fail SDIR=`$DIRNAME $HDFTEST_HOME/h5ex_g_iterate.h5` INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` - INODE_DDIR=`$LS -i -d $BLDREFDIR | $AWK -F' ' '{print $1}'` + INODE_DDIR=`$LS -i -d $BLDITERDIR | $AWK -F' ' '{print $1}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then - $RM $BLDREFDIR + $RM $BLDITERDIR fi } @@ -252,7 +255,7 @@ JAVAEXEFLAGS=@H5_JAVAFLAGS@ # prepare for test COPY_LIBFILES_TO_BLDLIBDIR COPY_DATAFILES_TO_BLDDIR -COPY_REFFILES_TO_BLDREFDIR +COPY_REFFILES_TO_BLDITERDIR CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-1.7.25.jar:"$BLDLIBDIR"/slf4j-simple-1.7.25.jar:"$TESTJARFILE"" @@ -366,7 +369,7 @@ fi # Clean up temporary files/directories CLEAN_LIBFILES_AND_BLDLIBDIR CLEAN_DATAFILES_AND_BLDDIR -CLEAN_REFFILES_AND_BLDREFDIR +CLEAN_REFFILES_AND_BLDITERDIR # Report test results and exit if test $nerrors -eq 0 ; then |