[svn-r982] Added test for loop detection.

Updated expected output for dumper automatic tests.
Removed redundant tests.

1 files changed, 8 insertions, 92 deletions

diff --git a/tools/testfiles/tdset-2.ddl b/tools/testfiles/tdset-2.ddl
index 735b28a..a857c9d 100644
--- a/tools/testfiles/tdset-2.ddl
+++ b/tools/testfiles/tdset-2.ddl
@@ -1,100 +1,16 @@
 #############################
-Expected output for 'h5dump -d dset1 /dset2 tdset.h5'
+Expected output for 'h5dump -header -d dset1 /dset2 dset3 tdset.h5'
 #############################
 HDF5 "tdset.h5" {
 DATASET "dset1" {
-   DATATYPE { "H5T_STD_I32BE" }
-   DATASPACE { ARRAY ( 10, 20 ) ( 10, 20 ) }
-   DATA {
-      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-      19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
-      18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-      17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-      16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
-      15, 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
-      14, 15, 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
-      13, 14, 15, 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
-      12, 13, 14, 15, 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
-      11, 12, 13, 14, 15, 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-      10, 11, 12, 13, 14, 15, 16, 17, 18, 19
-   }
+   DATATYPE { H5T_STD_I32BE }
+   DATASPACE { SIMPLE ( 10, 20 ) / ( 10, 20 ) }
 }
 DATASET "/dset2" {
-   DATATYPE { "H5T_IEEE_F64BE" }
-   DATASPACE { ARRAY ( 30, 20 ) ( 30, 20 ) }
-   DATA {
-      0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008,
-      0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016,
-      0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005,
-      0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013,
-      0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002,
-      0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001,
-      0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018,
-      0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
-      0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
-      0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004,
-      0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012,
-      0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001,
-      0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009,
-      0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017,
-      0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006,
-      0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014,
-      0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
-      0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
-      0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0,
-      0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008,
-      0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016,
-      0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005,
-      0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013,
-      0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002,
-      0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001,
-      0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018,
-      0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
-      0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
-      0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004,
-      0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012,
-      0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001,
-      0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009,
-      0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017,
-      0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006,
-      0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014,
-      0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
-      0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
-      0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0,
-      0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008,
-      0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016,
-      0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005,
-      0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013,
-      0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002,
-      0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001,
-      0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018,
-      0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
-      0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
-      0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004,
-      0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012,
-      0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001,
-      0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009,
-      0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017,
-      0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006,
-      0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014,
-      0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
-      0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
-      0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0,
-      0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008,
-      0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016,
-      0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005,
-      0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013,
-      0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002,
-      0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001,
-      0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018,
-      0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
-      0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
-      0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004,
-      0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012,
-      0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001,
-      0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009,
-      0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017,
-      0.0018, 0.0019
-   }
+   DATATYPE { H5T_IEEE_F64BE }
+   DATASPACE { SIMPLE ( 30, 20 ) / ( 30, 20 ) }
+}
+DATASET "dset3" {
+   h5dump error: unable to open dset3
 }
 }