diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-01-13 16:57:26 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-01-13 16:57:26 (GMT) |
| commit | 556ff06975684288794fe53e4ab04f43c972623a (patch) | |
| tree | 639584bdf6db00299319115a40ff2a9e04296222 /java/test | |
| parent | 0f10dedc6eee54fe3b53098ddfc9b91fff4aa480 (diff) | |
| parent | bd85e57904f1f943774bb99ea5e8b0d074db0edb (diff) | |
| download | hdf5-556ff06975684288794fe53e4ab04f43c972623a.zip hdf5-556ff06975684288794fe53e4ab04f43c972623a.tar.gz hdf5-556ff06975684288794fe53e4ab04f43c972623a.tar.bz2 | |
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.
Diffstat (limited to 'java/test')
| -rw-r--r-- | java/test/junit.sh.in | 9 |
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 |