Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit 'bd85e57904f1f943774bb99ea5e8b0d074db0edb':
  tools/test/h5diff/testh5diff.sh.in:          Add code to delete copies of test .h5 files copied from          tools/testfiles/vds to tools/test/h5diff/testfiles when running          "make check" for an in-source build.

6 files changed, 22 insertions, 0 deletions

diff --git a/java/examples/datasets/runExample.sh.in b/java/examples/datasets/runExample.sh.in
index 440de33..53d8070 100644
--- a/java/examples/datasets/runExample.sh.in
+++ b/java/examples/datasets/runExample.sh.in
@@ -161,6 +161,8 @@ CLEAN_DATAFILES_AND_BLDDIR()
 {
         $RM $BLDDIR/examples.datasets.H5Ex_D_*.txt
         $RM $BLDDIR/H5Ex_D_*.out
+        $RM $BLDDIR/H5Ex_D_*.h5
+        $RM $BLDDIR/H5Ex_D_External.data
 }
 
 # Print a line-line message left justified in a field of 70 characters
diff --git a/java/examples/datatypes/runExample.sh.in b/java/examples/datatypes/runExample.sh.in
index 1b02774..5b8816c 100644
--- a/java/examples/datatypes/runExample.sh.in
+++ b/java/examples/datatypes/runExample.sh.in
@@ -158,6 +158,7 @@ CLEAN_DATAFILES_AND_BLDDIR()
 {
         $RM $BLDDIR/examples.datatypes.H5Ex_T_*.txt
         $RM $BLDDIR/H5Ex_T_*.out
+        $RM $BLDDIR/H5Ex_T_*.h5
 }
 
 # Print a line-line message left justified in a field of 70 characters
diff --git a/java/examples/groups/runExample.sh.in b/java/examples/groups/runExample.sh.in
index 665b307..2a3f1c6 100644
--- a/java/examples/groups/runExample.sh.in
+++ b/java/examples/groups/runExample.sh.in
@@ -153,6 +153,14 @@ CLEAN_DATAFILES_AND_BLDDIR()
 {
         $RM $BLDDIR/examples.groups.H5Ex_G_*.txt
         $RM $BLDDIR/H5Ex_G_*.out
+        $RM $BLDDIR/H5Ex_G_*.h5
+        SDIR=`$DIRNAME $tstfile`
+        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            SDIR=`$DIRNAME $tstfile`
+            $RM $BLDDIR/h5ex_g_iterate.h5
+            $RM $BLDDIR/h5ex_g_visit.h5
+        fi  
 }
 
 COPY_REFFILES="$LIST_REF_FILES"
diff --git a/java/examples/intro/runExample.sh.in b/java/examples/intro/runExample.sh.in
index a8e65ff..65ca160 100644
--- a/java/examples/intro/runExample.sh.in
+++ b/java/examples/intro/runExample.sh.in
@@ -147,6 +147,7 @@ CLEAN_DATAFILES_AND_BLDDIR()
 {
         $RM $BLDDIR/examples.intro.H5_*.txt
         $RM $BLDDIR/H5_*.out
+        $RM $BLDDIR/H5_*.h5
 }
 
 # Print a line-line message left justified in a field of 70 characters
diff --git a/java/src/Makefile.am b/java/src/Makefile.am
index 21aa5ec..d9e6f50 100644
--- a/java/src/Makefile.am
+++ b/java/src/Makefile.am
@@ -130,6 +130,7 @@ CLEANFILES = classhdf5_java.stamp $(jarfile) $(JAVAROOT)/$(pkgpath)/callbacks/*.
 clean:
 	rm -rf $(JAVAROOT)/*
 	rm -f $(jarfile)
+	rm -rf javadoc
 	rm -f classhdf5_java.stamp
 
 
diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in
index a9a71cb..31037ba 100644
--- a/java/test/junit.sh.in
+++ b/java/test/junit.sh.in
@@ -183,7 +183,16 @@ CLEAN_DATAFILES_AND_BLDDIR()
         $RM $BLDDIR/JUnit-interface.out
         $RM $BLDDIR/JUnit-interface.err
         $RM $BLDDIR/JUnit-interface.ext
+    # skip rm if srcdir is same as destdir
+    # this occurs when build/test performed in source dir and
+    # make cp fail
+    SDIR=`$DIRNAME $tstfile`
+    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
+        $RM $BLDDIR/JUnit-interface.ert
         $RM $BLDDIR/JUnit-interface.txt
+    fi        
 }
 
 # Print a line-line message left justified in a field of 70 characters