[svn-r13871] Description:

    Fix problems with 'check-vfd' target, that were [mostly] introduced with
the recent "unique, but sharable" ISOHM optimization.

    The problems were mostly with using the 'core' VFD, so the
H5Pset_fapl_core() API call was changed to re-open existing files (therefore
operating more list the sec2, stdio, etc. VFDs).  This allows many more of
the tests to run using the 'core' VFD, so those were enabled also.

Tested on:
    Linux/64 2.6 (chicago2) w/check-vfd

1 files changed, 49 insertions, 62 deletions

diff --git a/test/mtime.c b/test/mtime.c
index 006e76b..a61bffa 100644
--- a/test/mtime.c
+++ b/test/mtime.c
@@ -66,77 +66,64 @@ main(void)
     H5G_stat_t	sb1, sb2;
     signed char	buf1[32], buf2[32];
     char	filename[1024];
-    const char  *envval = NULL;
+
     h5_reset();
     fapl = h5_fileaccess();
 
     TESTING("modification time messages");
-    envval = HDgetenv("HDF5_DRIVER");
-    if (envval == NULL) 
-        envval = "nomatch";
-    if (HDstrcmp(envval, "core")) {
-	/* Create the file, create a dataset, then close the file */
-	h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
-	if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0)
-	    TEST_ERROR;
-	if ((space=H5Screate_simple(1, size, NULL))<0) TEST_ERROR;
-	if ((dset=H5Dcreate(file, "dset", H5T_NATIVE_SCHAR, space, H5P_DEFAULT))<0)
-	    TEST_ERROR;
-	now = time(NULL);
-	if (H5Dclose(dset)<0) TEST_ERROR;
-	if (H5Sclose(space)<0) TEST_ERROR;
-	if (H5Fclose(file)<0) TEST_ERROR;
-
-	/*
-	    * Open the file and get the modification time. We'll test the new
-	    * H5Gget_objinfo() arguments too: being able to stat something without
-	    * knowing its name.
-	    */
-	h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
-	if ((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl))<0) TEST_ERROR;
-	if (H5Gget_objinfo(file, "dset", TRUE, &sb1)<0) TEST_ERROR;
-	if ((dset=H5Dopen(file, "dset"))<0) TEST_ERROR;
-	if (H5Gget_objinfo(dset, ".", TRUE, &sb2)<0) TEST_ERROR;
-	if (H5Dclose(dset)<0) TEST_ERROR;
-	if (H5Fclose(file)<0) TEST_ERROR;
-
-	/* Compare times from the two ways of calling H5Gget_objinfo() */
-	if (HDmemcmp(&sb1.objno, &sb2.objno, sizeof(sb1.objno)) || sb1.mtime!=sb2.mtime) {
-	    H5_FAILED();
-	    puts("    Calling H5Gget_objinfo() with the dataset ID returned");
-	    puts("    different values than calling it with a file and dataset");
-	    puts("    name.");
-	    goto error;
-	}
-
-	/* Compare times -- they must be within 60 seconds of one another */
-	if (0==sb1.mtime) {
-	    SKIPPED();
-	    puts("    The modification time could not be decoded on this OS.");
-	    puts("    Modification times will be mantained in the file but");
-	    puts("    cannot be queried on this system.  See H5O_mtime_decode().");
-	    return 0;
-	} else if (fabs(HDdifftime(now, sb1.mtime))>60.0) {
-	    H5_FAILED();
-	    tm = localtime(&(sb1.mtime));
-	    strftime((char*)buf1, sizeof buf1, "%Y-%m-%d %H:%M:%S", tm);
-	    tm = localtime(&now);
-	    strftime((char*)buf2, sizeof buf2, "%Y-%m-%d %H:%M:%S", tm);
-	    printf("    got: %s\n    ans: %s\n", buf1, buf2);
-	    goto error;
-	}
-	PASSED();
+
+    /* Create the file, create a dataset, then close the file */
+    h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
+    if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0)
+        TEST_ERROR;
+    if ((space=H5Screate_simple(1, size, NULL))<0) TEST_ERROR;
+    if ((dset=H5Dcreate(file, "dset", H5T_NATIVE_SCHAR, space, H5P_DEFAULT))<0)
+        TEST_ERROR;
+    now = time(NULL);
+    if (H5Dclose(dset)<0) TEST_ERROR;
+    if (H5Sclose(space)<0) TEST_ERROR;
+    if (H5Fclose(file)<0) TEST_ERROR;
+
+    /*
+        * Open the file and get the modification time. We'll test the new
+        * H5Gget_objinfo() arguments too: being able to stat something without
+        * knowing its name.
+        */
+    h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
+    if ((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl))<0) TEST_ERROR;
+    if (H5Gget_objinfo(file, "dset", TRUE, &sb1)<0) TEST_ERROR;
+    if ((dset=H5Dopen(file, "dset"))<0) TEST_ERROR;
+    if (H5Gget_objinfo(dset, ".", TRUE, &sb2)<0) TEST_ERROR;
+    if (H5Dclose(dset)<0) TEST_ERROR;
+    if (H5Fclose(file)<0) TEST_ERROR;
+
+    /* Compare times from the two ways of calling H5Gget_objinfo() */
+    if (HDmemcmp(&sb1.objno, &sb2.objno, sizeof(sb1.objno)) || sb1.mtime!=sb2.mtime) {
+        H5_FAILED();
+        puts("    Calling H5Gget_objinfo() with the dataset ID returned");
+        puts("    different values than calling it with a file and dataset");
+        puts("    name.");
+        goto error;
     }
-    else
-    {
+
+    /* Compare times -- they must be within 60 seconds of one another */
+    if (0==sb1.mtime) {
         SKIPPED();
-        puts("    Test not compatible with current Virtual File Driver");
+        puts("    The modification time could not be decoded on this OS.");
+        puts("    Modification times will be mantained in the file but");
+        puts("    cannot be queried on this system.  See H5O_mtime_decode().");
+        return 0;
+    } else if (fabs(HDdifftime(now, sb1.mtime))>60.0) {
+        H5_FAILED();
+        tm = localtime(&(sb1.mtime));
+        strftime((char*)buf1, sizeof buf1, "%Y-%m-%d %H:%M:%S", tm);
+        tm = localtime(&now);
+        strftime((char*)buf2, sizeof buf2, "%Y-%m-%d %H:%M:%S", tm);
+        printf("    got: %s\n    ans: %s\n", buf1, buf2);
+        goto error;
     }
 
 
-
-
-
     /* Check opening existing file with old-style modification time information
      * and make certain that the time is correct
      */