diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2017-01-13 16:33:50 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2017-01-13 16:33:50 (GMT) |
| commit | bd85e57904f1f943774bb99ea5e8b0d074db0edb (patch) | |
| tree | 4d94cbb8292116af3cf369adf1b47a014210ae17 /java/test | |
| parent | 089afc48561ba8838d6a515c6b00fc6f7032ca13 (diff) | |
| parent | 8452976de5d770adcf3892b25c8480042170fccd (diff) | |
| download | hdf5-bd85e57904f1f943774bb99ea5e8b0d074db0edb.zip hdf5-bd85e57904f1f943774bb99ea5e8b0d074db0edb.tar.gz hdf5-bd85e57904f1f943774bb99ea5e8b0d074db0edb.tar.bz2 | |
Merge pull request #250 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '8452976de5d770adcf3892b25c8480042170fccd':
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.
Diffstat (limited to 'java/test')
| -rw-r--r-- | java/test/TestH5Ocopy.java | 1 | ||||
| -rw-r--r-- | java/test/junit.sh.in | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/java/test/TestH5Ocopy.java b/java/test/TestH5Ocopy.java index 62dd886..cf0fb1f 100644 --- a/java/test/TestH5Ocopy.java +++ b/java/test/TestH5Ocopy.java @@ -239,6 +239,7 @@ public class TestH5Ocopy { try {H5.H5Pclose(ocp_plist_id);} catch (Exception ex) {} try {H5.H5Fclose(H5fid2);} catch (Exception ex) {} } + _deleteFile("copy.h5"); } @Test 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 |