[svn-r21017] This is a follow-up checkin for r21015 (bug fix for Issue 2598). I added two minor changes: 1. put the output file for

vfd.c test in the list for cleanup in Makefile.am; 2. put the data file in the list in CMakeLists.txt.

Tested on jam - simple change.

4 files changed, 9 insertions, 2 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f634b00..de1d275 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -94,6 +94,8 @@ SET (HDF5_REFERENCE_TEST_FILES
     le_extlink1.h5
     le_extlink2.h5
     mergemsg.h5
+    multi_file_v16-r.h5
+    multi_file_v16-s.h5
     noencoder.h5
     specmetaread.h5
     tarrold.h5
@@ -224,6 +226,8 @@ ADD_TEST (
         extlinks19B00027.h5
         extlinks19B00028.h5
         fheap.h5
+        new_multi_file_v16-r.h5
+        new_multi_file_v16-s.h5
         objcopy_ext.h5
         sys_file1
         tattr.h5
diff --git a/test/Makefile.am b/test/Makefile.am
index 718092e..26b527c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -125,7 +125,8 @@ CHECK_CLEANFILES+=accum.h5 cmpd_dset.h5 compact_dataset.h5 dataset.h5 dset_offse
     dtransform.h5 test_filters.h5 get_file_name.h5 tstint[1-2].h5    \
     unlink_chunked.h5 btree2.h5 objcopy_src.h5 objcopy_dst.h5        \
     objcopy_ext.dat trefer1.h5 trefer2.h5 app_ref.h5 farray.h5       \
-    earray.h5 efc[0-5].h5 log_vfd_out.log
+    earray.h5 efc[0-5].h5 log_vfd_out.log new_multi_file_v16-r.h5    \
+    new_multi_file_v16-s.h5
 
 # Sources for testhdf5 executable
 testhdf5_SOURCES=testhdf5.c tarray.c tattr.c tchecksum.c tconfig.c tfile.c \
diff --git a/test/Makefile.in b/test/Makefile.in
index f196a24..6a5bf6a 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -753,7 +753,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog accum.h5 cmpd_dset.h5 \
 	err_compat.h5 dtransform.h5 test_filters.h5 get_file_name.h5 \
 	tstint[1-2].h5 unlink_chunked.h5 btree2.h5 objcopy_src.h5 \
 	objcopy_dst.h5 objcopy_ext.dat trefer1.h5 trefer2.h5 \
-	app_ref.h5 farray.h5 earray.h5 efc[0-5].h5 log_vfd_out.log
+	app_ref.h5 farray.h5 earray.h5 efc[0-5].h5 log_vfd_out.log \
+	new_multi_file_v16-r.h5 new_multi_file_v16-s.h5
 INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
 
 # Test script for error_test and err_compat
diff --git a/test/vfd.c b/test/vfd.c
index 8f88681..46e38bc 100644
--- a/test/vfd.c
+++ b/test/vfd.c
@@ -1277,6 +1277,7 @@ test_multi_compat(void)
     if(H5Fclose(file) < 0)
         TEST_ERROR;
 
+    h5_cleanup(FILENAME, fapl);
     PASSED();
 
     return 0;