Merge branch 'develop' into hdf5_1_10.sync

2018-05-25 08:39:47 -05:00
parent e8eb130ce6 563a17cec0
commit cc611c696f
5 changed files with 15 additions and 15 deletions
--- a/java/test/junit.sh.in
+++ b/java/test/junit.sh.in
@@ -224,8 +224,8 @@ CLEAN_DATAFILES_AND_BLDDIR()
    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
+        $RM $BLDDIR/JUnit-*.ert
+        $RM $BLDDIR/JUnit-*.txt
    fi
 }