[svn-r6626] Purpose:

added new tests
removed compiler warnings from unix platforms
changed usage message

Description:

Solution:

Platforms tested:
w2000, linux, arabica, modi4

Misc. update:

1 files changed, 278 insertions, 4 deletions

diff --git a/tools/h5diff/h5difftst.c b/tools/h5diff/h5difftst.c
index 6e2b54f..41e5da6 100644
--- a/tools/h5diff/h5difftst.c
+++ b/tools/h5diff/h5difftst.c
@@ -17,7 +17,12 @@
 
 #include "hdf5.h"
 
-int do_test_files();
+
+
+/* diff tst*/
+int do_test_files(void);
+int write_dataset( hid_t file_id, int rank, hsize_t *dims, const char *dset_name,
+																		 hid_t type_id, void *data );
 
 
 int main(int argc, const char *argv[])
@@ -28,13 +33,283 @@ int main(int argc, const char *argv[])
 }
 
 
+/*-------------------------------------------------------------------------
+ * these command line options are tested in ./testh5diff.sh
+ *-------------------------------------------------------------------------
+ */
+
+/*
+# test 1.1
+dset1.1 g1.1 h5diff_test1.h5 h5diff_test2.h5
+g1.1 g1.1 h5diff_test1.h5 h5diff_test2.h5
+# test 1.2
+compound h5diff_test1.h5 h5diff_test2.h5
+enum h5diff_test1.h5 h5diff_test2.h5
+# test 1.3
+dset1.3 h5diff_test1.h5 h5diff_test2.h5
+# test 1.4
+dset1.1 dset1.4 h5diff_test1.h5 h5diff_test2.h5
+# test 1.5
+dset1.1 dset1.5 h5diff_test1.h5 h5diff_test2.h5
+# test 1.6
+dset1.1 dset1.6 h5diff_test1.h5 h5diff_test2.h5
+
+# Different datatype sizes and different mix of options 
+# test 2.1.0
+dset2.1 dset2.2 h5diff_test1.h5 h5diff_test2.h5
+# test 2.1.1
+dset2.1 dset2.2 -n 2 h5diff_test1.h5 h5diff_test2.h5
+# test 2.1.2
+dset2.1 dset2.2 -d 3 h5diff_test1.h5 h5diff_test2.h5
+
+
+*/
+
+
+int do_test_files(void)
+{
+
+ hid_t   file1_id, file2_id; 
+ hid_t   dataset_id;
+ hid_t   space_id;  
+ hid_t   group_id;
+	hid_t   type_id, type2_id;  
+ herr_t  status;
+	int     val;
+
+	/* Test 1. */
+	hsize_t dims1  [1] = { 7 };
+	hsize_t dims1_1[1] = { 8 };
+	hsize_t dims2  [2] = { 3,2 };
+ char    data1_3[]  = {"A string"};
+	float   data1_4[7] = {1,1,3,4,5,6,7};
+
+	/* Test 2. */
+	char    data2_1[3][2] = {{1,1},{1,1},{1,1}};
+	char    data2_2[3][2] = {{1,1},{3,4},{5,6}};
+
+/*
+	float   data5[3][2]   = {{1,1},{3,4},{5,6}};
+ float   data6[3][2]   = {{1,1.1f},{3.02f,4.002f},{5.00002f,6}};
+ double  data8[3][2]   = {{1,1},{3.40505e-9,4},{5,6}};
+ double  data9[3][2]   = {{1,1},{3.58911e-9,4},{5,6}};*/
+
+	/* Compound datatype */
+ typedef struct s_t 
+	{
+ 	int    a;
+	 float  b;
+ } s_t;
+
+	typedef enum 
+	{
+  E_RED,
+  E_GREEN
+} e_t;
+
+/*-------------------------------------------------------------------------
+ * Create two files
+ *-------------------------------------------------------------------------
+ */
+  
+ /* Create a file */
+ file1_id = H5Fcreate ("h5diff_test1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); 
+
+ /* Create a file */
+ file2_id = H5Fcreate ("h5diff_test2.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); 
+
+/*-------------------------------------------------------------------------
+ * Test 1.1
+	* Objects are not the same type (e.g try to compare a group with a dataset)
+ *-------------------------------------------------------------------------
+ */
+
+ /* Create a data space  */
+ space_id = H5Screate_simple(1,dims1,NULL);
+
+ /* Create a dataset "dset1.1" */
+ dataset_id = H5Dcreate(file1_id,"dset1.1",H5T_NATIVE_INT,space_id,H5P_DEFAULT);
+
+ /* Close */
+ status = H5Dclose(dataset_id);
+ status = H5Sclose(space_id);
+
+ /* Create a group "g1.1" on file2 */
+ group_id = H5Gcreate(file2_id, "g1.1", 0);
+
+ /* Close */
+ status = H5Gclose(group_id);
+
+/*-------------------------------------------------------------------------
+ * Test 1.2
+	* Objects are of classes H5G_TYPE and H5G_GROUP and their name is supplied
+ *-------------------------------------------------------------------------
+ */
+
+ /* Create a group "g1.1" on file1 */
+ group_id = H5Gcreate(file1_id, "g1.1", 0);
+
+ /* Close */
+ status = H5Gclose(group_id);
+
+	/* Create a memory compound datatype on file1 */
+	type_id = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+ H5Tinsert(type_id, "a", HOFFSET(s_t, a), H5T_NATIVE_INT);
+ H5Tinsert(type_id, "b", HOFFSET(s_t, b), H5T_NATIVE_FLOAT);
+	/* Commit compound datatype and close it */
+ H5Tcommit(file1_id, "compound", type_id);
+	type2_id = H5Tcopy(type_id);
+	H5Tcommit(file2_id, "compound", type2_id);
+	H5Tclose(type_id);
+	H5Tclose(type2_id);
+	
+	/* Create a memory enum datatype on file1 */
+	type_id = H5Tcreate(H5T_ENUM, sizeof(e_t));
+ H5Tenum_insert(type_id, "RED",   (val = 0, &val));
+	H5Tenum_insert(type_id, "GREEN", (val = 1, &val));
+	type2_id = H5Tcopy(type_id);
+
+	/* Commit enumeration datatype and close it */
+	H5Tcommit(file1_id, "enum", type_id);
+	H5Tcommit(file2_id, "enum", type2_id);
+	H5Tclose(type_id);
+	H5Tclose(type2_id);
+
+/*-------------------------------------------------------------------------
+ * Test 1.3
+	* Check for non supported classes. Supported classes are H5T_INTEGER and H5T_FLOAT
+	* Non supported classes are
+	* H5T_TIME, H5T_STRING, H5T_BITFIELD, H5T_OPAQUE, H5T_COMPOUND, H5T_REFERENCE,
+	* H5T_ENUM, H5T_VLEN, H5T_ARRAY
+ *-------------------------------------------------------------------------
+ */
+
+/*-------------------------------------------------------------------------
+ * Write two string datatypes
+ *-------------------------------------------------------------------------
+ */
+
+ /* Create a data space  */
+ space_id = H5Screate(H5S_SCALAR);
+
+ /* Make a string type */
+ type_id = H5Tcopy(H5T_C_S1);
+ status = H5Tset_size (type_id, strlen(data1_3));
+
+ /* Create a dataset "dset1.3" on file 1 */
+ dataset_id = H5Dcreate(file1_id,"dset1.3",type_id,space_id,H5P_DEFAULT);
+  
+ /* Write the data */
+ status = H5Dwrite(dataset_id,type_id,H5S_ALL,H5S_ALL,H5P_DEFAULT,data1_3);
+
+ /* Close */
+ status = H5Dclose(dataset_id);
+
+ /* Create a dataset "dset1.3" on file 2 */
+ dataset_id = H5Dcreate(file2_id,"dset1.3",type_id,space_id,H5P_DEFAULT);
+  
+ /* Write the data */
+ status = H5Dwrite(dataset_id,type_id,H5S_ALL,H5S_ALL,H5P_DEFAULT,data1_3);
+
+ /* Close */
+ status = H5Dclose(dataset_id);
+ status = H5Sclose(space_id);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * Test 1.4
+	* Datasets are not the same class type
+	* Write a float dataset and compare with integer "dset1.1"
+ *-------------------------------------------------------------------------
+ */
+
+ write_dataset(file2_id,1,dims1,"dset1.4",H5T_NATIVE_FLOAT,data1_4);
+
+/*-------------------------------------------------------------------------
+ * Test 1.5
+	* Datasets are not the same rank
+ *-------------------------------------------------------------------------
+ */
+
+ write_dataset(file2_id,2,dims2,"dset1.5",H5T_NATIVE_INT,NULL);
+
+/*-------------------------------------------------------------------------
+ * Test 1.6
+	* Check for the same current dimensions. Only compare if they are the same.
+ *-------------------------------------------------------------------------
+ */
 
+ write_dataset(file2_id,1,dims1_1,"dset1.6",H5T_NATIVE_INT,NULL);
 
 /*-------------------------------------------------------------------------
- * do some test files 
+ * Test 2.1
+	* Check for the same current dimensions. Only compare if they are the same.
  *-------------------------------------------------------------------------
  */
 
+ write_dataset(file1_id,2,dims2,"dset2.1",H5T_NATIVE_CHAR,data2_1);
+	write_dataset(file2_id,2,dims2,"dset2.2",H5T_NATIVE_CHAR,data2_2);
+
+
+ 
+/*-------------------------------------------------------------------------
+ * Close files
+ *-------------------------------------------------------------------------
+ */
+ status = H5Fclose(file1_id);
+ status = H5Fclose(file2_id);
+
+
+ return 0;
+
+
+}
+
+/*-------------------------------------------------------------------------
+ * Function: write_dataset
+ *
+ * Purpose: utility function to write a dataset
+ *
+ * Return: 
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: April 7, 2003
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int write_dataset( hid_t file_id, int rank, hsize_t *dims, const char *dset_name,
+																		 hid_t type_id, void *data )
+{
+ hid_t   dataset_id;
+ hid_t   space_id;  
+	herr_t  status;
+
+	/* Create a data space  */
+ space_id = H5Screate_simple(rank,dims,NULL);
+
+ /* Create a dataset "dset" */
+ dataset_id = H5Dcreate(file_id,dset_name,type_id,space_id,H5P_DEFAULT);
+  
+ /* Write the data */
+	if ( data )
+  status = H5Dwrite(dataset_id,type_id,H5S_ALL,H5S_ALL,H5P_DEFAULT,data);
+
+ /* Close */
+ status = H5Dclose(dataset_id);
+ status = H5Sclose(space_id);
+
+	return 0;
+
+}
+
+
+
+
+#if 0
+
+
 /*
 dset1 dset2 h5diff_test1.h5 h5diff_test2.h5
 dset1 dset2 -l h5diff_test1.h5 h5diff_test2.h5
@@ -48,7 +323,6 @@ dset8 dset9 h5diff_test2.h5 h5diff_test2.h5
 dset11 dset12 h5diff_test1.h5 h5diff_test2.h5
 */
 
-
 int do_test_files()
 {
 
@@ -399,4 +673,4 @@ int do_test_files()
 
 }
 
-
+#endif
\ No newline at end of file