[svn-r12696] Purpose: Add Feature

Description: 
    Add a second test case to the serial flush tests.  This tests the case when the file is not flushed out to disk and verifies that it fails as expected.

Platforms:
    Linux (heping)

1 files changed, 73 insertions, 36 deletions

diff --git a/test/flush1.c b/test/flush1.c
index 1fd3ca7..f6c99c3 100644
--- a/test/flush1.c
+++ b/test/flush1.c
@@ -26,12 +26,73 @@
 
 const char *FILENAME[] = {
     "flush",
+    "noflush",
     NULL
 };
 
 static double	the_data[100][100];
 
-
+/*-------------------------------------------------------------------------
+ * Function:	create_file
+ *
+ * Purpose:	Creates file used in part 1 of the test
+ *
+ * Return:	Success:	0
+ *
+ *		Failure:	1
+ *
+ * Programmer:	Leon Arber
+ *              Sept. 26, 2006
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+hid_t create_file(char* name, hid_t fapl)
+{ 
+    hid_t	file, dcpl, space, dset, groups, grp;
+    hsize_t	ds_size[2] = {100, 100};
+    hsize_t	ch_size[2] = {5, 5};
+    hsize_t	i, j;
+
+    if ((file=H5Fcreate(name, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) goto error;
+
+    /* Create a chunked dataset */
+    if ((dcpl=H5Pcreate(H5P_DATASET_CREATE))<0) goto error;
+    if (H5Pset_chunk(dcpl, 2, ch_size)<0) goto error;
+    if ((space=H5Screate_simple(2, ds_size, NULL))<0) goto error;
+    if ((dset=H5Dcreate(file, "dset", H5T_NATIVE_FLOAT, space, H5P_DEFAULT))<0)
+	goto error;
+
+    /* Write some data */
+    for (i=0; i<ds_size[0]; i++) {
+	/*
+	 * The extra cast in the following statement is a bug workaround
+	 * for the Win32 version 5.0 compiler.
+	 * 1998-11-06 ptl
+	 */
+	for (j=0; j<ds_size[1]; j++) {
+	    the_data[i][j] = (double)(hssize_t)i/(hssize_t)(j+1);
+	}
+    }
+    if (H5Dwrite(dset, H5T_NATIVE_DOUBLE, space, space, H5P_DEFAULT,
+		the_data)<0) goto error;
+
+    /* Create some groups */
+    if ((groups=H5Gcreate(file, "some_groups", 0))<0) goto error;
+    for (i=0; i<100; i++) {
+	sprintf(name, "grp%02u", (unsigned)i);
+	if ((grp=H5Gcreate(groups, name, 0))<0) goto error;
+	if (H5Gclose(grp)<0) goto error;
+    }
+
+    return file;
+
+error:
+        HD_exit(1);
+
+}
+
 /*-------------------------------------------------------------------------
  * Function:	main
  *
@@ -45,16 +106,16 @@ static double	the_data[100][100];
  *              Friday, October 23, 1998
  *
  * Modifications:
+ * 		Leon Arber
+ * 		Sept. 26, 2006, expand test to check for failure if H5Fflush is not called.
+ * 		
  *
  *-------------------------------------------------------------------------
  */
 int
 main(void)
 {
-    hid_t	fapl, file, dcpl, space, dset, groups, grp;
-    hsize_t	ds_size[2] = {100, 100};
-    hsize_t	ch_size[2] = {5, 5};
-    hsize_t	i, j;
+    hid_t file, fapl;
     char	name[1024];
     const char  *envval = NULL;
 
@@ -68,39 +129,15 @@ main(void)
     if (HDstrcmp(envval, "split")) {
 	/* Create the file */
 	h5_fixname(FILENAME[0], fapl, name, sizeof name);
-	if ((file=H5Fcreate(name, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) goto error;
-
-	/* Create a chunked dataset */
-	if ((dcpl=H5Pcreate(H5P_DATASET_CREATE))<0) goto error;
-	if (H5Pset_chunk(dcpl, 2, ch_size)<0) goto error;
-	if ((space=H5Screate_simple(2, ds_size, NULL))<0) goto error;
-	if ((dset=H5Dcreate(file, "dset", H5T_NATIVE_FLOAT, space, H5P_DEFAULT))<0)
-	    goto error;
-
-	/* Write some data */
-	for (i=0; i<ds_size[0]; i++) {
-	    /*
-		* The extra cast in the following statement is a bug workaround
-		* for the Win32 version 5.0 compiler.
-		* 1998-11-06 ptl
-		*/
-	    for (j=0; j<ds_size[1]; j++) {
-		the_data[i][j] = (double)(hssize_t)i/(hssize_t)(j+1);
-	    }
-	}
-	if (H5Dwrite(dset, H5T_NATIVE_DOUBLE, space, space, H5P_DEFAULT,
-			the_data)<0) goto error;
-
-	/* Create some groups */
-	if ((groups=H5Gcreate(file, "some_groups", 0))<0) goto error;
-	for (i=0; i<100; i++) {
-	    sprintf(name, "grp%02u", (unsigned)i);
-	    if ((grp=H5Gcreate(groups, name, 0))<0) goto error;
-	    if (H5Gclose(grp)<0) goto error;
-	}
-
+	file = create_file(name, fapl);
 	/* Flush and exit without closing the library */
 	if (H5Fflush(file, H5F_SCOPE_GLOBAL)<0) goto error;
+
+	/* Create the other file which will not be flushed */
+	h5_fixname(FILENAME[1], fapl, name, sizeof name);
+	file = create_file(name, fapl);
+
+
 	PASSED();
 	fflush(stdout);
 	fflush(stderr);