summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Mainzer <mainzer@hdfgroup.org>2007-04-24 10:51:12 (GMT)
committerJohn Mainzer <mainzer@hdfgroup.org>2007-04-24 10:51:12 (GMT)
commit30b6c4bcc12140967bf1f9e71fc326019db4c921 (patch)
treefdfa180938e091e01f31b4f01ec0bf70ae2dd9f9
parent2ac5e9f2e8c432b681d63f1ea1e35e6509fa74ab (diff)
downloadhdf5-30b6c4bcc12140967bf1f9e71fc326019db4c921.zip
hdf5-30b6c4bcc12140967bf1f9e71fc326019db4c921.tar.gz
hdf5-30b6c4bcc12140967bf1f9e71fc326019db4c921.tar.bz2
[svn-r13697] Fixed error in check_unprotect_ro_dirty_err() in cache.c. Basic problem
was a failure to clean up properly after a test. I reproduced the failure on Phoenix before fixing it. As the error was relatively straight forward, I tested fix on Phoenix only.
-rw-r--r--test/cache.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/test/cache.c b/test/cache.c
index 7105cce..b4caa68 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -15650,7 +15650,6 @@ check_unprotect_ro_dirty_err(void)
* -- should succeed.
*/
-#ifdef QAK
if ( pass ) {
reset_entries();
@@ -15669,8 +15668,6 @@ check_unprotect_ro_dirty_err(void)
entry_ptr->addr, (void *)entry_ptr,
H5C__DIRTIED_FLAG, (size_t)0);
- entry_ptr->is_dirty = TRUE;
-
if ( result >= 0 ) {
pass = FALSE;
@@ -15681,9 +15678,14 @@ check_unprotect_ro_dirty_err(void)
if ( pass ) {
+ unprotect_entry(cache_ptr, 0, 0, FALSE, H5C__NO_FLAGS_SET);
+
+ }
+
+ if ( pass ) {
+
takedown_cache(cache_ptr, FALSE, FALSE);
}
-#endif /* QAK */
/* allocate a another cache, protect an entry read only twice, and
* then unprotect it with the dirtied flag set. This should fail.