[svn-r16372] Description:

Clean up files produced from set_extent testing.

Tested on:
	FreeBSD/32 6.3 (duty)
	(too minor to require h5committest)
This commit is contained in:
Quincey Koziol 2009-01-29 13:18:39 -05:00
parent b698574fce
commit 6416329ef8
3 changed files with 15 additions and 8 deletions

View File

@ -114,7 +114,7 @@ CHECK_CLEANFILES+=cmpd_dset.h5 compact_dataset.h5 dataset.h5 dset_offset.h5 \
fillval_[0-9].h5 fillval.raw mount_[0-9].h5 testmeta.h5 ttime.h5 \
trefer[1-3].h5 tvltypes.h5 tvlstr.h5 tvlstr2.h5 flush.h5 \
enum1.h5 titerate.h5 ttsafe.h5 tarray1.h5 tgenprop.h5 \
tmisc[0-9]*.h5 set_extent_read.h5 set_extent_create.h5 \
tmisc[0-9]*.h5 set_extent[1-5].h5 ext[12].bin \
getname.h5 getname[1-3].h5 sec2_file.h5 direct_file.h5 \
family_file000[0-3][0-9].h5 multi_file-[rs].h5 core_file \
new_move_[ab].h5 ntypes.h5 dangle.h5 error_test.h5 err_compat.h5 \

View File

@ -2188,7 +2188,7 @@ main(int argc, char *argv[])
puts("All fill value tests passed.");
if(h5_cleanup(FILENAME, fapl))
remove(FILE_NAME_RAW);
HDremove(FILE_NAME_RAW);
return 0;

View File

@ -36,6 +36,8 @@
#define FILE_NAME3 "set_extent3.h5"
#define FILE_NAME4 "set_extent4.h5"
#define FILE_NAME5 "set_extent5.h5"
#define EXT_FILE_NAME1 "ext1.bin"
#define EXT_FILE_NAME2 "ext2.bin"
#define RANK1 1
#define RANK2 2
@ -94,9 +96,17 @@ int main( void )
puts("All set_extent tests passed.");
HDremove(FILE_NAME1);
HDremove(FILE_NAME2);
HDremove(FILE_NAME3);
HDremove(FILE_NAME4);
HDremove(FILE_NAME5);
HDremove(EXT_FILE_NAME1);
HDremove(EXT_FILE_NAME2);
return 0;
error:
H5_FAILED();
return 1;
@ -2044,12 +2054,12 @@ static int test_external( void )
goto error;
}
if(H5Pset_external(dcpl, "ext1.bin", (off_t)0, size) < 0)
if(H5Pset_external(dcpl, EXT_FILE_NAME1, (off_t)0, size) < 0)
{
goto error;
}
if(H5Pset_external(dcpl, "ext2.bin", (off_t)0, size) < 0)
if(H5Pset_external(dcpl, EXT_FILE_NAME2, (off_t)0, size) < 0)
{
goto error;
}
@ -2617,6 +2627,3 @@ error:
}