[svn-r27646] Add version number to VDS global heap object encoding.

Fix handling of layout version number.
Other minor fixes/cleanup.
NOTE: This commit changes the file format for VDS, all files must be
re-generated.

Tested: ummon

1 files changed, 7 insertions, 5 deletions

diff --git a/test/vds.c b/test/vds.c
index 5cdcef4..3e1bc18 100644
--- a/test/vds.c
+++ b/test/vds.c
@@ -386,8 +386,10 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl,
         if(oinfo.meta_size.obj.index_size != (hsize_t)0)
             TEST_ERROR
         if(config == TEST_API_REOPEN_FILE) {
-            if(oinfo.meta_size.obj.heap_size != exp_meta_size) { printf("%llu\n", (long long unsigned)oinfo.meta_size.obj.heap_size);
-                TEST_ERROR }
+            if(oinfo.meta_size.obj.heap_size != exp_meta_size) {
+                printf("VDS metadata size: %llu Expected: %llu\n", (long long unsigned)oinfo.meta_size.obj.heap_size, (long long unsigned)exp_meta_size);
+                TEST_ERROR
+            } /* end if */
         } /* end if */
         else
             if((oinfo.meta_size.obj.heap_size != exp_meta_size)
@@ -550,7 +552,7 @@ test_api(test_api_config_t config, hid_t fapl)
         TEST_ERROR
 
     /* Get examination DCPL */
-    if(test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)68) < 0)
+    if(test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)69) < 0)
         TEST_ERROR
 
     /* Test H5Pget_virtual_count */
@@ -621,7 +623,7 @@ test_api(test_api_config_t config, hid_t fapl)
         TEST_ERROR
 
     /* Get examination DCPL */
-    if(test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)212) < 0)
+    if(test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)213) < 0)
         TEST_ERROR
 
     /* Test H5Pget_virtual_count */
@@ -1028,7 +1030,7 @@ test_api(test_api_config_t config, hid_t fapl)
     } /* end if */
 
     /* Get examination DCPL */
-    if(test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)696) < 0)
+    if(test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)697) < 0)
         TEST_ERROR
 
     /* Test H5Pget_virtual_count */