summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2003-05-05 22:04:14 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2003-05-05 22:04:14 (GMT)
commit1d06baa334bffeabf4aaa7ff7cccf73be514d7b1 (patch)
tree4ae563dec7665a57c142084801ab94edeb299118
parent117444cc2547ea3a4c7b8cb5042c4c186283edc5 (diff)
downloadhdf5-1d06baa334bffeabf4aaa7ff7cccf73be514d7b1.zip
hdf5-1d06baa334bffeabf4aaa7ff7cccf73be514d7b1.tar.gz
hdf5-1d06baa334bffeabf4aaa7ff7cccf73be514d7b1.tar.bz2
[svn-r6798] Purpose:
code warrior port Description: added a flag H5_NO_SHARED_WRITING, it is defined only for CW in the H5pubconf.h this avoids doing some tests for CW that fail on shared writing Solution: Platforms tested: windows (cw and ms) Linux 2.4 (rockaway) SunOS 5.7 (arabica) IRIX 6.5 (modi4) Misc. update:
-rw-r--r--test/dsets.c8
-rw-r--r--test/getname.c17
-rw-r--r--test/tfile.c4
3 files changed, 22 insertions, 7 deletions
diff --git a/test/dsets.c b/test/dsets.c
index 24ed910..c1d8fb8 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -2814,7 +2814,9 @@ main(void)
if (H5Gclose (grp)<0) goto error;
nerrors += test_create(file)<0 ?1:0;
+#ifndef H5_NO_SHARED_WRITING
nerrors += test_simple_io(file, filename)<0 ?1:0;
+#endif /* H5_NO_SHARED_WRITING */
nerrors += test_compact_io(fapl)<0 ?1:0;
nerrors += test_max_compact(fapl)<0 ?1:0;
nerrors += test_tconv(file)<0 ?1:0;
@@ -2822,11 +2824,15 @@ main(void)
nerrors += test_onebyte_shuffle(file)<0 ?1:0;
nerrors += test_multiopen (file)<0 ?1:0;
nerrors += test_types(file)<0 ?1:0;
+#ifndef H5_NO_SHARED_WRITING
nerrors += test_userblock_offset(fapl)<0 ?1:0;
+#endif /* H5_NO_SHARED_WRITING */
nerrors += test_missing_filter(file)<0 ?1:0;
#ifndef H5_WANT_H5_V1_4_COMPAT
nerrors += test_can_apply(file)<0 ?1:0;
- nerrors += test_set_local(filename,fapl)<0 ?1:0;
+#ifndef H5_NO_SHARED_WRITING
+ nerrors += test_set_local(filename,fapl)<0 ?1:0;
+#endif /* H5_NO_SHARED_WRITING */
#endif /* H5_WANT_H5_V1_4_COMPAT */
nerrors += test_can_apply_szip(file)<0 ?1:0;
diff --git a/test/getname.c b/test/getname.c
index 07cbff7..9817d9e 100644
--- a/test/getname.c
+++ b/test/getname.c
@@ -834,6 +834,7 @@ int main( void )
PASSED();
+#ifndef H5_NO_SHARED_WRITING
/*-------------------------------------------------------------------------
* Test H5Iget_name with H5Fmount; long name
@@ -1141,6 +1142,7 @@ int main( void )
PASSED();
+#endif /* H5_NO_SHARED_WRITING */
/*-------------------------------------------------------------------------
@@ -1314,7 +1316,7 @@ int main( void )
TESTING("H5Iget_name with a small buffer for name");
/* Reopen the group */
- if ((group_id = H5Gopen( file_id, "/g15" ))<0) goto out;
+ if ((group_id = H5Gopen( file_id, "/g17" ))<0) goto out;
/* Get name */
name_len=H5Iget_name( group_id, name2, size2 );
@@ -1324,7 +1326,7 @@ int main( void )
name_len=H5Iget_name( group_id, name, size );
/* Verify */
- if (check_name( name, "/g15" )!=0) goto out;
+ if (check_name( name, "/g17" )!=0) goto out;
/* Close */
H5Gclose( group_id );
@@ -1340,7 +1342,7 @@ int main( void )
TESTING("H5Iget_name with a dynamic buffer for name");
/* Reopen the group */
- if ((group_id = H5Gopen( file_id, "/g15" ))<0) goto out;
+ if ((group_id = H5Gopen( file_id, "/g17" ))<0) goto out;
/* Get name */
name_len=H5Iget_name( group_id, NULL, size );
@@ -1352,7 +1354,7 @@ int main( void )
if (H5Iget_name( group_id, name3, name_len+1 )<0) goto out;
/* Verify */
- if (check_name( name3, "/g15" )!=0)
+ if (check_name( name3, "/g17" )!=0)
goto out;
/* Get name */
@@ -1406,6 +1408,7 @@ int main( void )
PASSED();
+#ifndef H5_NO_SHARED_WRITING
/*-------------------------------------------------------------------------
* Test H5Iget_name with added names with mounting
@@ -1470,7 +1473,7 @@ int main( void )
PASSED();
-
+
/*-------------------------------------------------------------------------
* Test H5Iget_name with H5Fclose
@@ -1508,7 +1511,6 @@ int main( void )
PASSED();
-
/*-------------------------------------------------------------------------
* Test H5Iget_name with H5Fmount and H5Gunlink
*-------------------------------------------------------------------------
@@ -1719,6 +1721,7 @@ int main( void )
PASSED();
+#endif /* H5_NO_SHARED_WRITING */
/*-------------------------------------------------------------------------
@@ -2084,6 +2087,7 @@ int main( void )
PASSED();
+#ifndef H5_NO_SHARED_WRITING
/*-------------------------------------------------------------------------
* Test H5Iget_name with several nested mounted files
@@ -2864,6 +2868,7 @@ int main( void )
PASSED();
+#endif /* H5_NO_SHARED_WRITING */
/*-------------------------------------------------------------------------
diff --git a/test/tfile.c b/test/tfile.c
index cac159a..1629057 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -915,14 +915,18 @@ test_obj_count_and_id(hid_t fid1, hid_t fid2, hid_t did, hid_t gid1,
void
test_file(void)
{
+#ifndef H5_NO_SHARED_WRITING
+
/* Output message about test being performed */
MESSAGE(5, ("Testing Low-Level File I/O\n"));
test_file_create(); /* Test file creation(also creation templates)*/
test_file_open(); /* Test file opening */
test_file_close(); /* Test file close behavior */
+#endif /* H5_NO_SHARED_WRITING */
} /* test_file() */
+
/*-------------------------------------------------------------------------
* Function: cleanup_file