summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/getname.c23
-rw-r--r--test/tfile.c2
2 files changed, 15 insertions, 10 deletions
diff --git a/test/getname.c b/test/getname.c
index 4c07d49..d049419 100644
--- a/test/getname.c
+++ b/test/getname.c
@@ -21,7 +21,8 @@
#include "hdf5.h"
#include "h5test.h"
-
+
+
/* Compound datatype */
typedef struct s1_t {
unsigned int a;
@@ -55,10 +56,10 @@ static int check_name( char *name, const char* check )
int main( void )
{
- char filename0[1024];
- char filename1[1024];
- char filename2[1024];
- char filename3[1024];
+ char filename0[1024];
+ char filename1[1024];
+ char filename2[1024];
+ char filename3[1024];
hid_t fapl;
hid_t file_id, file1_id, file2_id, file3_id;
hid_t group_id, group2_id, group3_id, group4_id, group5_id, group6_id, group7_id;
@@ -825,6 +826,8 @@ int main( void )
/* Verify */
if (check_name( name, "/g12/d" )!=0) goto out;
+
+ if (H5Funmount(file_id, "/g12")<0) goto out;
/* Close */
H5Dclose( dataset_id );
@@ -834,6 +837,7 @@ int main( void )
PASSED();
+
/*-------------------------------------------------------------------------
* Test H5Iget_name with H5Fmount; long name
*-------------------------------------------------------------------------
@@ -1712,8 +1716,7 @@ int main( void )
H5Fclose( file2_id );
PASSED();
-
-
+
/*-------------------------------------------------------------------------
* Test H5Iget_name with H5Glink hard
*-------------------------------------------------------------------------
@@ -2076,7 +2079,6 @@ int main( void )
H5Gclose( group3_id );
PASSED();
-
/*-------------------------------------------------------------------------
* Test H5Iget_name with several nested mounted files
@@ -2742,6 +2744,8 @@ int main( void )
/* Close group in mounted file */
H5Gclose( group5_id );
+ if (H5Funmount(file_id, "/g36/g1")<0) goto out;
+
/* Close */
H5Gclose( group_id );
H5Gclose( group2_id );
@@ -2754,7 +2758,7 @@ int main( void )
/*-------------------------------------------------------------------------
- * Test H5Iget_name with mounting already mounted file
+ * Test H5Iget_name with mounting already mounted files
*-------------------------------------------------------------------------
*/
@@ -2857,7 +2861,6 @@ int main( void )
PASSED();
-
/*-------------------------------------------------------------------------
* end tests
*-------------------------------------------------------------------------
diff --git a/test/tfile.c b/test/tfile.c
index cac159a..d9cd9bf 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -920,7 +920,9 @@ test_file(void)
test_file_create(); /* Test file creation(also creation templates)*/
test_file_open(); /* Test file opening */
+#ifndef H5_NO_SHARED_WRITING
test_file_close(); /* Test file close behavior */
+#endif /* H5_NO_SHARED_WRITING */
} /* test_file() */