summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-01-29 19:08:17 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-01-29 19:08:17 (GMT)
commit6d2a73d49f9010b5b4aabe72d771603863d41099 (patch)
tree6c40b53b91708c53a16eaf3d6602b92f57f7b31c /test
parentb3731e34096a2cc0d387db9ac0bb0a6a4808f652 (diff)
downloadhdf5-6d2a73d49f9010b5b4aabe72d771603863d41099.zip
hdf5-6d2a73d49f9010b5b4aabe72d771603863d41099.tar.gz
hdf5-6d2a73d49f9010b5b4aabe72d771603863d41099.tar.bz2
[svn-r16374] Description:
Bring r16372 back from trunk: Clean up files produced from set_extent testing. Tested on: FreeBSD/32 6.3 (duty) (too minor to require h5committest)
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am2
-rw-r--r--test/fillval.c2
-rw-r--r--test/set_extent.c19
3 files changed, 15 insertions, 8 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 2f22954..9549d8d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -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 \
diff --git a/test/fillval.c b/test/fillval.c
index 00e06ea..5bf5c03 100644
--- a/test/fillval.c
+++ b/test/fillval.c
@@ -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;
diff --git a/test/set_extent.c b/test/set_extent.c
index 47a6ce5..b16bbd0 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -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:
}
-
-
-