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.

    tools/test/misc/testh5repart.sh.in:
         Change the name of the temporary test directory from "testfiles"
         which is also used for 2 h5mkgrp test files under source control to
         "testrepart" to avoid deleting source controlled files when running
         "make check" in the source directory.

    Fix test scripts that remove source-controlled files during "make check" when run in-source.
    Fix test scripts that don't remove test files because they add files to test directories but don't remove them if the build directories are the same as the source directory.

    Fix any test source file or Makefile.am files for tests that leave data files are removed by neither "make check" nor "make distclean".

1 files changed, 9 insertions, 0 deletions

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