[svn-r6627] Purpose:

added new files for tests , according to test matrix


Description:

Solution:

Platforms tested:


Misc. update:

28 files changed, 245 insertions, 88 deletions

diff --git a/tools/testfiles/h5diff_01.txt b/tools/testfiles/h5diff_01.txt
new file mode 100644
index 0000000..32e9f97
--- /dev/null
+++ b/tools/testfiles/h5diff_01.txt
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5diff h5diff_test1.h5'
+#############################
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name [file2_name]
+Items in [ ] are optional
+
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
+
diff --git a/tools/testfiles/h5diff_010.txt b/tools/testfiles/h5diff_010.txt
new file mode 100644
index 0000000..edcf946
--- /dev/null
+++ b/tools/testfiles/h5diff_010.txt
@@ -0,0 +1,4 @@
+#############################
+Expected output for 'h5diff h5diff_test1.h6 h5diff_test2.h6'
+#############################
+h5diff: h5diff_test1.h6: No such file or directory
diff --git a/tools/testfiles/h5diff_02.txt b/tools/testfiles/h5diff_02.txt
new file mode 100644
index 0000000..bdf0add
--- /dev/null
+++ b/tools/testfiles/h5diff_02.txt
@@ -0,0 +1,19 @@
+#############################
+Expected output for 'h5diff -x h5diff_test1.h5 h5diff_test2.h5'
+#############################
+-x is an invalid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name [file2_name]
+Items in [ ] are optional
+
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
+
diff --git a/tools/testfiles/h5diff_03.txt b/tools/testfiles/h5diff_03.txt
new file mode 100644
index 0000000..837a3bd
--- /dev/null
+++ b/tools/testfiles/h5diff_03.txt
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5diff -h h5diff_test1.h5 h5diff_test2.h5'
+#############################
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name [file2_name]
+Items in [ ] are optional
+
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
+
diff --git a/tools/testfiles/h5diff_04.txt b/tools/testfiles/h5diff_04.txt
new file mode 100644
index 0000000..c9b8680
--- /dev/null
+++ b/tools/testfiles/h5diff_04.txt
@@ -0,0 +1,19 @@
+#############################
+Expected output for 'h5diff -d h5diff_test1.h5 h5diff_test2.h5'
+#############################
+<-d h5diff_test1.h5> is not a valid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name [file2_name]
+Items in [ ] are optional
+
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
+
diff --git a/tools/testfiles/h5diff_05.txt b/tools/testfiles/h5diff_05.txt
new file mode 100644
index 0000000..8fdef45
--- /dev/null
+++ b/tools/testfiles/h5diff_05.txt
@@ -0,0 +1,19 @@
+#############################
+Expected output for 'h5diff -d -4 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+<-d -4> is not a valid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name [file2_name]
+Items in [ ] are optional
+
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
+
diff --git a/tools/testfiles/h5diff_06.txt b/tools/testfiles/h5diff_06.txt
new file mode 100644
index 0000000..9717060
--- /dev/null
+++ b/tools/testfiles/h5diff_06.txt
@@ -0,0 +1,19 @@
+#############################
+Expected output for 'h5diff -p h5diff_test1.h5 h5diff_test2.h5'
+#############################
+<-p h5diff_test1.h5> is not a valid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name [file2_name]
+Items in [ ] are optional
+
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
+
diff --git a/tools/testfiles/h5diff_07.txt b/tools/testfiles/h5diff_07.txt
new file mode 100644
index 0000000..5999f82
--- /dev/null
+++ b/tools/testfiles/h5diff_07.txt
@@ -0,0 +1,19 @@
+#############################
+Expected output for 'h5diff -p -4 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+-4 is an invalid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name [file2_name]
+Items in [ ] are optional
+
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
+
diff --git a/tools/testfiles/h5diff_08.txt b/tools/testfiles/h5diff_08.txt
new file mode 100644
index 0000000..e89db90
--- /dev/null
+++ b/tools/testfiles/h5diff_08.txt
@@ -0,0 +1,19 @@
+#############################
+Expected output for 'h5diff -n h5diff_test1.h5 h5diff_test2.h5'
+#############################
+<-n h5diff_test1.h5> is not a valid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name [file2_name]
+Items in [ ] are optional
+
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
+
diff --git a/tools/testfiles/h5diff_09.txt b/tools/testfiles/h5diff_09.txt
new file mode 100644
index 0000000..180009f
--- /dev/null
+++ b/tools/testfiles/h5diff_09.txt
@@ -0,0 +1,19 @@
+#############################
+Expected output for 'h5diff -n 0 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+<-n 0> is not a valid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name [file2_name]
+Items in [ ] are optional
+
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
+
diff --git a/tools/testfiles/h5diff_1.txt b/tools/testfiles/h5diff_1.txt
deleted file mode 100644
index 1491ec6..0000000
--- a/tools/testfiles/h5diff_1.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-#############################
-Expected output for 'h5diff h5diff_test1.h5'
-#############################
-h5diff [OBJ1_NAME] [OBJ2_NAME] [-h] [-l] [-r] [-d] [-n count] [-d delta] [-p relative] FILE1_NAME FILE2_NAME
-
-  [OBJ1_NAME]       Name of an HDF5 object
-  [OBJ2_NAME]       Name of an HDF5 object
-  [-h ]             Print a basic help message (this message)
-  [-l ]             List contents of file
-  [-r ]             Print only what objects differ
-  [-n count]        Print difference up to count number for each variable
-  [-d delta]        Print difference when it is greater than limit delta
-  [-p relative]     Print differences which are within a relative error value
-  FILE1_NAME        File name of the first HDF5 file
-  FILE2_NAME        File name of the second HDF5 file
-
-Items in [ ] are optional 
diff --git a/tools/testfiles/h5diff_111.txt b/tools/testfiles/h5diff_111.txt
new file mode 100644
index 0000000..a31d0f6
--- /dev/null
+++ b/tools/testfiles/h5diff_111.txt
@@ -0,0 +1,4 @@
+#############################
+Expected output for 'h5diff dset1.1 g1.1 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+<dset1.1> is of different type than <g1.1>
diff --git a/tools/testfiles/h5diff_112.txt b/tools/testfiles/h5diff_112.txt
new file mode 100644
index 0000000..eb6a0a9
--- /dev/null
+++ b/tools/testfiles/h5diff_112.txt
@@ -0,0 +1,4 @@
+#############################
+Expected output for 'h5diff g1.1 g1.1 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+<g1.1> and <g1.1> are of type H5G_GROUP
diff --git a/tools/testfiles/h5diff_121.txt b/tools/testfiles/h5diff_121.txt
new file mode 100644
index 0000000..a21287d
--- /dev/null
+++ b/tools/testfiles/h5diff_121.txt
@@ -0,0 +1,4 @@
+#############################
+Expected output for 'h5diff compound h5diff_test1.h5 h5diff_test2.h5'
+#############################
+<compound> and <compound> are of type H5G_TYPE
diff --git a/tools/testfiles/h5diff_122.txt b/tools/testfiles/h5diff_122.txt
new file mode 100644
index 0000000..c965e3a
--- /dev/null
+++ b/tools/testfiles/h5diff_122.txt
@@ -0,0 +1,4 @@
+#############################
+Expected output for 'h5diff enum h5diff_test1.h5 h5diff_test2.h5'
+#############################
+<enum> and <enum> are of type H5G_TYPE
diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt
new file mode 100644
index 0000000..6819d7d
--- /dev/null
+++ b/tools/testfiles/h5diff_13.txt
@@ -0,0 +1,5 @@
+#############################
+Expected output for 'h5diff dset1.3 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+Comparing <dset1.3> with <dset1.3>
+H5T_STRING comparison is not supported
diff --git a/tools/testfiles/h5diff_14.txt b/tools/testfiles/h5diff_14.txt
new file mode 100644
index 0000000..cc4852b
--- /dev/null
+++ b/tools/testfiles/h5diff_14.txt
@@ -0,0 +1,5 @@
+#############################
+Expected output for 'h5diff dset1.1 dset1.4 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+Comparing <dset1.1> with <dset1.4>
+<dset1.1> is of class H5T_INTEGER and <dset1.4> is of class H5T_FLOAT
diff --git a/tools/testfiles/h5diff_15.txt b/tools/testfiles/h5diff_15.txt
new file mode 100644
index 0000000..5b6be2a
--- /dev/null
+++ b/tools/testfiles/h5diff_15.txt
@@ -0,0 +1,7 @@
+#############################
+Expected output for 'h5diff dset1.1 dset1.5 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+Comparing <dset1.1> with <dset1.5>
+<dset1.1> is of rank 1 and <dset1.5> is of rank 2
+<dset1.1>: [ 7 ]
+<dset1.5>: [ 3 ]
diff --git a/tools/testfiles/h5diff_16.txt b/tools/testfiles/h5diff_16.txt
new file mode 100644
index 0000000..f8984af
--- /dev/null
+++ b/tools/testfiles/h5diff_16.txt
@@ -0,0 +1,7 @@
+#############################
+Expected output for 'h5diff dset1.1 dset1.6 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+Comparing <dset1.1> with <dset1.6>
+<dset1.1> has different dimensions than <dset1.6>
+<dset1.1>: [ 7 ]
+<dset1.6>: [ 8 ]
diff --git a/tools/testfiles/h5diff_2.txt b/tools/testfiles/h5diff_2.txt
deleted file mode 100644
index 6ace71f..0000000
--- a/tools/testfiles/h5diff_2.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-Expected output for 'h5diff -x h5diff_test1.h5 h5diff_test2.h5'
-#############################
--x is an invalid option
-h5diff [OBJ1_NAME] [OBJ2_NAME] [-h] [-l] [-r] [-d] [-n count] [-d delta] [-p relative] FILE1_NAME FILE2_NAME
-
-  [OBJ1_NAME]       Name of an HDF5 object
-  [OBJ2_NAME]       Name of an HDF5 object
-  [-h ]             Print a basic help message (this message)
-  [-l ]             List contents of file
-  [-r ]             Print only what objects differ
-  [-n count]        Print difference up to count number for each variable
-  [-d delta]        Print difference when it is greater than limit delta
-  [-p relative]     Print differences which are within a relative error value
-  FILE1_NAME        File name of the first HDF5 file
-  FILE2_NAME        File name of the second HDF5 file
-
-Items in [ ] are optional 
diff --git a/tools/testfiles/h5diff_210.txt b/tools/testfiles/h5diff_210.txt
new file mode 100644
index 0000000..1cc017c
--- /dev/null
+++ b/tools/testfiles/h5diff_210.txt
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5diff dset2.1 dset2.2 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+Comparing <dset2.1> with <dset2.2>
+using memory type H5T_NATIVE_SCHAR
+position        dset2.1         dset2.2         difference          
+------------------------------------------------------------
+[ 1 0 ]          1               3               2              
+[ 1 1 ]          1               4               3              
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+4 differences found
diff --git a/tools/testfiles/h5diff_211.txt b/tools/testfiles/h5diff_211.txt
new file mode 100644
index 0000000..3983cec
--- /dev/null
+++ b/tools/testfiles/h5diff_211.txt
@@ -0,0 +1,10 @@
+#############################
+Expected output for 'h5diff dset2.1 dset2.2 -n 2 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+Comparing <dset2.1> with <dset2.2>
+using memory type H5T_NATIVE_SCHAR
+position        dset2.1         dset2.2         difference          
+------------------------------------------------------------
+[ 1 0 ]          1               3               2              
+[ 1 1 ]          1               4               3              
+2 differences found
diff --git a/tools/testfiles/h5diff_212.txt b/tools/testfiles/h5diff_212.txt
new file mode 100644
index 0000000..5e3f258
--- /dev/null
+++ b/tools/testfiles/h5diff_212.txt
@@ -0,0 +1,10 @@
+#############################
+Expected output for 'h5diff dset2.1 dset2.2 -d 3 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+Comparing <dset2.1> with <dset2.2>
+using memory type H5T_NATIVE_SCHAR
+position        dset2.1         dset2.2         difference          
+------------------------------------------------------------
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+2 differences found
diff --git a/tools/testfiles/h5diff_3.txt b/tools/testfiles/h5diff_3.txt
deleted file mode 100644
index 7406f04..0000000
--- a/tools/testfiles/h5diff_3.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-#############################
-Expected output for 'h5diff -h h5diff_test1.h5 h5diff_test2.h5'
-#############################
-h5diff [OBJ1_NAME] [OBJ2_NAME] [-h] [-l] [-r] [-d] [-n count] [-d delta] [-p relative] FILE1_NAME FILE2_NAME
-
-  [OBJ1_NAME]       Name of an HDF5 object
-  [OBJ2_NAME]       Name of an HDF5 object
-  [-h ]             Print a basic help message (this message)
-  [-l ]             List contents of file
-  [-r ]             Print only what objects differ
-  [-n count]        Print difference up to count number for each variable
-  [-d delta]        Print difference when it is greater than limit delta
-  [-p relative]     Print differences which are within a relative error value
-  FILE1_NAME        File name of the first HDF5 file
-  FILE2_NAME        File name of the second HDF5 file
-
-Items in [ ] are optional 
diff --git a/tools/testfiles/h5diff_4.txt b/tools/testfiles/h5diff_4.txt
deleted file mode 100644
index 87608f4..0000000
--- a/tools/testfiles/h5diff_4.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-Expected output for 'h5diff -d h5diff_test1.h5 h5diff_test2.h5'
-#############################
-<-d h5diff_test1.h5> is not a valid option
-h5diff [OBJ1_NAME] [OBJ2_NAME] [-h] [-l] [-r] [-d] [-n count] [-d delta] [-p relative] FILE1_NAME FILE2_NAME
-
-  [OBJ1_NAME]       Name of an HDF5 object
-  [OBJ2_NAME]       Name of an HDF5 object
-  [-h ]             Print a basic help message (this message)
-  [-l ]             List contents of file
-  [-r ]             Print only what objects differ
-  [-n count]        Print difference up to count number for each variable
-  [-d delta]        Print difference when it is greater than limit delta
-  [-p relative]     Print differences which are within a relative error value
-  FILE1_NAME        File name of the first HDF5 file
-  FILE2_NAME        File name of the second HDF5 file
-
-Items in [ ] are optional 
diff --git a/tools/testfiles/h5diff_5.txt b/tools/testfiles/h5diff_5.txt
deleted file mode 100644
index cae4fa5..0000000
--- a/tools/testfiles/h5diff_5.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-Expected output for 'h5diff -d -4 h5diff_test1.h5 h5diff_test2.h5'
-#############################
-<-d -4> is not a valid option
-h5diff [OBJ1_NAME] [OBJ2_NAME] [-h] [-l] [-r] [-d] [-n count] [-d delta] [-p relative] FILE1_NAME FILE2_NAME
-
-  [OBJ1_NAME]       Name of an HDF5 object
-  [OBJ2_NAME]       Name of an HDF5 object
-  [-h ]             Print a basic help message (this message)
-  [-l ]             List contents of file
-  [-r ]             Print only what objects differ
-  [-n count]        Print difference up to count number for each variable
-  [-d delta]        Print difference when it is greater than limit delta
-  [-p relative]     Print differences which are within a relative error value
-  FILE1_NAME        File name of the first HDF5 file
-  FILE2_NAME        File name of the second HDF5 file
-
-Items in [ ] are optional 
diff --git a/tools/testfiles/h5diff_test1.h5 b/tools/testfiles/h5diff_test1.h5
index f31aeb2..fca98d8 100644
--- a/tools/testfiles/h5diff_test1.h5
+++ b/tools/testfiles/h5diff_test1.h5
diff --git a/tools/testfiles/h5diff_test2.h5 b/tools/testfiles/h5diff_test2.h5
index fa43267..ec934b1 100644
--- a/tools/testfiles/h5diff_test2.h5
+++ b/tools/testfiles/h5diff_test2.h5