diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2016-03-22 15:15:44 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2016-03-22 15:15:44 (GMT) |
commit | 98e315ffffdd4df59ad37259531bcef205d60d0e (patch) | |
tree | 857f54092d59f3793b01c77068498d55f4085151 | |
parent | 5309de6c548bd0af26bde85df20d8fd6ca518838 (diff) | |
download | hdf5-98e315ffffdd4df59ad37259531bcef205d60d0e.zip hdf5-98e315ffffdd4df59ad37259531bcef205d60d0e.tar.gz hdf5-98e315ffffdd4df59ad37259531bcef205d60d0e.tar.bz2 |
[svn-r29507] Add actual file name to delete functions to prevent accidental deletion of source files.
(HDFFV-9730 created for tools scripts, which is the basis for the java scripts)
-rw-r--r-- | java/examples/datasets/runExample.sh.in | 4 | ||||
-rw-r--r-- | java/examples/datatypes/runExample.sh.in | 4 | ||||
-rw-r--r-- | java/examples/groups/runExample.sh.in | 6 | ||||
-rw-r--r-- | java/examples/intro/runExample.sh.in | 4 | ||||
-rw-r--r-- | java/test/junit.sh.in | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/java/examples/datasets/runExample.sh.in b/java/examples/datasets/runExample.sh.in index dc63626..8d906db 100644 --- a/java/examples/datasets/runExample.sh.in +++ b/java/examples/datasets/runExample.sh.in @@ -119,7 +119,7 @@ CLEAN_LIBFILES_AND_BLDLIBDIR() # skip rm if srcdir is same as destdir # this occurs when build/test performed in source dir and # make cp fail - SDIR=`$DIRNAME $tstfile` + SDIR=`$DIRNAME $HDFLIB_HOME/slf4j-api-1.7.5.jar` INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` INODE_DDIR=`$LS -i -d $BLDLIBDIR | $AWK -F' ' '{print $1}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then @@ -162,7 +162,7 @@ CLEAN_DATAFILES_AND_BLDDIR() # skip rm if srcdir is same as destdir # this occurs when build/test performed in source dir and # make cp fail - SDIR=`$DIRNAME $tstfile` + SDIR=`$DIRNAME $HDFTEST_HOME/../testfiles/examples.datasets.H5Ex_D_Alloc.txt` INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` INODE_DDIR=`$LS -i -d $BLDDIR | $AWK -F' ' '{print $1}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then diff --git a/java/examples/datatypes/runExample.sh.in b/java/examples/datatypes/runExample.sh.in index e92abf1..adfcea0 100644 --- a/java/examples/datatypes/runExample.sh.in +++ b/java/examples/datatypes/runExample.sh.in @@ -116,7 +116,7 @@ CLEAN_LIBFILES_AND_BLDLIBDIR() # skip rm if srcdir is same as destdir # this occurs when build/test performed in source dir and # make cp fail - SDIR=`$DIRNAME $tstfile` + SDIR=`$DIRNAME $HDFLIB_HOME/slf4j-api-1.7.5.jar` INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` INODE_DDIR=`$LS -i -d $BLDLIBDIR | $AWK -F' ' '{print $1}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then @@ -159,7 +159,7 @@ CLEAN_DATAFILES_AND_BLDDIR() # skip rm if srcdir is same as destdir # this occurs when build/test performed in source dir and # make cp fail - SDIR=`$DIRNAME $tstfile` + SDIR=`$DIRNAME $HDFTEST_HOME/../testfiles/examples.datatypes.H5Ex_T_Array.txt` INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` INODE_DDIR=`$LS -i -d $BLDDIR | $AWK -F' ' '{print $1}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then diff --git a/java/examples/groups/runExample.sh.in b/java/examples/groups/runExample.sh.in index 1ba81fd..ebc6edd 100644 --- a/java/examples/groups/runExample.sh.in +++ b/java/examples/groups/runExample.sh.in @@ -111,7 +111,7 @@ CLEAN_LIBFILES_AND_BLDLIBDIR() # skip rm if srcdir is same as destdir # this occurs when build/test performed in source dir and # make cp fail - SDIR=`$DIRNAME $tstfile` + SDIR=`$DIRNAME $HDFLIB_HOME/slf4j-api-1.7.5.jar` INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` INODE_DDIR=`$LS -i -d $BLDLIBDIR | $AWK -F' ' '{print $1}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then @@ -154,7 +154,7 @@ CLEAN_DATAFILES_AND_BLDDIR() # skip rm if srcdir is same as destdir # this occurs when build/test performed in source dir and # make cp fail - SDIR=`$DIRNAME $tstfile` + SDIR=`$DIRNAME $HDFTEST_HOME/../testfiles/examples.groups.H5Ex_G_Create.txt` INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` INODE_DDIR=`$LS -i -d $BLDDIR | $AWK -F' ' '{print $1}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then @@ -198,7 +198,7 @@ CLEAN_REFFILES_AND_BLDREFDIR() # skip rm if srcdir is same as destdir # this occurs when build/test performed in source dir and # make cp fail - SDIR=`$DIRNAME $tstfile` + 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}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then diff --git a/java/examples/intro/runExample.sh.in b/java/examples/intro/runExample.sh.in index 5b8c978..5d13fa6 100644 --- a/java/examples/intro/runExample.sh.in +++ b/java/examples/intro/runExample.sh.in @@ -105,7 +105,7 @@ CLEAN_LIBFILES_AND_BLDLIBDIR() # skip rm if srcdir is same as destdir # this occurs when build/test performed in source dir and # make cp fail - SDIR=`$DIRNAME $tstfile` + SDIR=`$DIRNAME $HDFLIB_HOME/slf4j-api-1.7.5.jar` INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` INODE_DDIR=`$LS -i -d $BLDLIBDIR | $AWK -F' ' '{print $1}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then @@ -148,7 +148,7 @@ CLEAN_DATAFILES_AND_BLDDIR() # skip rm if srcdir is same as destdir # this occurs when build/test performed in source dir and # make cp fail - SDIR=`$DIRNAME $tstfile` + SDIR=`$DIRNAME $HDFTEST_HOME/../testfiles/examples.intro.H5_CreateDataset.txt` INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` INODE_DDIR=`$LS -i -d $BLDDIR | $AWK -F' ' '{print $1}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in index 6ea3473..8de07e3 100644 --- a/java/test/junit.sh.in +++ b/java/test/junit.sh.in @@ -108,7 +108,7 @@ CLEAN_LIBFILES_AND_BLDLIBDIR() # skip rm if srcdir is same as destdir # this occurs when build/test performed in source dir and # make cp fail - SDIR=`$DIRNAME $tstfile` + SDIR=`$DIRNAME $HDFLIB_HOME/junit.jar` INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` INODE_DDIR=`$LS -i -d $BLDLIBDIR | $AWK -F' ' '{print $1}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then @@ -151,7 +151,7 @@ CLEAN_DATAFILES_AND_BLDDIR() # skip rm if srcdir is same as destdir # this occurs when build/test performed in source dir and # make cp fail - SDIR=`$DIRNAME $tstfile` + SDIR=`$DIRNAME $HDFTEST_HOME/h5ex_g_iterate.hdf` INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` INODE_DDIR=`$LS -i -d $BLDDIR | $AWK -F' ' '{print $1}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then |