[svn-r20859] Issue 2599 - Cross-test BE and LE data. I added the test for deflate, szip, fletcher32, shuffle and nbit filter in cross_read.c and gen_cross.c. I also took out the data file for OpenVMS because the data isn't native but IEEE for floating-numbers.

Tested on jam and linew.  But I tested the same change to the trunk with h5committest.

1 files changed, 203 insertions, 738 deletions

diff --git a/test/cross_read.c b/test/cross_read.c
index 7d3cfd4..308a0c1 100755
--- a/test/cross_read.c
+++ b/test/cross_read.c
@@ -17,7 +17,7 @@
  * Programmer:  Raymond Lu <slu@ncsa.uiuc.edu>
  *              Thursday, March 23, 2006
  *
- * Purpose:     Check if floating-point data created on OpenVMS, big-endian, and
+ * Purpose:     Check if floating-point data created on big-endian and
  *              little-endian machines can be read on the machine running this test.
  */
 
@@ -31,7 +31,8 @@ const char *FILENAME[] = {
     NULL
 };
 
-#define DATASETNAME        "Array"
+#define DATASETNAME        "Array_le"
+#define DATASETNAME1       "Array_be"
 #define DATASETNAME2       "Scale_offset_float_data_le"
 #define DATASETNAME3       "Scale_offset_float_data_be"
 #define DATASETNAME4       "Scale_offset_double_data_le"
@@ -44,103 +45,112 @@ const char *FILENAME[] = {
 #define DATASETNAME11      "Scale_offset_int_data_be"
 #define DATASETNAME12      "Scale_offset_long_long_data_le"
 #define DATASETNAME13      "Scale_offset_long_long_data_be"
+
+#define DATASETNAME14      "Fletcher_float_data_le"
+#define DATASETNAME15      "Fletcher_float_data_be"
+#define DATASETNAME16      "Deflate_float_data_le"
+#define DATASETNAME17      "Deflate_float_data_be"
+#define DATASETNAME18      "Szip_float_data_le"
+#define DATASETNAME19      "Szip_float_data_be"
+#define DATASETNAME20      "Shuffle_float_data_le"
+#define DATASETNAME21      "Shuffle_float_data_be"
+#define DATASETNAME22      "Nbit_float_data_le"
+#define DATASETNAME23      "Nbit_float_data_be"
+
 #define NX 		6
 #define NY 		6
 
 
 /*-------------------------------------------------------------------------
- * Function:    read_data
+ * Function:    open_dataset
  *
- * Purpose:     Read data from a data file.
+ * Purpose:     Read and compare the data from a dataset.
  *
  * Return:      Success:        0
- *              Failure:        -1
+ *              Failure:        1
  *
  * Programmer:  Raymond Lu
- *              21 January 2011
+ *              17 May 2011
  *
  * Modifications:
  *
  *-------------------------------------------------------------------------
  */
-static int read_data(char *fname)
+static int check_data(const char *dsetname, hid_t fid, hbool_t floating_number)
 {
-    char        pathname[1024];
-    char       *srcdir = getenv("srcdir"); /*where the src code is located*/
-    hid_t       file, dataset;         /* handles */
+    hid_t       dataset;         /* handles */
     double      data_in[NX+1][NY]; /* input buffer */
     double      data_out[NX+1][NY]; /* output buffer */
     long long   int_data_in[NX+1][NY]; /* input buffer */
     long long   int_data_out[NX+1][NY]; /* output buffer */
     int         i, j;
     unsigned 	nerrors = 0;
-    const char  *not_supported= "    Scaleoffset filter is not enabled.";
-
-    pathname[0] = '\0';
-    /* Generate correct name for test file by prepending the source path */
-    if(srcdir && ((strlen(srcdir) + strlen(fname) + 1) < sizeof(pathname))) {
-        strcpy(pathname, srcdir);
-        strcat(pathname, "/");
-    }
-    strcat(pathname, fname);
-
-    /*
-     * Open the file.
-     */
-    if((file = H5Fopen(pathname, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
-        TEST_ERROR;
-
-    TESTING("regular dataset");
 
     /* 
      * Open the regular dataset.
      */
-    if((dataset = H5Dopen2(file, DATASETNAME, H5P_DEFAULT)) < 0)
+    if((dataset = H5Dopen2(fid, dsetname, H5P_DEFAULT)) < 0)
         TEST_ERROR;
 
     /*
      * Data and output buffer initialization.
      */
     for (j = 0; j < NX; j++) {
-	for (i = 0; i < NY; i++) {
-	    data_in[j][i] = i + j;
-	    data_out[j][i] = 0;
+        for (i = 0; i < NY; i++) {
+            data_in[j][i] = ((double)(i + j + 1))/3;
+            data_out[j][i] = 0;
+
+            int_data_in[j][i] = i + j;
+            int_data_out[j][i] = 0;
         }
     }
     for (i = 0; i < NY; i++) {
         data_in[NX][i] = -2.2;
         data_out[NX][i] = 0;
+
+        int_data_in[NX][i] = -2;
+        int_data_out[NX][i] = 0;
     }
-    /*
-     * 0 1 2 3 4 5
-     * 1 2 3 4 5 6
-     * 2 3 4 5 6 7
-     * 3 4 5 6 7 8
-     * 4 5 6 7 8 9
-     * 5 6 7 8 9 10
-     * -2.2 -2.2 -2.2 -2.2 -2.2 -2.2
-     */
 
     /*
      * Read data from hyperslab in the file into the hyperslab in
      * memory and display.
      */
-    if(H5Dread(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
-            data_out) < 0)
-        TEST_ERROR;
-
-    /* Check results */
-    for (j=0; j<(NX+1); j++) {
-        for (i=0; i<NY; i++) {
-            /* if (data_out[j][i] != data_in[j][i]) { */
-            if (!FLT_ABS_EQUAL(data_out[j][i], data_in[j][i])) {
-                if (!nerrors++) {
-                    H5_FAILED();
-                    printf("element [%d][%d] is %g but should have been %g\n",
-                           j, i, data_out[j][i], data_in[j][i]);
-                }
-            }
-        }
+    if(floating_number) {
+	if(H5Dread(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+		data_out) < 0)
+	    TEST_ERROR;
+
+	/* Check results */
+	for (j=0; j<(NX+1); j++) {
+	    for (i=0; i<NY; i++) {
+		if (!DBL_REL_EQUAL(data_out[j][i], data_in[j][i], 0.001)) {
+		    if (!nerrors++) {
+			H5_FAILED();
+			printf("element [%d][%d] is %g but should have been %g\n",
+			       j, i, data_out[j][i], data_in[j][i]);
+		    }
+		}
+	    }
+	}
+    } else {
+	if(H5Dread(dataset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+		int_data_out) < 0)
+	    TEST_ERROR;
+
+	/* Check results */
+	for (j=0; j<(NX+1); j++) {
+	    for (i=0; i<NY; i++) {
+		if (int_data_out[j][i] != int_data_in[j][i]) {
+		    if (!nerrors++) {
+			H5_FAILED();
+			printf("element [%d][%d] is %d but should have been %d\n",
+			       j, i, (int)int_data_out[j][i],
+			       (int)int_data_in[j][i]);
+		    }
+		}
+	    }
+	}
     }
 
     /*
@@ -156,766 +166,225 @@ static int read_data(char *fname)
     }
 
     PASSED();
+    return 0;
 
-    TESTING("dataset of LE FLOAT with scale-offset filter");
-
-#ifdef H5_HAVE_FILTER_SCALEOFFSET
-    /*
-     * Open the dataset with scale-offset filter.
-     */
-    if((dataset = H5Dopen2(file, DATASETNAME2, H5P_DEFAULT)) < 0)
-        TEST_ERROR;
+error:
+    H5E_BEGIN_TRY {
+        H5Dclose(dataset);
+    } H5E_END_TRY;
+    return 1;
+}
 
-    /*
-     * Data and output buffer initialization.
-     */
-    for (j = 0; j < NX; j++) {
-        for (i = 0; i < NY; i++) {
-            data_in[j][i] = ((double)(i + j + 1))/3;
-            data_out[j][i] = 0;
-        }
-    }
-    for (i = 0; i < NY; i++) {
-        data_in[NX][i] = -2.2;
-        data_out[NX][i] = 0;
-    }
+
+/*-------------------------------------------------------------------------
+ * Function:    open_dataset
+ *
+ * Purpose:     Handle each dataset from the data file.
+ *
+ * Return:      Success:        0
+ *              Failure:        Number of failures 
+ *
+ * Programmer:  Raymond Lu
+ *              21 January 2011
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static int open_dataset(char *fname)
+{
+    const char *pathname = H5_get_srcdir_filename(fname); /* Corrected test file name */
+    hid_t       file;         /* handles */
+    unsigned 	nerrors = 0;
+    const char  *not_supported= "    filter is not enabled.";
 
     /*
-     * Read data from hyperslab in the file into the hyperslab in
-     * memory and display.
+     * Open the file.
      */
-    if(H5Dread(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
-            data_out) < 0)
+    if((file = H5Fopen(pathname, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR;
 
-    /* Check results */
-    for (j=0; j<(NX+1); j++) {
-        for (i=0; i<NY; i++) {
-            if (!DBL_REL_EQUAL(data_out[j][i], data_in[j][i], 0.001)) {
-                if (!nerrors++) {
-                    H5_FAILED();
-                    printf("element [%d][%d] is %g but should have been %g\n",
-                           j, i, data_out[j][i], data_in[j][i]);
-                }
-            }
-        }
-    }
-
-    /*
-     * Close/release resources.
-     */
-    if(H5Dclose(dataset) < 0)
-        TEST_ERROR
+    TESTING("regular dataset of LE DOUBLE");
+    nerrors += check_data(DATASETNAME, file, TRUE);
 
-    /* Failure */
-    if (nerrors) {
-        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
-        return 1;
-    }
+    TESTING("regular dataset of BE DOUBLE");
+    nerrors += check_data(DATASETNAME1, file, TRUE);
 
-    PASSED();
+    TESTING("dataset of LE FLOAT with scale-offset filter");
+#ifdef H5_HAVE_FILTER_SCALEOFFSET
+    nerrors += check_data(DATASETNAME2, file, TRUE);
 #else /*H5_HAVE_FILTER_SCALEOFFSET*/
     SKIPPED();
     puts(not_supported);
 #endif /*H5_HAVE_FILTER_SCALEOFFSET*/
-
+ 
     TESTING("dataset of BE FLOAT with scale-offset filter");
-
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
-    /*
-     * Open the dataset with scale-offset filter.
-     */
-    if((dataset = H5Dopen2(file, DATASETNAME3, H5P_DEFAULT)) < 0)
-        TEST_ERROR;
-
-    /*
-     * Data and output buffer initialization.
-     */
-    for (j = 0; j < NX; j++) {
-        for (i = 0; i < NY; i++) {
-            data_in[j][i] = ((double)(i + j + 1))/3;
-            data_out[j][i] = 0;
-        }
-    }
-    for (i = 0; i < NY; i++) {
-        data_in[NX][i] = -2.2;
-        data_out[NX][i] = 0;
-    }
-
-    /*
-     * Read data from hyperslab in the file into the hyperslab in
-     * memory and display.
-     */
-    if(H5Dread(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
-            data_out) < 0)
-        TEST_ERROR;
-
-    /* Check results */
-    for (j=0; j<(NX+1); j++) {
-        for (i=0; i<NY; i++) {
-            if (!DBL_REL_EQUAL(data_out[j][i], data_in[j][i], 0.001)) {
-                if (!nerrors++) {
-                    H5_FAILED();
-                    printf("element [%d][%d] is %g but should have been %g\n",
-                           j, i, data_out[j][i], data_in[j][i]);
-                }
-            }
-        }
-    }
-
-    /*
-     * Close/release resources.
-     */
-    if(H5Dclose(dataset) < 0)
-        TEST_ERROR
-
-    /* Failure */
-    if (nerrors) {
-        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
-        return 1;
-    }
-
-    PASSED();
+    nerrors += check_data(DATASETNAME3, file, TRUE);
 #else /*H5_HAVE_FILTER_SCALEOFFSET*/
     SKIPPED();
     puts(not_supported);
 #endif /*H5_HAVE_FILTER_SCALEOFFSET*/
 
     TESTING("dataset of LE DOUBLE with scale-offset filter");
-
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
-    /* 
-     * Open the dataset with scale-offset filter.
-     */
-    if((dataset = H5Dopen2(file, DATASETNAME4, H5P_DEFAULT)) < 0)
-        TEST_ERROR;
-
-    /*
-     * Data and output buffer initialization.
-     */
-    for (j = 0; j < NX; j++) {
-	for (i = 0; i < NY; i++) {
-	    data_in[j][i] = ((double)(i + j + 1))/3;
-	    data_out[j][i] = 0;
-        }
-    }
-    for (i = 0; i < NY; i++) {
-        data_in[NX][i] = -2.2;
-        data_out[NX][i] = 0;
-    }
-
-    /*
-     * Read data from hyperslab in the file into the hyperslab in
-     * memory and display.
-     */
-    if(H5Dread(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
-            data_out) < 0)
-        TEST_ERROR;
-
-    /* Check results */
-    for (j=0; j<(NX+1); j++) {
-        for (i=0; i<NY; i++) {
-            if (!DBL_REL_EQUAL(data_out[j][i], data_in[j][i], 0.001)) {
-                if (!nerrors++) {
-                    H5_FAILED();
-                    printf("element [%d][%d] is %g but should have been %g\n",
-                           j, i, data_out[j][i], data_in[j][i]);
-                }
-            }
-        }
-    }
-
-    /*
-     * Close/release resources.
-     */
-    if(H5Dclose(dataset) < 0)
-        TEST_ERROR
-
-    /* Failure */
-    if (nerrors) {
-        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
-        return 1;
-    }
-
-    PASSED();
+    nerrors += check_data(DATASETNAME4, file, TRUE);
 #else /*H5_HAVE_FILTER_SCALEOFFSET*/
     SKIPPED();
     puts(not_supported);
 #endif /*H5_HAVE_FILTER_SCALEOFFSET*/
-
+ 
     TESTING("dataset of BE DOUBLE with scale-offset filter");
-
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
-    /*
-     * Open the dataset with scale-offset filter.
-     */
-    if((dataset = H5Dopen2(file, DATASETNAME5, H5P_DEFAULT)) < 0)
-        TEST_ERROR;
-
-    /*
-     * Data and output buffer initialization.
-     */
-    for (j = 0; j < NX; j++) {
-        for (i = 0; i < NY; i++) {
-            data_in[j][i] = ((double)(i + j + 1))/3;
-            data_out[j][i] = 0;
-        }
-    }
-    for (i = 0; i < NY; i++) {
-        data_in[NX][i] = -2.2;
-        data_out[NX][i] = 0;
-    }
-
-    /*
-     * Read data from hyperslab in the file into the hyperslab in
-     * memory and display.
-     */
-    if(H5Dread(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
-            data_out) < 0)
-        TEST_ERROR;
-
-    /* Check results */
-    for (j=0; j<(NX+1); j++) {
-        for (i=0; i<NY; i++) {
-            if (!DBL_REL_EQUAL(data_out[j][i], data_in[j][i], 0.001)) {
-                if (!nerrors++) {
-                    H5_FAILED();
-                    printf("element [%d][%d] is %g but should have been %g\n",
-                           j, i, data_out[j][i], data_in[j][i]);
-                }
-            }
-        }
-    }
-
-    /*
-     * Close/release resources.
-     */
-    if(H5Dclose(dataset) < 0)
-        TEST_ERROR
-
-    /* Failure */
-    if (nerrors) {
-        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
-        return 1;
-    }
-
-    PASSED();
+    nerrors += check_data(DATASETNAME5, file, TRUE);
 #else /*H5_HAVE_FILTER_SCALEOFFSET*/
     SKIPPED();
     puts(not_supported);
 #endif /*H5_HAVE_FILTER_SCALEOFFSET*/
-
+ 
     TESTING("dataset of LE CHAR with scale-offset filter");
-
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
-    /*
-     * Open the dataset with scale-offset filter.
-     */
-    if((dataset = H5Dopen2(file, DATASETNAME6, H5P_DEFAULT)) < 0)
-        TEST_ERROR;
-
-    /*
-     * Data and output buffer initialization.
-     */
-    for (j = 0; j < NX; j++) {
-        for (i = 0; i < NY; i++) {
-            int_data_in[j][i] = i + j;
-            int_data_out[j][i] = 0;
-        }
-    }
-    for (i = 0; i < NY; i++) {
-        int_data_in[NX][i] = -2;
-        int_data_out[NX][i] = 0;
-    }
-
-    /*
-     * Read data from hyperslab in the file into the hyperslab in
-     * memory and display.
-     */
-    if(H5Dread(dataset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT,
-            int_data_out) < 0)
-        TEST_ERROR;
-
-    /* Check results */
-    for (j=0; j<(NX+1); j++) {
-        for (i=0; i<NY; i++) {
-            if (int_data_out[j][i] != int_data_in[j][i]) {
-                if (!nerrors++) {
-                    H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been %d\n",
-                           j, i, (int)int_data_out[j][i],
-                           (int)int_data_in[j][i]);
-                }
-            }
-        }
-    }
-
-    /*
-     * Close/release resources.
-     */
-    if(H5Dclose(dataset) < 0)
-        TEST_ERROR
-
-    /* Failure */
-    if (nerrors) {
-        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
-        return 1;
-    }
-
-    PASSED();
-
+    nerrors += check_data(DATASETNAME6, file, FALSE);
 #else /*H5_HAVE_FILTER_SCALEOFFSET*/
     SKIPPED();
     puts(not_supported);
 #endif /*H5_HAVE_FILTER_SCALEOFFSET*/
-
+ 
     TESTING("dataset of BE CHAR with scale-offset filter");
-
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
-    /*
-     * Open the dataset with scale-offset filter.
-     */
-    if((dataset = H5Dopen2(file, DATASETNAME7, H5P_DEFAULT)) < 0)
-        TEST_ERROR;
-
-    /*
-     * Data and output buffer initialization.
-     */
-    for (j = 0; j < NX; j++) {
-        for (i = 0; i < NY; i++) {
-            int_data_in[j][i] = i + j;
-            int_data_out[j][i] = 0;
-        }
-    }
-    for (i = 0; i < NY; i++) {
-        int_data_in[NX][i] = -2;
-        int_data_out[NX][i] = 0;
-    }
-
-    /*
-     * Read data from hyperslab in the file into the hyperslab in
-     * memory and display.
-     */
-    if(H5Dread(dataset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT,
-            int_data_out) < 0)
-        TEST_ERROR;
-
-    /* Check results */
-    for (j=0; j<(NX+1); j++) {
-        for (i=0; i<NY; i++) {
-            if (int_data_out[j][i] != int_data_in[j][i]) {
-                if (!nerrors++) {
-                    H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been %d\n",
-                           j, i, (int)int_data_out[j][i],
-                           (int)int_data_in[j][i]);
-                }
-            }
-        }
-    }
-
-    /*
-     * Close/release resources.
-     */
-    if(H5Dclose(dataset) < 0)
-        TEST_ERROR
-
-    /* Failure */
-    if (nerrors) {
-        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
-        return 1;
-    }
-
-    PASSED();
-
+    nerrors += check_data(DATASETNAME7, file, FALSE);
 #else /*H5_HAVE_FILTER_SCALEOFFSET*/
     SKIPPED();
     puts(not_supported);
 #endif /*H5_HAVE_FILTER_SCALEOFFSET*/
-
+ 
     TESTING("dataset of LE SHORT with scale-offset filter");
-
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
-    /*
-     * Open the dataset with scale-offset filter.
-     */
-    if((dataset = H5Dopen2(file, DATASETNAME8, H5P_DEFAULT)) < 0)
-        TEST_ERROR;
-
-    /*
-     * Data and output buffer initialization.
-     */
-    for (j = 0; j < NX; j++) {
-        for (i = 0; i < NY; i++) {
-            int_data_in[j][i] = i + j;
-            int_data_out[j][i] = 0;
-        }
-    }
-    for (i = 0; i < NY; i++) {
-        int_data_in[NX][i] = -2;
-        int_data_out[NX][i] = 0;
-    }
-
-    /*
-     * Read data from hyperslab in the file into the hyperslab in
-     * memory and display.
-     */
-    if(H5Dread(dataset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT,
-            int_data_out) < 0)
-        TEST_ERROR;
-
-    /* Check results */
-    for (j=0; j<(NX+1); j++) {
-        for (i=0; i<NY; i++) {
-            if (int_data_out[j][i] != int_data_in[j][i]) {
-                if (!nerrors++) {
-                    H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been %d\n",
-                           j, i, (int)int_data_out[j][i],
-                           (int)int_data_in[j][i]);
-                }
-            }
-        }
-    }
-
-    /*
-     * Close/release resources.
-     */
-    if(H5Dclose(dataset) < 0)
-        TEST_ERROR
-
-    /* Failure */
-    if (nerrors) {
-        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
-        return 1;
-    }
-
-    PASSED();
-
+    nerrors += check_data(DATASETNAME8, file, FALSE);
 #else /*H5_HAVE_FILTER_SCALEOFFSET*/
     SKIPPED();
     puts(not_supported);
 #endif /*H5_HAVE_FILTER_SCALEOFFSET*/
-
+ 
     TESTING("dataset of BE SHORT with scale-offset filter");
-
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
-    /*
-     * Open the dataset with scale-offset filter.
-     */
-    if((dataset = H5Dopen2(file, DATASETNAME9, H5P_DEFAULT)) < 0)
-        TEST_ERROR;
-
-    /*
-     * Data and output buffer initialization.
-     */
-    for (j = 0; j < NX; j++) {
-        for (i = 0; i < NY; i++) {
-            int_data_in[j][i] = i + j;
-            int_data_out[j][i] = 0;
-        }
-    }
-    for (i = 0; i < NY; i++) {
-        int_data_in[NX][i] = -2;
-        int_data_out[NX][i] = 0;
-    }
-
-    /*
-     * Read data from hyperslab in the file into the hyperslab in
-     * memory and display.
-     */
-    if(H5Dread(dataset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT,
-            int_data_out) < 0)
-        TEST_ERROR;
-
-    /* Check results */
-    for (j=0; j<(NX+1); j++) {
-        for (i=0; i<NY; i++) {
-            if (int_data_out[j][i] != int_data_in[j][i]) {
-                if (!nerrors++) {
-                    H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been %d\n",
-                           j, i, (int)int_data_out[j][i],
-                           (int)int_data_in[j][i]);
-                }
-            }
-        }
-    }
-
-    /*
-     * Close/release resources.
-     */
-    if(H5Dclose(dataset) < 0)
-        TEST_ERROR
-
-    /* Failure */
-    if (nerrors) {
-        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
-        return 1;
-    }
-
-    PASSED();
-
+    nerrors += check_data(DATASETNAME9, file, FALSE);
 #else /*H5_HAVE_FILTER_SCALEOFFSET*/
     SKIPPED();
     puts(not_supported);
 #endif /*H5_HAVE_FILTER_SCALEOFFSET*/
 
     TESTING("dataset of LE INT with scale-offset filter");
-
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
-    /* 
-     * Open the dataset with scale-offset filter.
-     */
-    if((dataset = H5Dopen2(file, DATASETNAME10, H5P_DEFAULT)) < 0)
-        TEST_ERROR;
-
-    /*
-     * Data and output buffer initialization.
-     */
-    for (j = 0; j < NX; j++) {
-	for (i = 0; i < NY; i++) {
-	    int_data_in[j][i] = i + j;
-	    int_data_out[j][i] = 0;
-        }
-    }
-    for (i = 0; i < NY; i++) {
-        int_data_in[NX][i] = -2;
-        int_data_out[NX][i] = 0;
-    }
-
-    /*
-     * Read data from hyperslab in the file into the hyperslab in
-     * memory and display.
-     */
-    if(H5Dread(dataset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT,
-            int_data_out) < 0)
-        TEST_ERROR;
-
-    /* Check results */
-    for (j=0; j<(NX+1); j++) {
-        for (i=0; i<NY; i++) {
-            if (int_data_out[j][i] != int_data_in[j][i]) {
-                if (!nerrors++) {
-                    H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been %d\n",
-                           j, i, (int)int_data_out[j][i],
-                           (int)int_data_in[j][i]);
-                }
-            }
-        }
-    }
-
-    /*
-     * Close/release resources.
-     */
-    if(H5Dclose(dataset) < 0)
-        TEST_ERROR
-
-    /* Failure */
-    if (nerrors) {
-        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
-        return 1;
-    }
-
-    PASSED();
-
+    nerrors += check_data(DATASETNAME10, file, FALSE);
 #else /*H5_HAVE_FILTER_SCALEOFFSET*/
     SKIPPED();
     puts(not_supported);
 #endif /*H5_HAVE_FILTER_SCALEOFFSET*/
-
+ 
     TESTING("dataset of BE INT with scale-offset filter");
-
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
-    /*
-     * Open the dataset with scale-offset filter.
-     */
-    if((dataset = H5Dopen2(file, DATASETNAME11, H5P_DEFAULT)) < 0)
-        TEST_ERROR;
-
-    /*
-     * Data and output buffer initialization.
-     */
-    for (j = 0; j < NX; j++) {
-        for (i = 0; i < NY; i++) {
-            int_data_in[j][i] = i + j;
-            int_data_out[j][i] = 0;
-        }
-    }
-    for (i = 0; i < NY; i++) {
-        int_data_in[NX][i] = -2;
-        int_data_out[NX][i] = 0;
-    }
-
-    /*
-     * Read data from hyperslab in the file into the hyperslab in
-     * memory and display.
-     */
-    if(H5Dread(dataset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT,
-            int_data_out) < 0)
-        TEST_ERROR;
-
-    /* Check results */
-    for (j=0; j<(NX+1); j++) {
-        for (i=0; i<NY; i++) {
-            if (int_data_out[j][i] != int_data_in[j][i]) {
-                if (!nerrors++) {
-                    H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been %d\n",
-                           j, i, (int)int_data_out[j][i],
-                           (int)int_data_in[j][i]);
-                }
-            }
-        }
-    }
-
-    /*
-     * Close/release resources.
-     */
-    if(H5Dclose(dataset) < 0)
-        TEST_ERROR
-
-    /* Failure */
-    if (nerrors) {
-        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
-        return 1;
-    }
-
-    PASSED();
-
+    nerrors += check_data(DATASETNAME11, file, FALSE);
 #else /*H5_HAVE_FILTER_SCALEOFFSET*/
     SKIPPED();
     puts(not_supported);
 #endif /*H5_HAVE_FILTER_SCALEOFFSET*/
 
     TESTING("dataset of LE LONG LONG with scale-offset filter");
-
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
-    /*
-     * Open the dataset with scale-offset filter.
-     */
-    if((dataset = H5Dopen2(file, DATASETNAME12, H5P_DEFAULT)) < 0)
-        TEST_ERROR;
-
-    /*
-     * Data and output buffer initialization.
-     */
-    for (j = 0; j < NX; j++) {
-        for (i = 0; i < NY; i++) {
-            int_data_in[j][i] = i + j;
-            int_data_out[j][i] = 0;
-        }
-    }
-    for (i = 0; i < NY; i++) {
-        int_data_in[NX][i] = -2;
-        int_data_out[NX][i] = 0;
-    }
-
-    /*
-     * Read data from hyperslab in the file into the hyperslab in
-     * memory and display.
-     */
-    if(H5Dread(dataset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT,
-            int_data_out) < 0)
-        TEST_ERROR;
-
-    /* Check results */
-    for (j=0; j<(NX+1); j++) {
-        for (i=0; i<NY; i++) {
-            if (int_data_out[j][i] != int_data_in[j][i]) {
-                if (!nerrors++) {
-                    H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been %d\n",
-                           j, i, (int)int_data_out[j][i],
-                           (int)int_data_in[j][i]);
-                }
-            }
-        }
-    }
-
-    /*
-     * Close/release resources.
-     */
-    if(H5Dclose(dataset) < 0)
-        TEST_ERROR
-
-    /* Failure */
-    if (nerrors) {
-        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
-        return 1;
-    }
-
-    PASSED();
-
+    nerrors += check_data(DATASETNAME12, file, FALSE);
 #else /*H5_HAVE_FILTER_SCALEOFFSET*/
     SKIPPED();
     puts(not_supported);
 #endif /*H5_HAVE_FILTER_SCALEOFFSET*/
-
+ 
     TESTING("dataset of BE LONG LONG with scale-offset filter");
-
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
-    /*
-     * Open the dataset with scale-offset filter.
-     */
-    if((dataset = H5Dopen2(file, DATASETNAME13, H5P_DEFAULT)) < 0)
-        TEST_ERROR;
+    nerrors += check_data(DATASETNAME13, file, FALSE);
+#else /*H5_HAVE_FILTER_SCALEOFFSET*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_SCALEOFFSET*/
 
-    /*
-     * Data and output buffer initialization.
-     */
-    for (j = 0; j < NX; j++) {
-        for (i = 0; i < NY; i++) {
-            int_data_in[j][i] = i + j;
-            int_data_out[j][i] = 0;
-        }
-    }
-    for (i = 0; i < NY; i++) {
-        int_data_in[NX][i] = -2;
-        int_data_out[NX][i] = 0;
-    }
+    TESTING("dataset of LE FLOAT with Fletcher32 filter");
+#ifdef H5_HAVE_FILTER_FLETCHER32
+    nerrors += check_data(DATASETNAME14, file, TRUE);
+#else /*H5_HAVE_FILTER_FLETCHER32*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_FLETCHER32*/
+ 
+    TESTING("dataset of BE FLOAT with Fletcher32 filter");
+#ifdef H5_HAVE_FILTER_FLETCHER32
+    nerrors += check_data(DATASETNAME15, file, TRUE);
+#else /*H5_HAVE_FILTER_FLETCHER32*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_FLETCHER32*/
+ 
+    TESTING("dataset of LE FLOAT with Deflate filter");
+#ifdef H5_HAVE_FILTER_DEFLATE
+    nerrors += check_data(DATASETNAME16, file, TRUE);
+#else /*H5_HAVE_FILTER_DEFLATE*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_DEFLATE*/
 
-    /*
-     * Read data from hyperslab in the file into the hyperslab in
-     * memory and display.
-     */
-    if(H5Dread(dataset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT,
-            int_data_out) < 0)
-        TEST_ERROR;
+    TESTING("dataset of BE FLOAT with Deflate filter");
+#ifdef H5_HAVE_FILTER_DEFLATE
+    nerrors += check_data(DATASETNAME17, file, TRUE);
+#else /*H5_HAVE_FILTER_DEFLATE*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_DEFLATE*/
 
-    /* Check results */
-    for (j=0; j<(NX+1); j++) {
-        for (i=0; i<NY; i++) {
-            if (int_data_out[j][i] != int_data_in[j][i]) {
-                if (!nerrors++) {
-                    H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been %d\n",
-                           j, i, (int)int_data_out[j][i],
-                           (int)int_data_in[j][i]);
-                }
-            }
-        }
-    }
+    TESTING("dataset of LE FLOAT with Szip filter");
+#ifdef H5_HAVE_FILTER_SZIP
+    nerrors += check_data(DATASETNAME18, file, TRUE);
+#else /*H5_HAVE_FILTER_SZIP*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_SZIP*/
 
-    /*
-     * Close/release resources.
-     */
-    if(H5Dclose(dataset) < 0)
-        TEST_ERROR
+    TESTING("dataset of BE FLOAT with Szip filter");
+#ifdef H5_HAVE_FILTER_SZIP
+    nerrors += check_data(DATASETNAME19, file, TRUE);
+#else /*H5_HAVE_FILTER_SZIP*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_SZIP*/
 
-    /* Failure */
-    if (nerrors) {
-        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
-        return 1;
-    }
+    TESTING("dataset of LE FLOAT with Shuffle filter");
+#ifdef H5_HAVE_FILTER_SHUFFLE
+    nerrors += check_data(DATASETNAME20, file, TRUE);
+#else /*H5_HAVE_FILTER_SHUFFLE*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_SHUFFLE*/
 
-    PASSED();
+    TESTING("dataset of BE FLOAT with Shuffle filter");
+#ifdef H5_HAVE_FILTER_SHUFFLE
+    nerrors += check_data(DATASETNAME21, file, TRUE);
+#else /*H5_HAVE_FILTER_SHUFFLE*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_SHUFFLE*/
 
-#else /*H5_HAVE_FILTER_SCALEOFFSET*/
+    TESTING("dataset of LE FLOAT with Nbit filter");
+#ifdef H5_HAVE_FILTER_NBIT
+    nerrors += check_data(DATASETNAME22, file, TRUE);
+#else /*H5_HAVE_FILTER_NBIT*/
     SKIPPED();
     puts(not_supported);
-#endif /*H5_HAVE_FILTER_SCALEOFFSET*/
+#endif /*H5_HAVE_FILTER_NBIT*/
+
+    TESTING("dataset of BE FLOAT with Nbit filter");
+#ifdef H5_HAVE_FILTER_NBIT
+    nerrors += check_data(DATASETNAME23, file, TRUE);
+#else /*H5_HAVE_FILTER_NBIT*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_NBIT*/
 
     if(H5Fclose(file))
         TEST_ERROR
@@ -925,20 +394,20 @@ error:
     H5E_BEGIN_TRY {
         H5Fclose(file);
     } H5E_END_TRY;
-    return 1;
+    return nerrors;
 }
 
 
 /*-------------------------------------------------------------------------
  * Function:    main
  *
- * Purpose:     Tests the basic features of Virtual File Drivers
+ * Purpose:     Tests reading files created on LE and BE systems.
  *
  * Return:      Success:        exit(0)
  *              Failure:        exit(1)
  *
  * Programmer:  Raymond Lu
- *              Tuesday, Sept 24, 2002
+ *              Thursday, March 23, 2006
  *
  *-------------------------------------------------------------------------
  */
@@ -949,17 +418,13 @@ int main(void)
 
     h5_reset();
 
-    puts("Testing reading data created on OpenVMS");
-    h5_fixname(FILENAME[0], H5P_DEFAULT, filename, sizeof filename);
-    nerrors += read_data(filename);
-
     puts("Testing reading data created on Linux");
     h5_fixname(FILENAME[1], H5P_DEFAULT, filename, sizeof filename);
-    nerrors += read_data(filename);
+    nerrors += open_dataset(filename);
 
     puts("Testing reading data created on Solaris");
     h5_fixname(FILENAME[2], H5P_DEFAULT, filename, sizeof filename);
-    nerrors += read_data(filename);
+    nerrors += open_dataset(filename);
 
     if (nerrors) {
         printf("***** %u FAILURE%s! *****\n",