From bab0671b109c9476fc48aefe54602a187e042aab Mon Sep 17 00:00:00 2001 From: bmribler <39579120+bmribler@users.noreply.github.com> Date: Mon, 25 Sep 2023 13:40:50 -0400 Subject: [PATCH 01/10] Fixed GH-3554 (#3584) Removed the extra condition --- src/H5FDs3comms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/H5FDs3comms.c b/src/H5FDs3comms.c index 7c5ff1def5f..9d6d30ac48d 100644 --- a/src/H5FDs3comms.c +++ b/src/H5FDs3comms.c @@ -2756,7 +2756,7 @@ H5FD_s3comms_trim(char *dest, char *s, size_t s_len, size_t *n_written) /* Find first non-whitespace character from start; * reduce total length per character. */ - while ((s_len > 0) && isspace((unsigned char)s[0]) && s_len > 0) { + while (s_len > 0 && isspace((unsigned char)s[0])) { s++; s_len--; } From 995e13dedfd468a6daf984d1043cab6052e16d6f Mon Sep 17 00:00:00 2001 From: "H. Joe Lee" Date: Mon, 25 Sep 2023 13:30:14 -0500 Subject: [PATCH 02/10] Remove h5dwalk.1 man page. (#3589) --- utils/tools/h5dwalk/h5dwalk.1 | 42 ----------------------------------- 1 file changed, 42 deletions(-) delete mode 100644 utils/tools/h5dwalk/h5dwalk.1 diff --git a/utils/tools/h5dwalk/h5dwalk.1 b/utils/tools/h5dwalk/h5dwalk.1 deleted file mode 100644 index eb0e5e83629..00000000000 --- a/utils/tools/h5dwalk/h5dwalk.1 +++ /dev/null @@ -1,42 +0,0 @@ -.TH "h5dwalk" 1 -.SH NAME -h5dwalk \- Provides a means of extending HDF5 tools by using parallelism on groups of files. -.SH SYNOPSIS -h5dwalk [OPTIONS] -T h5tool [H5TOOL_options...] -.SH DESCRIPTION -h5dwalk utilizes the mpiFileUtils library to invoke a selected HDF5 tool on a collection of files. The mpiFileUtils library provides the facilities to walk directory trees and provide a selection of files contained therein. This selection can be filtered in various ways. At present, h5dwalk filters the original file selection to include only HDF5 formatted files. The resulting collection or collections can be utilized as the file inputs to the selected h5tool. -.SH OPTIONS -.TP -.B \-h -or -.B \-\-help -Print a usage message and exit. -.TP -.B \-i -or -.B \-\-input filename -Read command input from a file. Not yet implemented. -.TP -.B \-o -or -.B \-\-output filename -Captures the hdf5 tool output into a named file. -.TP -.B \-l -or -.B \-\-log [file] -Captures hdf5 tool output into a individual log files. If an optional file (directory) is specified, then output from all tool instances will be written in the given file directory. Without the optional filename, each tool instance output will be captured in a new log file whose name is associated with the hdf5 tool that was run and is written in the current working directory. -.TP -.B \-E -or -.B \-\-error [file] -Show all HDF5 error reporting. Behavior is similar to --log, i.e. errors can either be logged in a single named file or in individual tool specific files. Not yet implemented. -.TP -.B \-T -or -.B \-\-tool hdf5_tool -Specifies the hdf5 tool that should be invoked for each file in a collection of files. The collection consists of individual HDF5 files found by walking a specified directory tree which is used in place of the normal tool filename argument. The '-T' option should appear on the command line just prior to the HDF5 tool argument options. -.TP -.SH "SEE ALSO" -\&\fIh5dump\fR\|(1), \fIh5diff\fR\|(1), \fIh5repart\fR\|(1), \fIh5diff\fR\|(1), -\&\fIh5import\fR\|(1), \fIgif2h5\fR\|(1), \fIh52gif\fR\|(1), \fIh5perf\fR\|(1) From 1e852b94bdcfbfe6f5e21c02c2d01a709b8040b0 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Mon, 25 Sep 2023 14:41:48 -0500 Subject: [PATCH 03/10] Removed the use of -commons linking option on Darwin (#3581) Removed the use of -commons linking option on Darwin as COMMON and EQUIVALENCE is no long used --- configure.ac | 8 -------- fortran/src/H5_ff.F90 | 2 -- release_docs/RELEASE.txt | 5 +++++ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 15f7bb4e69e..37252d9a76a 100644 --- a/configure.ac +++ b/configure.ac @@ -1074,14 +1074,6 @@ H5_FORTRAN_SHARED="no" if test "X${HDF_FORTRAN}" = "Xyes" && test "X${enable_shared}" != "Xno"; then AC_MSG_CHECKING([if shared Fortran libraries are supported]) H5_FORTRAN_SHARED="yes" - ## tell libtool to do the right thing with COMMON symbols, this fixes - ## corrupt values with COMMON and EQUIVALENCE when building shared - ## Fortran libraries on OSX with gnu and Intel compilers (HDFFV-2772). - case "`uname`" in - Darwin*) - H5_LDFLAGS="$H5_LDFLAGS -Wl,-commons,use_dylibs" - ;; - esac ## Report results of check(s) diff --git a/fortran/src/H5_ff.F90 b/fortran/src/H5_ff.F90 index 7bd2e261929..68b3dd874bb 100644 --- a/fortran/src/H5_ff.F90 +++ b/fortran/src/H5_ff.F90 @@ -12,8 +12,6 @@ ! PURPOSE ! This module is used to pass C stubs for H5 Fortran APIs. The C stubs are ! packed into arrays in H5_f.c and these arrays are then passed to Fortran. -! This module then uses EQUIVALENCE to assign elements of the arrays to -! Fortran equivalent C stubs. ! ! NOTES ! The size of the C arrays in H5_f.c has to match the values of the variables diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index fa088951d89..0e1dbe42b3b 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -261,6 +261,11 @@ New Features h5pget_file_space_page_size_f, h5pset_file_space_page_size_f, h5pget_file_space_strategy_f, h5pset_file_space_strategy_f + - Removed "-commons" linking option on Darwin, as COMMON and EQUIVALENCE + are no longer used in the Fortran source. + + Fixes GitHub issue #3571 + C++ Library: ------------ - From 08b574d68bcc97a57e5844ec1fb825b81e87188c Mon Sep 17 00:00:00 2001 From: jhendersonHDF Date: Mon, 25 Sep 2023 15:37:15 -0500 Subject: [PATCH 04/10] Fix docs for H5Pset_dxpl_mpio_collective_opt() (#3594) --- src/H5FDmpio.c | 16 ++++++++-------- src/H5FDmpio.h | 20 +++++++++++++------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index d2377cbc394..9149d2b0809 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -559,13 +559,13 @@ H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode /*out*/) /*------------------------------------------------------------------------- * Function: H5Pset_dxpl_mpio_collective_opt * - * Purpose: To set a flag to choose linked chunk I/O or multi-chunk I/O - * without involving decision-making inside HDF5 - * - * Note: The library will do linked chunk I/O or multi-chunk I/O without - * involving communications for decision-making process. - * The library won't behave as it asks for only when we find - * that the low-level MPI-IO package doesn't support this. + * Purpose: Set the data transfer property list DXPL_ID to use transfer + * mode OPT_MODE during I/O. This allows the application to + * specify collective I/O at the HDF5 interface level (with + * the H5Pset_dxpl_mpio routine), while controlling whether + * the actual I/O is performed collectively (e.g., via + * MPI_File_write_at_all) or independently (e.g., via + * MPI_File_write_at). * * Return: Success: Non-negative * Failure: Negative @@ -2032,7 +2032,7 @@ H5FD__mpio_vector_build_types(uint32_t count, H5FD_mem_t types[], haddr_t addrs[ /*------------------------------------------------------------------------- * Function: H5FD__mpio_read_vector() * - * Purpose: The behaviour of this function dependes on the value of + * Purpose: The behavior of this function depends on the value of * the io_xfer_mode obtained from the context. * * If it is H5FD_MPIO_COLLECTIVE, this is a collective diff --git a/src/H5FDmpio.h b/src/H5FDmpio.h index 36786016dfe..96a93668ea7 100644 --- a/src/H5FDmpio.h +++ b/src/H5FDmpio.h @@ -164,18 +164,24 @@ H5_DLL herr_t H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode /*out* /** * \ingroup DXPL * - * \brief Sets data transfer mode + * \brief Sets low-level data transfer mode * * \dxpl_id * \param[in] opt_mode Transfer mode * \returns \herr_t * - * \details H5Pset_dxpl_mpio() sets the data transfer property list \p dxpl_id - * to use transfer mode xfer_mode. The property list can then be used - * to control the I/O transfer mode during data I/O operations. - * - * Valid transfer modes are #H5FD_MPIO_INDEPENDENT (default) and - * #H5FD_MPIO_COLLECTIVE. + * \details H5Pset_dxpl_mpio_collective_opt() sets the data transfer property + * list \p dxpl_id to use transfer mode \p opt_mode when performing + * I/O. This allows the application to specify collective I/O at the + * HDF5 interface level (with the H5Pset_dxpl_mpio() API routine), + * while controlling whether the actual I/O is performed collectively + * (e.g., via MPI_File_write_at_all) or independently (e.g., via + * MPI_File_write_at). If the collectivity setting at the HDF5 + * interface level (set via H5Pset_dxpl_mpio()) is not set to + * H5FD_MPIO_COLLECTIVE, this setting will be ignored. + * + * Valid transfer modes are #H5FD_MPIO_COLLECTIVE_IO (default) and + * #H5FD_MPIO_INDIVIDUAL_IO. * * \since 1.4.0 * From b772aeeff5d3a43c3af7a8984b68810bef989237 Mon Sep 17 00:00:00 2001 From: "H. Joe Lee" Date: Tue, 26 Sep 2023 08:47:55 -0500 Subject: [PATCH 05/10] Fix typo: arange->arrange in src/H5Cmpio.c. (#3597) --- src/H5Cmpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/H5Cmpio.c b/src/H5Cmpio.c index e5f65cf5895..d7bf5b1dbda 100644 --- a/src/H5Cmpio.c +++ b/src/H5Cmpio.c @@ -83,7 +83,7 @@ static herr_t H5C__flush_candidates_in_ring(H5F_t *f, H5C_ring_t ring, unsigned * system by increasing the number of processes writing to * adjacent locations in the HDF5 file. * - * To attempt to minimize this, we now arange matters such + * To attempt to minimize this, we now arrange matters such * that each process writes n adjacent entries in the * candidate list, and marks all others clean. We must do * this in such a fashion as to guarantee that each entry From d26d674e676446dd2f785ba2895fa72b78025b6e Mon Sep 17 00:00:00 2001 From: jhendersonHDF Date: Tue, 26 Sep 2023 12:01:47 -0500 Subject: [PATCH 06/10] Fix docs for H5Acreate2 and H5Acreate_by_name (#3598) --- src/H5A.c | 38 +++++++++++++++++++------------------- src/H5Apublic.h | 22 +++++++++++----------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/H5A.c b/src/H5A.c index 2a22bc20977..c183c85eec3 100644 --- a/src/H5A.c +++ b/src/H5A.c @@ -104,7 +104,7 @@ static herr_t H5A__exists_by_name_api_common(hid_t obj_id, const char *obj_name, * * Purpose: This is the common function for creating HDF5 datasets. * - * Return: Success: A attribute ID + * Return: Success: An attribute ID * Failure: H5I_INVALID_HID * *------------------------------------------------------------------------- @@ -146,7 +146,7 @@ H5A__create_common(H5VL_object_t *vol_obj, H5VL_loc_params_t *loc_params, const * * Purpose: This is the common function for creating HDF5 attributes * - * Return: Success: A attribute ID + * Return: Success: An attribute ID * Failure: H5I_INVALID_HID * *------------------------------------------------------------------------- @@ -197,11 +197,11 @@ H5A__create_api_common(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t * hid_t H5Acreate2(loc_id, attr_name, type_id, space_id, acpl_id, * aapl_id) * - * Description: This function creates an attribute which is attached to the + * Description: This function creates an attribute that is attached to the * object specified with 'loc_id'. The name specified with * 'attr_name' for each attribute for an object must be unique * for that object. The 'type_id' and 'space_id' are created - * with the H5T and H5S interfaces respectively. The 'aapl_id' + * with the H5T and H5S interfaces, respectively. The 'aapl_id' * property list is currently unused, but will be used in the * future for optional attribute access properties. The * attribute ID returned from this function must be released @@ -212,8 +212,8 @@ H5A__create_api_common(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t * const char *attr_name; IN: Name of attribute to locate and open * hid_t type_id; IN: ID of datatype for attribute * hid_t space_id; IN: ID of dataspace for attribute - * hid_t acpl_id; IN: ID of creation property list (currently not used) - * hid_t aapl_id; IN: Attribute access property list + * hid_t acpl_id; IN: ID of creation property list + * hid_t aapl_id; IN: ID of Attribute access property list (currently not used) * * Return: Success: An ID for the created attribute * @@ -243,7 +243,7 @@ H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, h * * Purpose: Asynchronous version of H5Acreate * - * Return: Success: A attribute ID + * Return: Success: An attribute ID * Failure: H5I_INVALID_HID * *------------------------------------------------------------------------- @@ -291,7 +291,7 @@ H5Acreate_async(const char *app_file, const char *app_func, unsigned app_line, h * * Purpose: This is the common function for creating HDF5 attributes by name * - * Return: Success: A attribute ID + * Return: Success: An attribute ID * Failure: H5I_INVALID_HID * *------------------------------------------------------------------------- @@ -352,14 +352,14 @@ H5A__create_by_name_api_common(hid_t loc_id, const char *obj_name, const char *a const char *attr_name; IN: Name of attribute to locate and open hid_t type_id; IN: ID of datatype for attribute hid_t space_id; IN: ID of dataspace for attribute - hid_t acpl_id; IN: ID of creation property list (currently not used) - hid_t aapl_id; IN: Attribute access property list + hid_t acpl_id; IN: ID of creation property list + hid_t aapl_id; IN: ID of Attribute access property list (currently not used) hid_t lapl_id; IN: Link access property list RETURNS Non-negative on success/H5I_INVALID_HID on failure DESCRIPTION - This function creates an attribute which is attached to the object + This function creates an attribute that is attached to the object specified with 'loc_id/obj_name'. The name specified with 'attr_name' for each attribute for an object must be unique for that object. The 'type_id' and 'space_id' are created with the H5T and H5S interfaces respectively. @@ -392,7 +392,7 @@ H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid * * Purpose: Asynchronous version of H5Acreate_by_name * - * Return: Success: A attribute ID + * Return: Success: An attribute ID * Failure: H5I_INVALID_HID * *------------------------------------------------------------------------- @@ -652,7 +652,7 @@ H5A__open_by_name_api_common(hid_t loc_id, const char *obj_name, const char *att USAGE hid_t H5Aopen_by_name(loc_id, obj_name, attr_name, aapl_id, lapl_id) hid_t loc_id; IN: Object that attribute is attached to - const char *obj_name; IN: Name of object relative to location + const char *obj_name; IN: Name of the object relative to location const char *attr_name; IN: Name of attribute to locate and open hid_t aapl_id; IN: Attribute access property list hid_t lapl_id; IN: Link access property list @@ -788,7 +788,7 @@ H5A__open_by_idx_api_common(hid_t loc_id, const char *obj_name, H5_index_t idx_t USAGE hid_t H5Aopen_by_idx(loc_id, obj_ame, idx_type, order, n, aapl_id, lapl_id) hid_t loc_id; IN: Object that attribute is attached to - const char *obj_name; IN: Name of object relative to location + const char *obj_name; IN: Name of the object relative to location H5_index_t idx_type; IN: Type of index to use H5_iter_order_t order; IN: Order to iterate over index hsize_t n; IN: Index (0-based) attribute to open @@ -1183,7 +1183,7 @@ H5Aget_type(hid_t attr_id) Gets a copy of the creation property list for an attribute USAGE hssize_t H5Aget_create_plist (attr_id, buf_size, buf) - hid_t attr_id; IN: Attribute to get name of + hid_t attr_id; IN: Attribute to get the name of RETURNS This function returns the ID of a copy of the attribute's creation property list, or H5I_INVALID_HID on failure. @@ -1234,7 +1234,7 @@ H5Aget_create_plist(hid_t attr_id) Gets a copy of the name for an attribute USAGE hssize_t H5Aget_name (attr_id, buf_size, buf) - hid_t attr_id; IN: Attribute to get name of + hid_t attr_id; IN: Attribute to get the name of size_t buf_size; IN: The size of the buffer to store the string in. char *buf; IN: Buffer to store name in RETURNS @@ -1287,7 +1287,7 @@ H5Aget_name(hid_t attr_id, size_t buf_size, char *buf /*out*/) /*------------------------------------------------------------------------- * Function: H5Aget_name_by_idx * - * Purpose: Retrieve name of an attribute, according to the + * Purpose: Retrieve the name of an attribute, according to the * order within an index. * * Same pattern of behavior as H5Iget_name. @@ -1855,7 +1855,7 @@ H5Arename_by_name_async(const char *app_file, const char *app_func, unsigned app The operation receives the ID for the group or dataset being iterated over ('loc_id'), the name of the current attribute about the object ('attr_name'), the attribute's "info" struct ('ainfo') and the pointer to - the operator data passed in to H5Aiterate2 ('op_data'). The return values + the operator data passed into H5Aiterate2 ('op_data'). The return values from an operator are: A. Zero causes the iterator to continue, returning zero when all attributes have been processed. @@ -1943,7 +1943,7 @@ H5Aiterate2(hid_t loc_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *i The operation receives the ID for the group or dataset being iterated over ('loc_id'), the name of the current attribute about the object ('attr_name'), the attribute's "info" struct ('ainfo') and the pointer to - the operator data passed in to H5Aiterate_by_name ('op_data'). The return values + the operator data passed into H5Aiterate_by_name ('op_data'). The return values from an operator are: A. Zero causes the iterator to continue, returning zero when all attributes have been processed. diff --git a/src/H5Apublic.h b/src/H5Apublic.h index 3bef700dd4d..232ae0af64d 100644 --- a/src/H5Apublic.h +++ b/src/H5Apublic.h @@ -40,7 +40,7 @@ typedef struct { * or named datatype being iterated over * \param[in] attr_name The name of the current object attribute * \param[in] ainfo The attribute's info struct - * \param[in,out] op_data A pointer to the operator data passed in to + * \param[in,out] op_data A pointer to the operator data passed into * H5Aiterate2() or H5Aiterate_by_name() * \returns The return values from an operator are: * \li Zero causes the iterator to continue, returning zero when @@ -122,10 +122,10 @@ H5_DLL herr_t H5Aclose_async(hid_t attr_id, hid_t es_id); * The attribute is created with the specified datatype and dataspace, * \p type_id and \p space_id. * - * \plist_unused{acpl} + * \plist_unused{aapl_id} * * The attribute identifier returned by this function must be released - * with H5Aclose() resource leaks will develop. + * with H5Aclose() or resource leaks will develop. * * \note If \p loc_id is a file identifier, the attribute will be attached to * that file's root group. @@ -183,7 +183,7 @@ H5_DLL hid_t H5Acreate_async(hid_t loc_id, const char *attr_name, hid_t type_id * The attribute is created with the specified datatype and * dataspace, \p type_id and \p space_id. * - * \plist_unused{aapl} + * \plist_unused{aapl_id} * * The link access property list, \p lapl_id, may provide * information regarding the properties of links required to access @@ -252,7 +252,7 @@ H5_DLL herr_t H5Adelete(hid_t loc_id, const char *attr_name); * * \return \herr_t * - * \details H5Adelete_by_idx() removes an attribute, specified by its + * \details H5Adelete_by_idx() removes an attribute specified by its * location in an index, from an object. * * The object from which the attribute is to be removed is @@ -638,7 +638,7 @@ H5_DLL hid_t H5Aget_type(hid_t attr_id); * \details H5Aiterate2() iterates over the attributes attached to a * dataset, named datatype, or group, as specified by \p loc_id. * For each attribute, user-provided data, \p op_data, with - * additional information as defined below, is passed to a + * additional information, as defined below, is passed to a * user-defined function, \p op, which operates on that * attribute. * @@ -697,7 +697,7 @@ H5_DLL herr_t H5Aiterate2(hid_t loc_id, H5_index_t idx_type, H5_iter_order_t ord * \details H5Aiterate_by_name() iterates over the attributes attached * to the dataset or group specified with \p loc_id and \p obj_name. * For each attribute, user-provided data, \p op_data, with - * additional information as defined below, is passed to a + * additional information, as defined below, is passed to a * user-defined function, \p op, which operates on that attribute. * * The order of the iteration and the attributes iterated over @@ -747,7 +747,7 @@ H5_DLL herr_t H5Aiterate_by_name(hid_t loc_id, const char *obj_name, H5_index_t * \return \hid_tv{attribute} * * \details H5Aopen() opens an existing attribute, \p attr_name, that is - * attached to object specified by an object identifier, \p obj_id. + * attached to the object specified by an object identifier, \p obj_id. * * \plist_unused{aapl_id} * @@ -1096,7 +1096,7 @@ H5_DLL herr_t H5Arename_by_name(hid_t loc_id, const char *obj_name, const char * * \param[in] location_id The identifier for the group, dataset * or named datatype being iterated over * \param[in] attr_name The name of the current object attribute - * \param[in,out] operator_data A pointer to the operator data passed in to + * \param[in,out] operator_data A pointer to the operator data passed into * H5Aiterate1() * \returns The return values from an operator are: * \li Zero causes the iterator to continue, returning zero when @@ -1177,7 +1177,7 @@ H5_DLL int H5Aget_num_attrs(hid_t loc_id); * \loc_id * \param[in,out] idx Starting (in) and ending (out) attribute index * \param[in] op User's function to pass each attribute to - * \param[in,out] op_data User's data to pass through to iterator operator + * \param[in,out] op_data User's data to pass through to the iterator operator * function * * \return \herr_t @@ -1220,7 +1220,7 @@ H5_DLL herr_t H5Aiterate1(hid_t loc_id, unsigned *idx, H5A_operator1_t op, void * object specified with \p loc_id. The location object may be * either a group, dataset, or named datatype, all of which may * have any sort of attribute. The attribute specified by the index, - * \p idx , indicates the attribute to access. The value of \p idx + * \p idx, indicates the attribute to access. The value of \p idx * is a 0-based, non-negative integer. The attribute identifier * returned from this function must be released with H5Aclose() * or resource leaks will develop. From 58f3d6664e7a2af8d6b1813374ab02d72795a5e1 Mon Sep 17 00:00:00 2001 From: Dana Robinson <43805+derobins@users.noreply.github.com> Date: Tue, 26 Sep 2023 11:38:07 -0700 Subject: [PATCH 07/10] Use HDoff_t with lseek consistently (#3600) lseek on Windows uses __int64 for both the offset and return type instead of off_t like most POSIX systems. This changes ensures we use HDoff_t (which is typdef'd correctly on Windows) w/ lseek. --- src/H5FDcore.c | 2 +- test/atomic_reader.c | 2 +- test/atomic_writer.c | 2 +- test/big.c | 4 ++-- test/dsets.c | 4 ++-- test/file_image.c | 2 +- test/istore.c | 2 +- tools/src/h5jam/h5jam.c | 6 +++--- tools/test/misc/h5clear_gentest.c | 4 ++-- tools/test/perform/iopipe.c | 6 +++--- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/H5FDcore.c b/src/H5FDcore.c index 5cc17feb9c7..0f305140ce8 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -362,7 +362,7 @@ H5FD__core_write_to_bstore(H5FD_core_t *file, haddr_t addr, size_t size) #ifndef H5_HAVE_PREADWRITE /* Seek to the correct location (if we don't have pwrite) */ - if ((HDoff_t)addr != HDlseek(file->fd, (off_t)addr, SEEK_SET)) + if ((HDoff_t)addr != HDlseek(file->fd, (HDoff_t)addr, SEEK_SET)) HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "error seeking in backing store"); #endif /* H5_HAVE_PREADWRITE */ diff --git a/test/atomic_reader.c b/test/atomic_reader.c index c8bbbaef079..12e2d5cd6e9 100644 --- a/test/atomic_reader.c +++ b/test/atomic_reader.c @@ -114,7 +114,7 @@ verify(int fd, unsigned int k) } /* end if */ /* Position the file at the beginning */ - if (lseek(fd, (off_t)0, SEEK_SET) < 0) { + if (lseek(fd, 0, SEEK_SET) < 0) { printf("READER: error from lseek\n"); goto error; } /* end if */ diff --git a/test/atomic_writer.c b/test/atomic_writer.c index 33252f161ea..89edfe75e57 100644 --- a/test/atomic_writer.c +++ b/test/atomic_writer.c @@ -190,7 +190,7 @@ main(int argc, char *argv[]) buf[u] = n; /* Position the file to the proper location */ - if (lseek(fd, (off_t)(n * sizeof(unsigned int)), SEEK_SET) < 0) { + if (lseek(fd, (n * sizeof(unsigned int)), SEEK_SET) < 0) { printf("WRITER: error from lseek\n"); goto error; } /* end if */ diff --git a/test/big.c b/test/big.c index fc422b1d8a9..428da0aed11 100644 --- a/test/big.c +++ b/test/big.c @@ -143,7 +143,7 @@ is_sparse(void) if ((fd = HDopen("x.h5", O_RDWR | O_TRUNC | O_CREAT, H5_POSIX_CREATE_MODE_RW)) < 0) return 0; - if (HDlseek(fd, (off_t)(1024 * 1024), SEEK_SET) != 1024 * 1024) + if (HDlseek(fd, (HDoff_t)(1024 * 1024), SEEK_SET) != 1024 * 1024) return 0; if (5 != HDwrite(fd, "hello", (size_t)5)) return 0; @@ -267,7 +267,7 @@ enough_room(hid_t fapl) if ((fd[i] = HDopen(name, O_RDWR | O_CREAT | O_TRUNC, H5_POSIX_CREATE_MODE_RW)) < 0) { goto done; } - if ((off_t)size != HDlseek(fd[i], (off_t)size, SEEK_SET)) { + if ((HDoff_t)size != HDlseek(fd[i], (HDoff_t)size, SEEK_SET)) { goto done; } if (1 != HDwrite(fd[i], "X", (size_t)1)) { diff --git a/test/dsets.c b/test/dsets.c index ecf6db0f9ab..33cb6bfc630 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -626,7 +626,7 @@ test_simple_io(const char *env_h5_drvr, hid_t fapl) file = -1; f = HDopen(filename, O_RDONLY); - HDlseek(f, (off_t)offset, SEEK_SET); + HDlseek(f, (HDoff_t)offset, SEEK_SET); if (HDread(f, rdata_bytes, sizeof(int) * DSET_DIM1 * DSET_DIM2) < 0) goto error; @@ -763,7 +763,7 @@ test_userblock_offset(const char *env_h5_drvr, hid_t fapl, bool new_format) file = -1; f = HDopen(filename, O_RDONLY); - HDlseek(f, (off_t)offset, SEEK_SET); + HDlseek(f, (HDoff_t)offset, SEEK_SET); if (HDread(f, rdata_bytes, sizeof(int) * DSET_DIM1 * DSET_DIM2) < 0) goto error; diff --git a/test/file_image.c b/test/file_image.c index b7d3c2774f9..81b49d6bd4e 100644 --- a/test/file_image.c +++ b/test/file_image.c @@ -871,7 +871,7 @@ test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl HDoff_t off; /* Position at userblock */ - off = HDlseek(fd, (off_t)USERBLOCK_SIZE, SEEK_SET); + off = HDlseek(fd, (HDoff_t)USERBLOCK_SIZE, SEEK_SET); VERIFY(off >= 0, "HDlseek() failed."); } diff --git a/test/istore.c b/test/istore.c index 921d200f3a1..33032d1a22f 100644 --- a/test/istore.c +++ b/test/istore.c @@ -62,7 +62,7 @@ is_sparse(void) if ((fd = HDopen("x.h5", O_RDWR | O_TRUNC | O_CREAT, H5_POSIX_CREATE_MODE_RW)) < 0) return 0; - if (HDlseek(fd, (off_t)(1024 * 1024), SEEK_SET) != 1024 * 1024) + if (HDlseek(fd, (HDoff_t)(1024 * 1024), SEEK_SET) != 1024 * 1024) return 0; if (5 != HDwrite(fd, "hello", (size_t)5)) return 0; diff --git a/tools/src/h5jam/h5jam.c b/tools/src/h5jam/h5jam.c index 9fea8b8547e..d97d339f98d 100644 --- a/tools/src/h5jam/h5jam.c +++ b/tools/src/h5jam/h5jam.c @@ -420,8 +420,8 @@ copy_some_to_file(int infid, int outfid, hsize_t starting, hsize_t startout, ssi } /* end if */ while (howmuch > 0) { - HDlseek(outfid, (off_t)to, SEEK_SET); - HDlseek(infid, (off_t)from, SEEK_SET); + HDlseek(outfid, (HDoff_t)to, SEEK_SET); + HDlseek(infid, (HDoff_t)from, SEEK_SET); if (howmuch > 512) { nchars = HDread(infid, buf, (unsigned)512); @@ -499,7 +499,7 @@ write_pad(int ofile, hsize_t old_where, hsize_t *new_where) buf[0] = '\0'; - HDlseek(ofile, (off_t)old_where, SEEK_SET); + HDlseek(ofile, (HDoff_t)old_where, SEEK_SET); psize = compute_user_block_size(old_where); psize -= old_where; diff --git a/tools/test/misc/h5clear_gentest.c b/tools/test/misc/h5clear_gentest.c index dd4c88d551e..892e9740d27 100644 --- a/tools/test/misc/h5clear_gentest.c +++ b/tools/test/misc/h5clear_gentest.c @@ -274,7 +274,7 @@ gen_enhance_files(bool user) } /* location of "end of file address" */ - if (lseek(fd, (off_t)(28 + (user ? USERBLOCK : 0)), SEEK_SET) < 0) + if (lseek(fd, (HDoff_t)(28 + (user ? USERBLOCK : 0)), SEEK_SET) < 0) goto error; /* Write the bad eoa value to the file */ @@ -282,7 +282,7 @@ gen_enhance_files(bool user) goto error; /* location of "superblock checksum" */ - if (lseek(fd, (off_t)(44 + (user ? USERBLOCK : 0)), SEEK_SET) < 0) + if (lseek(fd, (HDoff_t)(44 + (user ? USERBLOCK : 0)), SEEK_SET) < 0) goto error; /* Write the chksum value to the file */ diff --git a/tools/test/perform/iopipe.c b/tools/test/perform/iopipe.c index a0dd294a94f..b5190fa6767 100644 --- a/tools/test/perform/iopipe.c +++ b/tools/test/perform/iopipe.c @@ -123,7 +123,7 @@ main(void) unsigned u; herr_t H5_ATTR_NDEBUG_UNUSED status; hssize_t H5_ATTR_NDEBUG_UNUSED n; - off_t H5_ATTR_NDEBUG_UNUSED offset; + HDoff_t H5_ATTR_NDEBUG_UNUSED offset; hsize_t start[2]; hsize_t count[2]; @@ -207,7 +207,7 @@ main(void) for (u = 0; u < nwrite; u++) { putc(PROGRESS, stderr); fflush(stderr); - offset = HDlseek(fd, (off_t)0, SEEK_SET); + offset = HDlseek(fd, 0, SEEK_SET); assert(0 == offset); n = HDwrite(fd, the_data, (size_t)(size[0] * size[1])); assert(n >= 0 && (size_t)n == (size[0] * size[1])); @@ -257,7 +257,7 @@ main(void) for (u = 0; u < nread; u++) { putc(PROGRESS, stderr); fflush(stderr); - offset = HDlseek(fd, (off_t)0, SEEK_SET); + offset = HDlseek(fd, 0, SEEK_SET); assert(0 == offset); n = HDread(fd, the_data, (size_t)(size[0] * size[1])); assert(n >= 0 && (size_t)n == (size[0] * size[1])); From a87ca572fed15303ad36adcb6f2203f8297e8277 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Tue, 26 Sep 2023 15:11:22 -0500 Subject: [PATCH 08/10] Replaces HDgetenv with getenv (#3599) --- src/H5.c | 4 ++-- src/H5AC.c | 2 +- src/H5Dint.c | 4 ++-- src/H5Dmpio.c | 2 +- src/H5FDcore.c | 4 ++-- src/H5FDdirect.c | 2 +- src/H5FDlog.c | 2 +- src/H5FDmpio.c | 6 +++--- src/H5FDs3comms.c | 4 ++-- src/H5FDsec2.c | 2 +- src/H5FDsubfiling/H5FDioc.c | 4 ++-- src/H5FDsubfiling/H5FDioc_threads.c | 2 +- src/H5FDsubfiling/H5FDsubfiling.c | 2 +- src/H5FDsubfiling/H5subfiling_common.c | 10 +++++----- src/H5Fint.c | 6 +++--- src/H5PLint.c | 2 +- src/H5PLpath.c | 2 +- src/H5Pfapl.c | 4 ++-- src/H5VLint.c | 2 +- src/H5mpi.c | 2 +- src/H5private.h | 3 --- test/API/H5_api_test.c | 4 ++-- test/API/testhdf5.c | 18 +++++++++--------- test/API/tfile.c | 2 +- test/API/trefer.c | 2 +- test/API/tselect.c | 2 +- test/accum.c | 2 +- test/accum_swmr_reader.c | 2 +- test/app_ref.c | 2 +- test/btree2.c | 2 +- test/cache_image.c | 2 +- test/cork.c | 2 +- test/dangle.c | 2 +- test/dsets.c | 2 +- test/error_test.c | 2 +- test/fheap.c | 2 +- test/filenotclosed.c | 2 +- test/flush1.c | 2 +- test/flush2.c | 2 +- test/flushrefresh.c | 2 +- test/h5test.c | 26 +++++++++++++------------- test/hdfs.c | 2 +- test/links.c | 2 +- test/links_env.c | 4 ++-- test/mf.c | 2 +- test/objcopy.c | 2 +- test/ohdr.c | 2 +- test/onion.c | 2 +- test/page_buffer.c | 2 +- test/reserved.c | 2 +- test/ros3.c | 2 +- test/s3comms.c | 2 +- test/select_io_dset.c | 2 +- test/set_extent.c | 2 +- test/stab.c | 2 +- test/swmr.c | 4 ++-- test/testframe.c | 6 +++--- test/testhdf5.c | 2 +- test/tfile.c | 2 +- test/trefer.c | 2 +- test/tselect.c | 2 +- test/tsohm.c | 2 +- test/ttsafe.c | 2 +- test/vds.c | 2 +- test/vds_env.c | 2 +- test/vfd.c | 2 +- test/vol.c | 10 +++++----- testpar/API/H5_api_test_parallel.c | 4 ++-- testpar/t_pflush1.c | 2 +- testpar/t_pflush2.c | 2 +- testpar/t_subfiling_vfd.c | 10 +++++----- tools/lib/h5tools_utils.c | 2 +- tools/src/h5ls/h5ls.c | 2 +- tools/src/h5perf/pio_engine.c | 6 +++--- tools/src/h5perf/pio_perf.c | 4 ++-- tools/src/h5perf/sio_engine.c | 8 ++++---- tools/src/h5perf/sio_perf.c | 2 +- tools/test/perform/zip_perf.c | 4 ++-- utils/test/swmr_check_compat_vfd.c | 2 +- utils/tools/h5dwalk/h5dwalk.c | 2 +- 80 files changed, 134 insertions(+), 137 deletions(-) diff --git a/src/H5.c b/src/H5.c index c0ebb14e93f..a59c013eac6 100644 --- a/src/H5.c +++ b/src/H5.c @@ -275,7 +275,7 @@ H5_init_library(void) /* Debugging? */ H5__debug_mask("-all"); - H5__debug_mask(HDgetenv("HDF5_DEBUG")); + H5__debug_mask(getenv("HDF5_DEBUG")); done: FUNC_LEAVE_NOAPI(ret_value) @@ -887,7 +887,7 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum) const char *s; /* Environment string for disabling version check */ /* Allow different versions of the header files and library? */ - s = HDgetenv("HDF5_DISABLE_VERSION_CHECK"); + s = getenv("HDF5_DISABLE_VERSION_CHECK"); if (s && isdigit(*s)) disable_version_check = (unsigned int)strtol(s, NULL, 0); diff --git a/src/H5AC.c b/src/H5AC.c index 1ce0a96d8be..802ccddecd8 100644 --- a/src/H5AC.c +++ b/src/H5AC.c @@ -143,7 +143,7 @@ H5AC_init(void) { const char *s; /* String for environment variables */ - s = HDgetenv("H5_COLL_API_SANITY_CHECK"); + s = getenv("H5_COLL_API_SANITY_CHECK"); if (s && isdigit(*s)) { long env_val = strtol(s, NULL, 0); H5_coll_api_sanity_check_g = (0 == env_val) ? false : true; diff --git a/src/H5Dint.c b/src/H5Dint.c index 3f4ff72ccf1..b37d35cfdc5 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -191,8 +191,8 @@ H5D_init(void) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't retrieve pipeline filter"); /* Retrieve the prefixes of VDS and external file from the environment variable */ - H5D_prefix_vds_env = HDgetenv("HDF5_VDS_PREFIX"); - H5D_prefix_ext_env = HDgetenv("HDF5_EXTFILE_PREFIX"); + H5D_prefix_vds_env = getenv("HDF5_VDS_PREFIX"); + H5D_prefix_ext_env = getenv("HDF5_EXTFILE_PREFIX"); done: FUNC_LEAVE_NOAPI(ret_value) diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index 94f2c395065..3bab6be8c15 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -544,7 +544,7 @@ H5D__mpio_debug_init(void) memset(H5D_mpio_debug_flags_s, 0, sizeof(H5D_mpio_debug_flags_s)); /* Retrieve and parse the H5Dmpio debug string */ - debug_str = HDgetenv("H5D_mpio_Debug"); + debug_str = getenv("H5D_mpio_Debug"); if (debug_str) H5D__mpio_parse_debug_str(debug_str); diff --git a/src/H5FDcore.c b/src/H5FDcore.c index 0f305140ce8..08b714dfa34 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -430,7 +430,7 @@ H5FD__core_write_to_bstore(H5FD_core_t *file, haddr_t addr, size_t size) static inline const H5FD_core_fapl_t * H5FD__core_get_default_config(void) { - char *driver = HDgetenv(HDF5_DRIVER); + char *driver = getenv(HDF5_DRIVER); if (driver) { if (!strcmp(driver, "core")) @@ -462,7 +462,7 @@ H5FD_core_init(void) FUNC_ENTER_NOAPI_NOERR /* Check the use disabled file locks environment variable */ - lock_env_var = HDgetenv(HDF5_USE_FILE_LOCKING); + lock_env_var = getenv(HDF5_USE_FILE_LOCKING); if (lock_env_var && !strcmp(lock_env_var, "BEST_EFFORT")) ignore_disabled_file_locks_s = true; /* Override: Ignore disabled locks */ else if (lock_env_var && (!strcmp(lock_env_var, "TRUE") || !strcmp(lock_env_var, "1"))) diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c index b7dd18d05bd..d370cd0b552 100644 --- a/src/H5FDdirect.c +++ b/src/H5FDdirect.c @@ -203,7 +203,7 @@ H5FD_direct_init(void) FUNC_ENTER_NOAPI(H5I_INVALID_HID) /* Check the use disabled file locks environment variable */ - lock_env_var = HDgetenv(HDF5_USE_FILE_LOCKING); + lock_env_var = getenv(HDF5_USE_FILE_LOCKING); if (lock_env_var && !strcmp(lock_env_var, "BEST_EFFORT")) ignore_disabled_file_locks_s = true; /* Override: Ignore disabled locks */ else if (lock_env_var && (!strcmp(lock_env_var, "TRUE") || !strcmp(lock_env_var, "1"))) diff --git a/src/H5FDlog.c b/src/H5FDlog.c index 35374a800bc..8d43dc836a6 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -244,7 +244,7 @@ H5FD_log_init(void) FUNC_ENTER_NOAPI_NOERR /* Check the use disabled file locks environment variable */ - lock_env_var = HDgetenv(HDF5_USE_FILE_LOCKING); + lock_env_var = getenv(HDF5_USE_FILE_LOCKING); if (lock_env_var && !strcmp(lock_env_var, "BEST_EFFORT")) ignore_disabled_file_locks_s = true; /* Override: Ignore disabled locks */ else if (lock_env_var && (!strcmp(lock_env_var, "TRUE") || !strcmp(lock_env_var, "1"))) diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index 9149d2b0809..807af9f3a55 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -280,7 +280,7 @@ H5FD_mpio_init(void) H5FD_MPIO_g = H5FD_register((const H5FD_class_t *)&H5FD_mpio_g, sizeof(H5FD_class_t), false); /* Check if MPI driver has been loaded dynamically */ - env = HDgetenv(HDF5_DRIVER); + env = getenv(HDF5_DRIVER); if (env && !strcmp(env, "mpio")) { int mpi_initialized = 0; @@ -299,7 +299,7 @@ H5FD_mpio_init(void) const char *s; /* String for environment variables */ /* Allow MPI buf-and-file-type optimizations? */ - s = HDgetenv("HDF5_MPI_OPT_TYPES"); + s = getenv("HDF5_MPI_OPT_TYPES"); if (s && isdigit(*s)) H5FD_mpi_opt_types_g = (0 == strtol(s, NULL, 0)) ? false : true; @@ -308,7 +308,7 @@ H5FD_mpio_init(void) memset(H5FD_mpio_debug_flags_s, 0, sizeof(H5FD_mpio_debug_flags_s)); /* Retrieve MPI-IO debugging environment variable */ - s = HDgetenv("H5FD_mpio_Debug"); + s = getenv("H5FD_mpio_Debug"); if (s) H5FD__mpio_parse_debug_str(s); #endif /* H5FDmpio_DEBUG */ diff --git a/src/H5FDs3comms.c b/src/H5FDs3comms.c index 9d6d30ac48d..2255ec00179 100644 --- a/src/H5FDs3comms.c +++ b/src/H5FDs3comms.c @@ -2074,9 +2074,9 @@ H5FD_s3comms_load_aws_profile(const char *profile_name, char *key_id_out, char * #endif #ifdef H5_HAVE_WIN32_API - ret = snprintf(awspath, 117, "%s/.aws/", HDgetenv("USERPROFILE")); + ret = snprintf(awspath, 117, "%s/.aws/", getenv("USERPROFILE")); #else - ret = snprintf(awspath, 117, "%s/.aws/", HDgetenv("HOME")); + ret = snprintf(awspath, 117, "%s/.aws/", getenv("HOME")); #endif if (ret < 0 || (size_t)ret >= 117) HGOTO_ERROR(H5E_ARGS, H5E_CANTCOPY, FAIL, "unable to format home-aws path"); diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index fa48aa3cf46..29616842c15 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -204,7 +204,7 @@ H5FD_sec2_init(void) FUNC_ENTER_NOAPI_NOERR /* Check the use disabled file locks environment variable */ - lock_env_var = HDgetenv(HDF5_USE_FILE_LOCKING); + lock_env_var = getenv(HDF5_USE_FILE_LOCKING); if (lock_env_var && !strcmp(lock_env_var, "BEST_EFFORT")) ignore_disabled_file_locks_s = true; /* Override: Ignore disabled locks */ else if (lock_env_var && (!strcmp(lock_env_var, "TRUE") || !strcmp(lock_env_var, "1"))) diff --git a/src/H5FDsubfiling/H5FDioc.c b/src/H5FDsubfiling/H5FDioc.c index cff80c7829d..39766de6594 100644 --- a/src/H5FDsubfiling/H5FDioc.c +++ b/src/H5FDsubfiling/H5FDioc.c @@ -225,7 +225,7 @@ H5FD_ioc_init(void) H5_SUBFILING_GOTO_ERROR(H5E_ID, H5E_CANTREGISTER, H5I_INVALID_HID, "can't register IOC VFD"); /* Check if IOC VFD has been loaded dynamically */ - env_var = HDgetenv(HDF5_DRIVER); + env_var = getenv(HDF5_DRIVER); if (env_var && !strcmp(env_var, H5FD_IOC_NAME)) { int mpi_initialized = 0; int provided = 0; @@ -1494,7 +1494,7 @@ H5FD__ioc_del(const char *name, hid_t fapl) "can't allocate config file name buffer"); /* Check if a prefix has been set for the configuration file name */ - prefix_env = HDgetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX); + prefix_env = getenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX); /* TODO: No support for subfile directory prefix currently */ /* TODO: Possibly try loading config file prefix from file before deleting */ diff --git a/src/H5FDsubfiling/H5FDioc_threads.c b/src/H5FDsubfiling/H5FDioc_threads.c index 98dd00b916f..0b82b8f15a9 100644 --- a/src/H5FDsubfiling/H5FDioc_threads.c +++ b/src/H5FDsubfiling/H5FDioc_threads.c @@ -167,7 +167,7 @@ initialize_ioc_threads(void *_sf_context) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, (-1), "can't initialize IOC thread queue mutex"); /* Allow experimentation with the number of helper threads */ - if ((env_value = HDgetenv(H5FD_IOC_THREAD_POOL_SIZE)) != NULL) { + if ((env_value = getenv(H5FD_IOC_THREAD_POOL_SIZE)) != NULL) { int value_check = atoi(env_value); if (value_check > 0) { thread_pool_size = (unsigned int)value_check; diff --git a/src/H5FDsubfiling/H5FDsubfiling.c b/src/H5FDsubfiling/H5FDsubfiling.c index 058ac83f6d1..c15fd2c01fd 100644 --- a/src/H5FDsubfiling/H5FDsubfiling.c +++ b/src/H5FDsubfiling/H5FDsubfiling.c @@ -585,7 +585,7 @@ H5FD__subfiling_get_default_config(hid_t fapl_id, H5FD_subfiling_config_t *confi config_out->shared_cfg.stripe_size = H5FD_SUBFILING_DEFAULT_STRIPE_SIZE; config_out->shared_cfg.stripe_count = H5FD_SUBFILING_DEFAULT_STRIPE_COUNT; - if ((h5_require_ioc = HDgetenv("H5_REQUIRE_IOC")) != NULL) { + if ((h5_require_ioc = getenv("H5_REQUIRE_IOC")) != NULL) { int value_check = atoi(h5_require_ioc); if (value_check == 0) config_out->require_ioc = false; diff --git a/src/H5FDsubfiling/H5subfiling_common.c b/src/H5FDsubfiling/H5subfiling_common.c index 0362ab40d89..37fd5efad08 100644 --- a/src/H5FDsubfiling/H5subfiling_common.c +++ b/src/H5FDsubfiling/H5subfiling_common.c @@ -776,7 +776,7 @@ init_subfiling(const char *base_filename, uint64_t file_id, H5FD_subfiling_param new_context->sf_group_comm = MPI_COMM_NULL; /* Check if a prefix has been set for the configuration file name */ - prefix_env = HDgetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX); + prefix_env = getenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX); if (prefix_env) { if (NULL == (new_context->config_file_prefix = strdup(prefix_env))) H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_CANTCOPY, FAIL, "couldn't copy config file prefix string"); @@ -851,7 +851,7 @@ init_subfiling(const char *base_filename, uint64_t file_id, H5FD_subfiling_param char *env_value = NULL; /* Check for a subfiling stripe size setting from the environment */ - if ((env_value = HDgetenv(H5FD_SUBFILING_STRIPE_SIZE))) { + if ((env_value = getenv(H5FD_SUBFILING_STRIPE_SIZE))) { long long stripe_size = -1; errno = 0; @@ -981,7 +981,7 @@ init_app_topology(int64_t sf_context_id, H5FD_subfiling_params_t *subfiling_conf case SELECT_IOC_ONE_PER_NODE: { if (comm_size > 1) { /* Check for an IOC-per-node value set in the environment */ - if ((env_value = HDgetenv(H5FD_SUBFILING_IOC_PER_NODE))) { + if ((env_value = getenv(H5FD_SUBFILING_IOC_PER_NODE))) { errno = 0; ioc_select_val = strtol(env_value, NULL, 0); if ((ERANGE == errno)) { @@ -1178,7 +1178,7 @@ static herr_t get_ioc_selection_criteria_from_env(H5FD_subfiling_ioc_select_t *ioc_selection_type, char **ioc_sel_info_str) { char *opt_value = NULL; - char *env_value = HDgetenv(H5FD_SUBFILING_IOC_SELECTION_CRITERIA); + char *env_value = getenv(H5FD_SUBFILING_IOC_SELECTION_CRITERIA); herr_t ret_value = SUCCEED; assert(ioc_selection_type); @@ -1821,7 +1821,7 @@ init_subfiling_context(subfiling_context_t *sf_context, const char *base_filenam "couldn't allocate space for subfiling filename"); /* Check for a subfile name prefix setting in the environment */ - if ((env_value = HDgetenv(H5FD_SUBFILING_SUBFILE_PREFIX))) { + if ((env_value = getenv(H5FD_SUBFILING_SUBFILE_PREFIX))) { if (NULL == (sf_context->subfile_prefix = strdup(env_value))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "couldn't copy subfile prefix value"); } diff --git a/src/H5Fint.c b/src/H5Fint.c index 2aadccabe46..014f619d8a9 100644 --- a/src/H5Fint.c +++ b/src/H5Fint.c @@ -244,7 +244,7 @@ H5F__parse_file_lock_env_var(htri_t *use_locks) FUNC_ENTER_PACKAGE_NOERR /* Check the file locking environment variable */ - lock_env_var = HDgetenv(HDF5_USE_FILE_LOCKING); + lock_env_var = getenv(HDF5_USE_FILE_LOCKING); if (lock_env_var && (!strcmp(lock_env_var, "FALSE") || !strcmp(lock_env_var, "0"))) *use_locks = false; /* Override: Never use locks */ else if (lock_env_var && (!strcmp(lock_env_var, "TRUE") || !strcmp(lock_env_var, "BEST_EFFORT") || @@ -875,9 +875,9 @@ H5F_prefix_open_file(H5F_t *primary_file, H5F_prefix_open_t prefix_type, const c /* Get the appropriate environment variable */ if (H5F_PREFIX_VDS == prefix_type) - env_prefix = HDgetenv("HDF5_VDS_PREFIX"); + env_prefix = getenv("HDF5_VDS_PREFIX"); else if (H5F_PREFIX_ELINK == prefix_type) - env_prefix = HDgetenv("HDF5_EXT_PREFIX"); + env_prefix = getenv("HDF5_EXT_PREFIX"); else HGOTO_ERROR(H5E_FILE, H5E_BADTYPE, NULL, "prefix type is not sensible"); diff --git a/src/H5PLint.c b/src/H5PLint.c index 23eec72ddf3..23d07506d3e 100644 --- a/src/H5PLint.c +++ b/src/H5PLint.c @@ -140,7 +140,7 @@ H5PL_init(void) * to ignore plugins. The special symbol H5PL_NO_PLUGIN (defined in * H5PLpublic.h) means we don't want to load plugins. */ - if (NULL != (env_var = HDgetenv(HDF5_PLUGIN_PRELOAD))) + if (NULL != (env_var = getenv(HDF5_PLUGIN_PRELOAD))) if (!strcmp(env_var, H5PL_NO_PLUGIN)) { H5PL_plugin_control_mask_g = 0; H5PL_allow_plugins_g = false; diff --git a/src/H5PLpath.c b/src/H5PLpath.c index fafce6220a7..4dd4b17afe7 100644 --- a/src/H5PLpath.c +++ b/src/H5PLpath.c @@ -248,7 +248,7 @@ H5PL__create_path_table(void) /* Retrieve paths from HDF5_PLUGIN_PATH if the user sets it * or from the default paths if it isn't set. */ - env_var = HDgetenv(HDF5_PLUGIN_PATH); + env_var = getenv(HDF5_PLUGIN_PATH); if (NULL == env_var) paths = H5MM_strdup(H5PL_DEFAULT_PATH); else diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index 83381096080..bf448a6bc4a 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -851,7 +851,7 @@ H5P__facc_set_def_driver(void) FUNC_ENTER_PACKAGE /* Check if VFL driver environment variable is set */ - driver_env_var = HDgetenv(HDF5_DRIVER); + driver_env_var = getenv(HDF5_DRIVER); /* Only parse VFL driver string if it's set */ if (driver_env_var && *driver_env_var) { @@ -889,7 +889,7 @@ H5P__facc_set_def_driver(void) } /* end else */ /* Retrieve driver configuration string from environment variable, if set. */ - driver_config_env_var = HDgetenv(HDF5_DRIVER_CONFIG); + driver_config_env_var = getenv(HDF5_DRIVER_CONFIG); driver_prop.driver_id = driver_id; driver_prop.driver_info = NULL; diff --git a/src/H5VLint.c b/src/H5VLint.c index 0b18a7c8371..feb2debd947 100644 --- a/src/H5VLint.c +++ b/src/H5VLint.c @@ -370,7 +370,7 @@ H5VL__set_def_conn(void) } /* end if */ /* Check for environment variable set */ - env_var = HDgetenv(HDF5_VOL_CONNECTOR); + env_var = getenv(HDF5_VOL_CONNECTOR); /* Only parse the string if it's set */ if (env_var && *env_var) { diff --git a/src/H5mpi.c b/src/H5mpi.c index 2cd335df564..005a99aa6ae 100644 --- a/src/H5mpi.c +++ b/src/H5mpi.c @@ -819,7 +819,7 @@ H5_mpio_get_file_sync_required(MPI_File fh, bool *file_sync_required) HGOTO_ERROR(H5E_LIB, H5E_CANTFREE, FAIL, "can't free MPI info"); /* Force setting the flag via env variable (temp solution before the flag is implemented in MPI) */ - sync_env_var = HDgetenv("HDF5_DO_MPI_FILE_SYNC"); + sync_env_var = getenv("HDF5_DO_MPI_FILE_SYNC"); if (sync_env_var && (!strcmp(sync_env_var, "TRUE") || !strcmp(sync_env_var, "1"))) *file_sync_required = true; if (sync_env_var && (!strcmp(sync_env_var, "FALSE") || !strcmp(sync_env_var, "0"))) diff --git a/src/H5private.h b/src/H5private.h index b3e3dc84d44..a77624aea69 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -694,9 +694,6 @@ H5_DLL H5_ATTR_CONST int Nflock(int fd, int operation); #define HDgetdrive() 0 #endif -#ifndef HDgetenv -#define HDgetenv(S) getenv(S) -#endif #ifndef HDgetpid #define HDgetpid() getpid() #endif diff --git a/test/API/H5_api_test.c b/test/API/H5_api_test.c index 98dd260c081..654eb4024ac 100644 --- a/test/API/H5_api_test.c +++ b/test/API/H5_api_test.c @@ -155,12 +155,12 @@ main(int argc, char **argv) seed = (unsigned)HDtime(NULL); srand(seed); - if (NULL == (test_path_prefix = HDgetenv(HDF5_API_TEST_PATH_PREFIX))) + if (NULL == (test_path_prefix = getenv(HDF5_API_TEST_PATH_PREFIX))) test_path_prefix = ""; snprintf(H5_api_test_filename, H5_API_TEST_FILENAME_MAX_LENGTH, "%s%s", test_path_prefix, TEST_FILE_NAME); - if (NULL == (vol_connector_string = HDgetenv(HDF5_VOL_CONNECTOR))) { + if (NULL == (vol_connector_string = getenv(HDF5_VOL_CONNECTOR))) { printf("No VOL connector selected; using native VOL connector\n"); vol_connector_name = "native"; vol_connector_info = NULL; diff --git a/test/API/testhdf5.c b/test/API/testhdf5.c index c2b4260eb9d..ca5d0e41eac 100644 --- a/test/API/testhdf5.c +++ b/test/API/testhdf5.c @@ -121,7 +121,7 @@ getenv_all(MPI_Comm comm, int root, const char *name) /* The root task does the getenv call * and sends the result to the other tasks */ if (mpi_rank == root) { - env = HDgetenv(name); + env = getenv(name); if (env) { len = (int)strlen(env); MPI_Bcast(&len, 1, MPI_INT, root, comm); @@ -158,7 +158,7 @@ getenv_all(MPI_Comm comm, int root, const char *name) /* use original getenv */ if (env) free(env); - env = HDgetenv(name); + env = getenv(name); } /* end if */ return env; @@ -218,7 +218,7 @@ h5_get_libver_fapl(hid_t fapl) char buf[1024]; /* buffer for tokenizing HDF5_DRIVER */ /* Get the environment variable, if it exists */ - env = HDgetenv("HDF5_LIBVER_BOUNDS"); + env = getenv("HDF5_LIBVER_BOUNDS"); #ifdef HDF5_LIBVER_BOUNDS /* Use the environment variable, then the compile-time constant */ if (!env) @@ -280,7 +280,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu /* Determine if driver is set by environment variable. If it is, * only generate a suffix if fixing the filename for the superblock * file. */ - driver_env_var = HDgetenv(HDF5_DRIVER); + driver_env_var = getenv(HDF5_DRIVER); if (driver_env_var && (H5P_DEFAULT == fapl) && subst_for_superblock) fapl = H5P_FILE_ACCESS_DEFAULT; @@ -334,7 +334,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu #endif /* H5_HAVE_PARALLEL */ } else { - if (HDgetenv(HDF5_NOCLEANUP)) + if (getenv(HDF5_NOCLEANUP)) SetTestNoCleanup(); } #endif @@ -382,7 +382,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu * For serial: * First use the environment variable, then try the constant */ - prefix = HDgetenv("HDF5_PREFIX"); + prefix = getenv("HDF5_PREFIX"); #ifdef HDF5_PREFIX if (!prefix) @@ -404,8 +404,8 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu */ char *user, *login; - user = HDgetenv("USER"); - login = HDgetenv("LOGIN"); + user = getenv("USER"); + login = getenv("LOGIN"); subdir = (user ? user : login); if (subdir) { @@ -503,7 +503,7 @@ h5_using_default_driver(const char *drv_name) assert(H5_DEFAULT_VFD == H5FD_SEC2); if (!drv_name) - drv_name = HDgetenv(HDF5_DRIVER); + drv_name = getenv(HDF5_DRIVER); if (drv_name) return (!strcmp(drv_name, "sec2") || !strcmp(drv_name, "nomatch")); diff --git a/test/API/tfile.c b/test/API/tfile.c index d404a825f24..a3b2f6cd2fa 100644 --- a/test/API/tfile.c +++ b/test/API/tfile.c @@ -8260,7 +8260,7 @@ test_file(void) MESSAGE(5, ("Testing Low-Level File I/O\n")); /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/API/trefer.c b/test/API/trefer.c index 69b9bbf1081..e8abe16779b 100644 --- a/test/API/trefer.c +++ b/test/API/trefer.c @@ -3571,7 +3571,7 @@ test_reference(void) MESSAGE(5, ("Testing References\n")); /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/API/tselect.c b/test/API/tselect.c index befa360c6c1..17da4c6f726 100644 --- a/test/API/tselect.c +++ b/test/API/tselect.c @@ -16093,7 +16093,7 @@ test_select(void) MESSAGE(5, ("Testing Selections\n")); /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/accum.c b/test/accum.c index e3e79de00a2..5a19efeebf5 100644 --- a/test/accum.c +++ b/test/accum.c @@ -2077,7 +2077,7 @@ test_swmr_write_big(bool newest_format) /* Skip this test if SWMR I/O is not supported for the VFD specified * by the environment variable. */ - driver = HDgetenv(HDF5_DRIVER); + driver = getenv(HDF5_DRIVER); if (!H5FD__supports_swmr_test(driver)) { SKIPPED(); puts(" Test skipped due to VFD not supporting SWMR I/O."); diff --git a/test/accum_swmr_reader.c b/test/accum_swmr_reader.c index a6065063610..5b3ecd8a7fc 100644 --- a/test/accum_swmr_reader.c +++ b/test/accum_swmr_reader.c @@ -56,7 +56,7 @@ main(void) /* Skip this test if SWMR I/O is not supported for the VFD specified * by the environment variable. */ - driver = HDgetenv(HDF5_DRIVER); + driver = getenv(HDF5_DRIVER); if (!H5FD__supports_swmr_test(driver)) return EXIT_SUCCESS; diff --git a/test/app_ref.c b/test/app_ref.c index 5e52fe7ddda..729862ee39f 100644 --- a/test/app_ref.c +++ b/test/app_ref.c @@ -94,7 +94,7 @@ main(void) TESTING("library shutdown with reference count > 1"); /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/btree2.c b/test/btree2.c index 8970d894ccd..3ad30ac9f1a 100644 --- a/test/btree2.c +++ b/test/btree2.c @@ -9918,7 +9918,7 @@ main(void) const char *envval = NULL; bool api_ctx_pushed = false; /* Whether API context pushed */ - envval = HDgetenv(HDF5_DRIVER); + envval = getenv(HDF5_DRIVER); if (envval == NULL) envval = "nomatch"; diff --git a/test/cache_image.c b/test/cache_image.c index 4768916e8ea..60e23984366 100644 --- a/test/cache_image.c +++ b/test/cache_image.c @@ -7758,7 +7758,7 @@ main(void) int express_test; /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/cork.c b/test/cork.c index 98abdec7137..e0a7196b601 100644 --- a/test/cork.c +++ b/test/cork.c @@ -2234,7 +2234,7 @@ main(void) /* Skip these tests if SWMR I/O is not supported for the VFD specified * by the environment variable. */ - driver = HDgetenv(HDF5_DRIVER); + driver = getenv(HDF5_DRIVER); if (!H5FD__supports_swmr_test(driver)) { puts("-- SKIPPED SWMR tests for SWMR-incompatible VFD --"); continue; diff --git a/test/dangle.c b/test/dangle.c index 490bb2f2a9d..4079fce6f51 100644 --- a/test/dangle.c +++ b/test/dangle.c @@ -627,7 +627,7 @@ main(void) int nerrors = 0; /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/dsets.c b/test/dsets.c index 33cb6bfc630..9bebbb851b5 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -15427,7 +15427,7 @@ main(void) int i; /* Don't run this test using certain file drivers */ - envval = HDgetenv(HDF5_DRIVER); + envval = getenv(HDF5_DRIVER); if (envval == NULL) envval = "nomatch"; diff --git a/test/error_test.c b/test/error_test.c index 9fe81176f28..57b1eb7a6b3 100644 --- a/test/error_test.c +++ b/test/error_test.c @@ -786,7 +786,7 @@ main(void) int i; /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/fheap.c b/test/fheap.c index 337e3877bbf..19a1e6adc16 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -15963,7 +15963,7 @@ main(void) bool api_ctx_pushed = false; /* Whether API context pushed */ /* Don't run this test using certain file drivers */ - envval = HDgetenv(HDF5_DRIVER); + envval = getenv(HDF5_DRIVER); if (envval == NULL) envval = "nomatch"; diff --git a/test/filenotclosed.c b/test/filenotclosed.c index a838a89fd87..806a7a498d9 100644 --- a/test/filenotclosed.c +++ b/test/filenotclosed.c @@ -63,7 +63,7 @@ main(void) bool contig_addr_vfd; /* Contiguous address vfd */ /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/flush1.c b/test/flush1.c index 4adddabec57..566d5614c9c 100644 --- a/test/flush1.c +++ b/test/flush1.c @@ -188,7 +188,7 @@ main(void) TEST_ERROR; /* Check if the current VFD supports SWMR */ - driver = HDgetenv(HDF5_DRIVER); + driver = getenv(HDF5_DRIVER); vfd_supports_swmr = H5FD__supports_swmr_test(driver); /*************************************************/ diff --git a/test/flush2.c b/test/flush2.c index c807612ecdc..ccec232e3d7 100644 --- a/test/flush2.c +++ b/test/flush2.c @@ -236,7 +236,7 @@ main(void) PUTS_ERROR("bad vfd-dependent fapl"); /* Check if the current VFD supports SWMR */ - driver = HDgetenv(HDF5_DRIVER); + driver = getenv(HDF5_DRIVER); vfd_supports_swmr = H5FD__supports_swmr_test(driver); if (h5_driver_is_default_vfd_compatible(fapl_id, &driver_is_default_vfd_compatible) < 0) { diff --git a/test/flushrefresh.c b/test/flushrefresh.c index ce94026066b..297db60e7ac 100644 --- a/test/flushrefresh.c +++ b/test/flushrefresh.c @@ -146,7 +146,7 @@ main(int argc, char *argv[]) * anything. */ /* Determine driver being used */ - envval = HDgetenv(HDF5_DRIVER); + envval = getenv(HDF5_DRIVER); if (envval == NULL || H5FD__supports_swmr_test(envval)) { if (test_flush() != SUCCEED) diff --git a/test/h5test.c b/test/h5test.c index 21585f7b4e7..e7e9ec96429 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -467,7 +467,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu /* Determine if driver is set by environment variable. If it is, * only generate a suffix if fixing the filename for the superblock * file. */ - driver_env_var = HDgetenv(HDF5_DRIVER); + driver_env_var = getenv(HDF5_DRIVER); if (driver_env_var && (H5P_DEFAULT == fapl) && subst_for_superblock) fapl = H5P_FILE_ACCESS_DEFAULT; @@ -526,7 +526,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu #endif /* H5_HAVE_PARALLEL */ } else { - if (HDgetenv(HDF5_NOCLEANUP)) + if (getenv(HDF5_NOCLEANUP)) SetTestNoCleanup(); } @@ -574,7 +574,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu * For serial: * First use the environment variable, then try the constant */ - prefix = HDgetenv("HDF5_PREFIX"); + prefix = getenv("HDF5_PREFIX"); #ifdef HDF5_PREFIX if (!prefix) @@ -596,8 +596,8 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu */ char *user, *login; - user = HDgetenv("USER"); - login = HDgetenv("LOGIN"); + user = getenv("USER"); + login = getenv("LOGIN"); subdir = (user ? user : login); if (subdir) { @@ -787,7 +787,7 @@ h5_get_libver_fapl(hid_t fapl) char buf[1024]; /* buffer for tokenizing HDF5_DRIVER */ /* Get the environment variable, if it exists */ - env = HDgetenv("HDF5_LIBVER_BOUNDS"); + env = getenv("HDF5_LIBVER_BOUNDS"); #ifdef HDF5_LIBVER_BOUNDS /* Use the environment variable, then the compile-time constant */ if (!env) @@ -925,7 +925,7 @@ h5_set_info_object(void) int ret_value = 0; /* handle any MPI INFO hints via $HDF5_MPI_INFO */ - if ((envp = HDgetenv("HDF5_MPI_INFO")) != NULL) { + if ((envp = getenv("HDF5_MPI_INFO")) != NULL) { char *next, *valp; valp = envp = next = strdup(envp); @@ -1088,7 +1088,7 @@ h5_get_file_size(const char *filename, hid_t fapl) h5_stat_size_t tot_size = 0; char *driver_env_var = NULL; - driver_env_var = HDgetenv(HDF5_DRIVER); + driver_env_var = getenv(HDF5_DRIVER); if (driver_env_var && !strcmp(driver_env_var, "split")) { for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) { if (mt != H5FD_MEM_DRAW && mt != H5FD_MEM_SUPER) @@ -1302,7 +1302,7 @@ getenv_all(MPI_Comm comm, int root, const char *name) /* The root task does the getenv call * and sends the result to the other tasks */ if (mpi_rank == root) { - env = HDgetenv(name); + env = getenv(name); if (env) { len = (int)strlen(env); MPI_Bcast(&len, 1, MPI_INT, root, comm); @@ -1339,7 +1339,7 @@ getenv_all(MPI_Comm comm, int root, const char *name) /* use original getenv */ if (env) free(env); - env = HDgetenv(name); + env = getenv(name); } /* end if */ return env; @@ -1917,7 +1917,7 @@ H5_get_srcdir_filename(const char *filename) const char * H5_get_srcdir(void) { - const char *srcdir = HDgetenv("srcdir"); + const char *srcdir = getenv("srcdir"); /* Check for using the srcdir from configure time */ if (NULL == srcdir) @@ -2076,7 +2076,7 @@ h5_using_default_driver(const char *drv_name) assert(H5_DEFAULT_VFD == H5FD_SEC2); if (!drv_name) - drv_name = HDgetenv(HDF5_DRIVER); + drv_name = getenv(HDF5_DRIVER); if (drv_name) return (!strcmp(drv_name, "sec2") || !strcmp(drv_name, "nomatch")); @@ -2197,7 +2197,7 @@ h5_driver_uses_multiple_files(const char *drv_name, unsigned flags) bool ret_val = false; if (!drv_name) - drv_name = HDgetenv(HDF5_DRIVER); + drv_name = getenv(HDF5_DRIVER); if (drv_name) { if ((flags & H5_EXCLUDE_MULTIPART_DRIVERS) == 0) { diff --git a/test/hdfs.c b/test/hdfs.c index fe876fa5c31..857a54c9c12 100644 --- a/test/hdfs.c +++ b/test/hdfs.c @@ -1579,7 +1579,7 @@ main(void) static char hdfs_namenode_name[HDFS_NAMENODE_NAME_MAX_SIZE] = ""; const char *hdfs_namenode_name_env = NULL; - hdfs_namenode_name_env = HDgetenv("HDFS_TEST_NAMENODE_NAME"); + hdfs_namenode_name_env = getenv("HDFS_TEST_NAMENODE_NAME"); if (hdfs_namenode_name_env == NULL || hdfs_namenode_name_env[0] == '\0') { strncpy(hdfs_namenode_name, "localhost", HDFS_NAMENODE_NAME_MAX_SIZE); } diff --git a/test/links.c b/test/links.c index d7074301893..6f07d32253e 100644 --- a/test/links.c +++ b/test/links.c @@ -22656,7 +22656,7 @@ main(void) const char *env_h5_drvr; /* File Driver value from environment */ bool driver_is_default_compatible; - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/links_env.c b/test/links_env.c index 3c67623a14c..1eae52a5128 100644 --- a/test/links_env.c +++ b/test/links_env.c @@ -61,7 +61,7 @@ external_link_env(hid_t fapl, bool new_format) else TESTING("external links via environment variable"); - if ((envval = HDgetenv("HDF5_EXT_PREFIX")) == NULL) + if ((envval = getenv("HDF5_EXT_PREFIX")) == NULL) envval = "nomatch"; if (strcmp(envval, ".:tmp_links_env") != 0) TEST_ERROR; @@ -149,7 +149,7 @@ main(void) int nerrors = 0; /* Error from tests */ /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/mf.c b/test/mf.c index 6399caf24c7..d58cbfda067 100644 --- a/test/mf.c +++ b/test/mf.c @@ -9134,7 +9134,7 @@ main(void) bool api_ctx_pushed = false; /* Whether API context pushed */ /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/objcopy.c b/test/objcopy.c index 2afff4be94c..d604c540b83 100644 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -17128,7 +17128,7 @@ main(void) bool same_file; /* Whether to run tests that only use one file */ bool driver_is_default_compatible; - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/ohdr.c b/test/ohdr.c index 7d8eb75941a..99b979b0777 100644 --- a/test/ohdr.c +++ b/test/ohdr.c @@ -1839,7 +1839,7 @@ main(void) herr_t ret; /* Generic return value */ /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/onion.c b/test/onion.c index bbbcaf54fac..a2bdda3723b 100644 --- a/test/onion.c +++ b/test/onion.c @@ -4918,7 +4918,7 @@ main(void) /* The onion VFD only supports the sec2 VFD under the hood, so skip this * test when the environment variable has been set to something else */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; if ((0 != strcmp(env_h5_drvr, "nomatch")) && (0 != strcmp(env_h5_drvr, "sec2"))) { diff --git a/test/page_buffer.c b/test/page_buffer.c index 65f2038cbbd..651e84a348c 100644 --- a/test/page_buffer.c +++ b/test/page_buffer.c @@ -2072,7 +2072,7 @@ main(void) h5_reset(); /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/reserved.c b/test/reserved.c index ff37baf034f..5540d044b62 100644 --- a/test/reserved.c +++ b/test/reserved.c @@ -466,7 +466,7 @@ main(void) hid_t fapl; const char *envval = NULL; - envval = HDgetenv(HDF5_DRIVER); + envval = getenv(HDF5_DRIVER); if (envval == NULL) envval = "nomatch"; /* QAK: should be able to use the core driver? */ diff --git a/test/ros3.c b/test/ros3.c index 5ab2dec5c0f..cc058fbc9b0 100644 --- a/test/ros3.c +++ b/test/ros3.c @@ -1695,7 +1695,7 @@ main(void) * initialize test urls * ************************/ - bucket_url_env = HDgetenv("HDF5_ROS3_TEST_BUCKET_URL"); + bucket_url_env = getenv("HDF5_ROS3_TEST_BUCKET_URL"); if (bucket_url_env == NULL || bucket_url_env[0] == '\0') { printf("WARNING: S3 bucket url is not defined in environment " "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n"); diff --git a/test/s3comms.c b/test/s3comms.c index b9b28020b39..40f163e8ef2 100644 --- a/test/s3comms.c +++ b/test/s3comms.c @@ -2520,7 +2520,7 @@ main(void) s3_test_credentials_loaded = 1; } - bucket_url_env = HDgetenv("HDF5_ROS3_TEST_BUCKET_URL"); + bucket_url_env = getenv("HDF5_ROS3_TEST_BUCKET_URL"); if (bucket_url_env == NULL || bucket_url_env[0] == '\0') { printf("WARNING: S3 bucket url is not defined in environment " "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n"); diff --git a/test/select_io_dset.c b/test/select_io_dset.c index 4c671909a8b..d75b76becdb 100644 --- a/test/select_io_dset.c +++ b/test/select_io_dset.c @@ -2859,7 +2859,7 @@ test_no_selection_io_cause_mode(const char *filename, hid_t fapl, uint32_t test_ /* The split and multi driver are not compatible with page buffering. No message since the other * cases aren't skipped. */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr && (!strcmp(env_h5_drvr, "split") || !strcmp(env_h5_drvr, "multi"))) return 0; } diff --git a/test/set_extent.c b/test/set_extent.c index 08b96a5837f..d418f2edc71 100644 --- a/test/set_extent.c +++ b/test/set_extent.c @@ -113,7 +113,7 @@ main(void) const char *env_h5_drvr; /* File Driver value from environment */ bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; /* Current VFD that does not support contiguous address space */ diff --git a/test/stab.c b/test/stab.c index e43e9c0b262..1b7da018822 100644 --- a/test/stab.c +++ b/test/stab.c @@ -1381,7 +1381,7 @@ main(void) int nerrors = 0; /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/swmr.c b/test/swmr.c index e7eec671d23..68bf024d418 100644 --- a/test/swmr.c +++ b/test/swmr.c @@ -7742,7 +7742,7 @@ main(void) /* Skip this test if SWMR I/O is not supported for the VFD specified * by the environment variable. */ - driver = HDgetenv(HDF5_DRIVER); + driver = getenv(HDF5_DRIVER); if (!H5FD__supports_swmr_test(driver)) { printf("This VFD does not support SWMR I/O\n"); return EXIT_SUCCESS; @@ -7752,7 +7752,7 @@ main(void) * about file locking. File locking should be used unless explicitly * disabled. */ - lock_env_var = HDgetenv(HDF5_USE_FILE_LOCKING); + lock_env_var = getenv(HDF5_USE_FILE_LOCKING); if (lock_env_var && !strcmp(lock_env_var, "FALSE")) use_file_locking = false; else diff --git a/test/testframe.c b/test/testframe.c index 13cdf0eb3ec..2b650270f3a 100644 --- a/test/testframe.c +++ b/test/testframe.c @@ -445,7 +445,7 @@ GetTestExpress(void) #endif /* Check if HDF5TestExpress is set to override the default level */ - env_val = HDgetenv("HDF5TestExpress"); + env_val = getenv("HDF5TestExpress"); if (env_val) { if (strcmp(env_val, "0") == 0) express_val = 0; @@ -633,8 +633,8 @@ void TestAlarmOn(void) { #ifdef H5_HAVE_ALARM - char *env_val = HDgetenv("HDF5_ALARM_SECONDS"); /* Alarm environment */ - unsigned long alarm_sec = H5_ALARM_SEC; /* Number of seconds before alarm goes off */ + char *env_val = getenv("HDF5_ALARM_SECONDS"); /* Alarm environment */ + unsigned long alarm_sec = H5_ALARM_SEC; /* Number of seconds before alarm goes off */ /* Get the alarm value from the environment variable, if set */ if (env_val != NULL) diff --git a/test/testhdf5.c b/test/testhdf5.c index 82bc2b6ccec..93da1d8ded5 100644 --- a/test/testhdf5.c +++ b/test/testhdf5.c @@ -80,7 +80,7 @@ main(int argc, char *argv[]) TestSummary(); /* Clean up test files, if allowed */ - if (GetTestCleanup() && !HDgetenv(HDF5_NOCLEANUP)) + if (GetTestCleanup() && !getenv(HDF5_NOCLEANUP)) TestCleanup(); /* Release test infrastructure */ diff --git a/test/tfile.c b/test/tfile.c index e5183bb05ae..3e1fa852246 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -8123,7 +8123,7 @@ test_file(void) MESSAGE(5, ("Testing Low-Level File I/O\n")); /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/trefer.c b/test/trefer.c index d69e4b13daf..f17e114fd67 100644 --- a/test/trefer.c +++ b/test/trefer.c @@ -3564,7 +3564,7 @@ test_reference(void) MESSAGE(5, ("Testing References\n")); /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/tselect.c b/test/tselect.c index c8450ccd1db..f3d08efdf93 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -16057,7 +16057,7 @@ test_select(void) MESSAGE(5, ("Testing Selections\n")); /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/tsohm.c b/test/tsohm.c index e507fb94b2e..b3f48d323d1 100644 --- a/test/tsohm.c +++ b/test/tsohm.c @@ -3716,7 +3716,7 @@ test_sohm(void) MESSAGE(5, ("Testing Shared Object Header Messages\n")); /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/ttsafe.c b/test/ttsafe.c index ce53cce2ef9..6fe14fcc390 100644 --- a/test/ttsafe.c +++ b/test/ttsafe.c @@ -131,7 +131,7 @@ main(int argc, char *argv[]) TestSummary(); /* Clean up test files, if allowed */ - if (GetTestCleanup() && !HDgetenv(HDF5_NOCLEANUP)) + if (GetTestCleanup() && !getenv(HDF5_NOCLEANUP)) TestCleanup(); /* Release test infrastructure */ diff --git a/test/vds.c b/test/vds.c index 167fbffda43..c2546e57f00 100644 --- a/test/vds.c +++ b/test/vds.c @@ -12320,7 +12320,7 @@ main(void) bool driver_is_parallel; int nerrors = 0; - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/vds_env.c b/test/vds_env.c index bf306977ef9..e9649566fd9 100644 --- a/test/vds_env.c +++ b/test/vds_env.c @@ -331,7 +331,7 @@ main(void) bool driver_is_parallel; int nerrors = 0; - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/test/vfd.c b/test/vfd.c index ca748c0f7b7..5a86920652e 100644 --- a/test/vfd.c +++ b/test/vfd.c @@ -5880,7 +5880,7 @@ main(void) * specific VFD to be set and HDF5_DRIVER being set can interfere * with that. */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr) { printf(" -- SKIPPED VFD tests because %s is set -- \n", HDF5_DRIVER); exit(EXIT_SUCCESS); diff --git a/test/vol.c b/test/vol.c index b8c1e03444f..43336c6c978 100644 --- a/test/vol.c +++ b/test/vol.c @@ -2093,7 +2093,7 @@ test_async_vol_props(void) FAIL_STACK_ERROR; /* Override possible environment variable & re-initialize default VOL connector */ - conn_env_str = HDgetenv(HDF5_VOL_CONNECTOR); + conn_env_str = getenv(HDF5_VOL_CONNECTOR); if (conn_env_str) { if (NULL == (conn_env_str = strdup(conn_env_str))) TEST_ERROR; @@ -2256,7 +2256,7 @@ test_vol_cap_flags(void) TEST_ERROR; /* If using the native VOL by default, check flags again with H5P_DEFAULT */ - vol_env = HDgetenv(HDF5_VOL_CONNECTOR); + vol_env = getenv(HDF5_VOL_CONNECTOR); if (!vol_env || (0 == strcmp(vol_env, "native"))) { H5VL_class_t *cls; hid_t connector_id; @@ -2338,8 +2338,8 @@ test_get_vol_name(void) TESTING("getting connector name"); - conn_env_str = HDgetenv(HDF5_VOL_CONNECTOR); - if (NULL == (conn_env_str = HDgetenv("HDF5_VOL_CONNECTOR"))) + conn_env_str = getenv(HDF5_VOL_CONNECTOR); + if (NULL == (conn_env_str = getenv("HDF5_VOL_CONNECTOR"))) conn_env_str = "native"; /* Skip the connectors other than the native and pass_through connector */ @@ -2629,7 +2629,7 @@ main(void) int nerrors = 0; /* Get the VFD to use */ - env_h5_drvr = HDgetenv(HDF5_DRIVER); + env_h5_drvr = getenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; diff --git a/testpar/API/H5_api_test_parallel.c b/testpar/API/H5_api_test_parallel.c index 92fe7228b2b..224c1b8a7c4 100644 --- a/testpar/API/H5_api_test_parallel.c +++ b/testpar/API/H5_api_test_parallel.c @@ -236,13 +236,13 @@ main(int argc, char **argv) srand(seed); - if (NULL == (test_path_prefix = HDgetenv(HDF5_API_TEST_PATH_PREFIX))) + if (NULL == (test_path_prefix = getenv(HDF5_API_TEST_PATH_PREFIX))) test_path_prefix = ""; snprintf(H5_api_test_parallel_filename, H5_API_TEST_FILENAME_MAX_LENGTH, "%s%s", test_path_prefix, PARALLEL_TEST_FILE_NAME); - if (NULL == (vol_connector_string = HDgetenv(HDF5_VOL_CONNECTOR))) { + if (NULL == (vol_connector_string = getenv(HDF5_VOL_CONNECTOR))) { if (MAINPROCESS) printf("No VOL connector selected; using native VOL connector\n"); vol_connector_name = "native"; diff --git a/testpar/t_pflush1.c b/testpar/t_pflush1.c index a0771a8bf68..a61e6749a53 100644 --- a/testpar/t_pflush1.c +++ b/testpar/t_pflush1.c @@ -121,7 +121,7 @@ main(int argc, char *argv[]) TESTING("H5Fflush (part1)"); /* Don't run using the split VFD */ - envval = HDgetenv(HDF5_DRIVER); + envval = getenv(HDF5_DRIVER); if (envval == NULL) envval = "nomatch"; diff --git a/testpar/t_pflush2.c b/testpar/t_pflush2.c index ea544f956db..95ad1257801 100644 --- a/testpar/t_pflush2.c +++ b/testpar/t_pflush2.c @@ -146,7 +146,7 @@ main(int argc, char *argv[]) TESTING("H5Fflush (part2 with flush)"); /* Don't run using the split VFD */ - envval = HDgetenv(HDF5_DRIVER); + envval = getenv(HDF5_DRIVER); if (envval == NULL) envval = "nomatch"; diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index 7d0665d45bd..bdabdf6463e 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -2072,13 +2072,13 @@ parse_subfiling_env_vars(void) { char *env_value; - if (NULL != (env_value = HDgetenv(H5FD_SUBFILING_STRIPE_SIZE))) { + if (NULL != (env_value = getenv(H5FD_SUBFILING_STRIPE_SIZE))) { stripe_size_g = strtoll(env_value, NULL, 0); if ((ERANGE == errno) || (stripe_size_g <= 0)) stripe_size_g = -1; } - if (NULL != (env_value = HDgetenv(H5FD_SUBFILING_IOC_PER_NODE))) { + if (NULL != (env_value = getenv(H5FD_SUBFILING_IOC_PER_NODE))) { ioc_per_node_g = strtol(env_value, NULL, 0); if ((ERANGE == errno) || (ioc_per_node_g <= 0)) ioc_per_node_g = -1; @@ -2092,13 +2092,13 @@ parse_subfiling_env_vars(void) ioc_per_node_g = node_local_size; } - if (NULL != (env_value = HDgetenv(H5FD_IOC_THREAD_POOL_SIZE))) { + if (NULL != (env_value = getenv(H5FD_IOC_THREAD_POOL_SIZE))) { ioc_thread_pool_size_g = atoi(env_value); if (ioc_thread_pool_size_g <= 0) ioc_thread_pool_size_g = -1; } - if (NULL != (env_value = HDgetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX))) { + if (NULL != (env_value = getenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX))) { assert(config_dir); strncpy(config_dir, env_value, PATH_MAX); @@ -2347,7 +2347,7 @@ main(int argc, char **argv) must_unset_ioc_thread_count_env = true; } - if (!(env_value = HDgetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX))) { + if (!(env_value = getenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX))) { int rand_value = 0; if (MAINPROCESS) diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c index 5820610d411..dfffac67385 100644 --- a/tools/lib/h5tools_utils.c +++ b/tools/lib/h5tools_utils.c @@ -994,7 +994,7 @@ h5tools_getenv_update_hyperslab_bufsize(void) int ret_value = 1; /* check if environment variable is set for the hyperslab buffer size */ - if (NULL != (env_str = HDgetenv("H5TOOLS_BUFSIZE"))) { + if (NULL != (env_str = getenv("H5TOOLS_BUFSIZE"))) { errno = 0; hyperslab_bufsize_mb = strtol(env_str, (char **)NULL, 10); if (errno != 0 || hyperslab_bufsize_mb <= 0) diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c index ae002a31761..04c5ff3c02b 100644 --- a/tools/src/h5ls/h5ls.c +++ b/tools/src/h5ls/h5ls.c @@ -2529,7 +2529,7 @@ get_width(void) /* Try to get it from the COLUMNS environment variable first since it's * value is sometimes wrong. */ - if ((s = HDgetenv("COLUMNS")) && *s && isdigit((int)*s)) + if ((s = getenv("COLUMNS")) && *s && isdigit((int)*s)) width = (int)strtol(s, NULL, 0); #if defined(H5_HAVE_STRUCT_VIDEOCONFIG) && defined(H5_HAVE__GETVIDEOCONFIG) diff --git a/tools/src/h5perf/pio_engine.c b/tools/src/h5perf/pio_engine.c index c2131acacbb..fc2f0c7d024 100644 --- a/tools/src/h5perf/pio_engine.c +++ b/tools/src/h5perf/pio_engine.c @@ -402,7 +402,7 @@ pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si } /* First use the environment variable and then try the constant */ - prefix = HDgetenv("HDF5_PARAPREFIX"); + prefix = getenv("HDF5_PARAPREFIX"); #ifdef HDF5_PARAPREFIX if (!prefix) @@ -416,8 +416,8 @@ pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si * directory instead. */ char *user, *login, *subdir; - user = HDgetenv("USER"); - login = HDgetenv("LOGIN"); + user = getenv("USER"); + login = getenv("LOGIN"); subdir = (user ? user : login); if (subdir) { diff --git a/tools/src/h5perf/pio_perf.c b/tools/src/h5perf/pio_perf.c index 232ac939c8f..e72de3207f3 100644 --- a/tools/src/h5perf/pio_perf.c +++ b/tools/src/h5perf/pio_perf.c @@ -736,7 +736,7 @@ h5_set_info_object(void) int ret_value = 0; /* handle any MPI INFO hints via $HDF5_MPI_INFO */ - if ((envp = HDgetenv("HDF5_MPI_INFO")) != NULL) { + if ((envp = getenv("HDF5_MPI_INFO")) != NULL) { char *next, *valp; valp = envp = next = strdup(envp); @@ -1215,7 +1215,7 @@ report_parameters(struct options *opts) fprintf(output, "Contiguous\n"); { - char *prefix = HDgetenv("HDF5_PARAPREFIX"); + char *prefix = getenv("HDF5_PARAPREFIX"); fprintf(output, "rank %d: Env HDF5_PARAPREFIX=%s\n", rank, (prefix ? prefix : "not set")); } diff --git a/tools/src/h5perf/sio_engine.c b/tools/src/h5perf/sio_engine.c index 28f4eed5fe3..700416d7198 100644 --- a/tools/src/h5perf/sio_engine.c +++ b/tools/src/h5perf/sio_engine.c @@ -310,7 +310,7 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si } /* First use the environment variable and then try the constant */ - prefix = HDgetenv("HDF5_PREFIX"); + prefix = getenv("HDF5_PREFIX"); #ifdef HDF5_PREFIX if (!prefix) @@ -324,8 +324,8 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si * directory instead. */ char *user, *login, *subdir; - user = HDgetenv("USER"); - login = HDgetenv("LOGIN"); + user = getenv("USER"); + login = getenv("LOGIN"); subdir = (user ? user : login); if (subdir) { @@ -1259,7 +1259,7 @@ do_cleanupfile(iotype iot, char *filename) goto done; if (clean_file_g == -1) - clean_file_g = (HDgetenv(HDF5_NOCLEANUP) == NULL) ? 1 : 0; + clean_file_g = (getenv(HDF5_NOCLEANUP) == NULL) ? 1 : 0; if (clean_file_g) { diff --git a/tools/src/h5perf/sio_perf.c b/tools/src/h5perf/sio_perf.c index ca3d5c0d42f..ad536ba02e5 100644 --- a/tools/src/h5perf/sio_perf.c +++ b/tools/src/h5perf/sio_perf.c @@ -777,7 +777,7 @@ report_parameters(struct options *opts) } { - char *prefix = HDgetenv("HDF5_PREFIX"); + char *prefix = getenv("HDF5_PREFIX"); fprintf(output, "Env HDF5_PREFIX=%s\n", (prefix ? prefix : "not set")); } diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c index 85c41a13976..063c1658795 100644 --- a/tools/test/perform/zip_perf.c +++ b/tools/test/perform/zip_perf.c @@ -100,7 +100,7 @@ error(const char *fmt, ...) static void cleanup(void) { - if (!HDgetenv(HDF5_NOCLEANUP)) + if (!getenv(HDF5_NOCLEANUP)) HDunlink(filename); free(filename); } @@ -197,7 +197,7 @@ static void get_unique_name(void) { const char *prefix = NULL; - const char *env = HDgetenv("HDF5_PREFIX"); + const char *env = getenv("HDF5_PREFIX"); if (env) prefix = env; diff --git a/utils/test/swmr_check_compat_vfd.c b/utils/test/swmr_check_compat_vfd.c index 765ebd9dd48..b5cfb1ba35c 100644 --- a/utils/test/swmr_check_compat_vfd.c +++ b/utils/test/swmr_check_compat_vfd.c @@ -42,7 +42,7 @@ main(void) { char *driver = NULL; - driver = HDgetenv(HDF5_DRIVER); + driver = getenv(HDF5_DRIVER); if (H5FD__supports_swmr_test(driver)) return EXIT_SUCCESS; diff --git a/utils/tools/h5dwalk/h5dwalk.c b/utils/tools/h5dwalk/h5dwalk.c index 1f440e00c73..b510f3e6d08 100644 --- a/utils/tools/h5dwalk/h5dwalk.c +++ b/utils/tools/h5dwalk/h5dwalk.c @@ -1350,7 +1350,7 @@ main(int argc, char *argv[]) sg_mpi_rank = rank; #if 0 - env_var = HDgetenv("HDF5_H5DWALK_PRINT_CMDLINE"); + env_var = getenv("HDF5_H5DWALK_PRINT_CMDLINE"); if (env_var) { int enable = atoi(env_var); if (enable) { From 1529ec0ab3a348e17aab0e0ec97bb80adc4decc2 Mon Sep 17 00:00:00 2001 From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com> Date: Tue, 26 Sep 2023 15:46:55 -0500 Subject: [PATCH 09/10] Develop tools move (#3580) Reorganizes the tools files to support the VOL tests --- CMakeInstallation.cmake | 6 +- CMakeLists.txt | 1 + config/cmake/fileCompareTest.cmake | 2 +- hl/test/CMakeTests.cmake | 2 +- hl/test/{ => testfiles}/dsdata.txt | 0 hl/test/{ => testfiles}/dslat.txt | 0 hl/test/{ => testfiles}/dslon.txt | 0 hl/test/{ => testfiles}/dtype_file.txt | 0 .../{ => testfiles}/dtype_file_readable.txt | 0 hl/test/{ => testfiles}/earth.pal | 0 hl/test/{ => testfiles}/image24pixel.txt | 0 hl/test/{ => testfiles}/image24plane.txt | 0 hl/test/{ => testfiles}/image8.txt | 0 hl/test/{ => testfiles}/sepia.pal | 0 hl/test/{ => testfiles}/test_ds_be.h5 | Bin .../test_ds_be_new_ref-32bit.h5 | Bin hl/test/{ => testfiles}/test_ds_be_new_ref.h5 | Bin hl/test/{ => testfiles}/test_ds_le.h5 | Bin hl/test/{ => testfiles}/test_ds_le_new_ref.h5 | Bin hl/test/{ => testfiles}/test_ld.h5 | Bin hl/test/{ => testfiles}/test_table_be.h5 | Bin hl/test/{ => testfiles}/test_table_cray.h5 | Bin hl/test/{ => testfiles}/test_table_le.h5 | Bin hl/test/{ => testfiles}/usa.wri | 0 hl/tools/gif2h5/CMakeTests.cmake | 6 +- hl/tools/h5watch/CMakeTests.cmake | 2 +- .../{ => h5watch}/testfiles/w-err-cmpd1.err | 0 .../{ => h5watch}/testfiles/w-err-cmpd2.err | 0 .../{ => h5watch}/testfiles/w-err-cmpd3.err | 0 .../{ => h5watch}/testfiles/w-err-cmpd4.err | 0 .../{ => h5watch}/testfiles/w-err-cmpd5.err | 0 .../testfiles/w-err-dset-nomax.err | 0 .../testfiles/w-err-dset-none.err | 0 .../{ => h5watch}/testfiles/w-err-dset1.err | 0 .../{ => h5watch}/testfiles/w-err-dset2.err | 0 .../{ => h5watch}/testfiles/w-err-file.err | 0 .../{ => h5watch}/testfiles/w-err-poll.ddl | 0 .../{ => h5watch}/testfiles/w-err-poll0.ddl | 0 .../{ => h5watch}/testfiles/w-err-std.ddl | 0 .../{ => h5watch}/testfiles/w-err-width.ddl | 0 .../testfiles/w-ext-cmpd-esc-f1.ddl | 0 .../testfiles/w-ext-cmpd-esc-f3.ddl | 0 .../testfiles/w-ext-cmpd-esc-ff2.ddl | 0 .../testfiles/w-ext-cmpd-esc.ddl | 0 .../{ => h5watch}/testfiles/w-ext-cmpd-f1.ddl | 0 .../{ => h5watch}/testfiles/w-ext-cmpd-f2.ddl | 0 .../testfiles/w-ext-cmpd-ff3.ddl | 0 .../testfiles/w-ext-cmpd-label.ddl | 0 .../testfiles/w-ext-cmpd-two-f1.ddl | 0 .../testfiles/w-ext-cmpd-two-f3.ddl | 0 .../testfiles/w-ext-cmpd-two-ff2.ddl | 0 .../testfiles/w-ext-cmpd-two.ddl | 0 .../{ => h5watch}/testfiles/w-ext-cmpd.ddl | 0 .../{ => h5watch}/testfiles/w-ext-early.ddl | 0 .../{ => h5watch}/testfiles/w-ext-late.ddl | 0 .../{ => h5watch}/testfiles/w-ext-one-d.ddl | 0 .../testfiles/w-ext-one-simple.ddl | 0 .../{ => h5watch}/testfiles/w-ext-one.ddl | 0 .../{ => h5watch}/testfiles/w-ext-two-d.ddl | 0 .../testfiles/w-ext-two-width.ddl | 0 .../{ => h5watch}/testfiles/w-ext-two.ddl | 0 hl/tools/{ => h5watch}/testfiles/w-help1.ddl | 0 hl/tools/h5watch/testh5watch.sh.in | 20 +- java/test/CMakeLists.txt | 24 +- java/test/junit.sh.in | 14 +- test/CMakePassthroughVOLTests.cmake | 10 +- test/CMakeTests.cmake | 13 +- test/CMakeVFDTests.cmake | 10 +- test/enc_dec_plist_cross_platform.c | 48 +- test/gen_plist.c | 48 +- test/h5test.c | 4 +- test/{ => testfiles}/aggr.h5 | Bin test/{ => testfiles}/bad_compound.h5 | Bin test/{ => testfiles}/bad_offset.h5 | Bin test/{ => testfiles}/be_data.h5 | Bin test/{ => testfiles}/be_extlink1.h5 | Bin test/{ => testfiles}/be_extlink2.h5 | Bin test/{ => testfiles}/btree_idx_1_6.h5 | Bin test/{ => testfiles}/btree_idx_1_8.h5 | Bin test/{ => testfiles}/corrupt_stab_msg.h5 | Bin test/{ => testfiles}/cve_2020_10810.h5 | Bin test/{ => testfiles}/cve_2020_10812.h5 | Bin test/{ => testfiles}/deflate.h5 | Bin test/{ => testfiles}/family_v16-000000.h5 | Bin test/{ => testfiles}/family_v16-000001.h5 | Bin test/{ => testfiles}/family_v16-000002.h5 | Bin test/{ => testfiles}/family_v16-000003.h5 | Bin test/{ => testfiles}/file_image_core_test.h5 | Bin test/{ => testfiles}/filespace_1_6.h5 | Bin test/{ => testfiles}/filespace_1_8.h5 | Bin test/{ => testfiles}/fill18.h5 | Bin test/{ => testfiles}/fill_old.h5 | Bin test/{ => testfiles}/filter_error.h5 | Bin test/{ => testfiles}/fsm_aggr_nopersist.h5 | Bin test/{ => testfiles}/fsm_aggr_persist.h5 | Bin test/{ => testfiles}/group_old.h5 | Bin test/{ => testfiles}/h5fc_ext1_f.h5 | Bin test/{ => testfiles}/h5fc_ext1_i.h5 | Bin test/{ => testfiles}/h5fc_ext2_if.h5 | Bin test/{ => testfiles}/h5fc_ext2_sf.h5 | Bin test/{ => testfiles}/h5fc_ext3_isf.h5 | Bin test/{ => testfiles}/h5fc_ext_none.h5 | Bin test/{ => testfiles}/le_data.h5 | Bin test/{ => testfiles}/le_extlink1.h5 | Bin test/{ => testfiles}/le_extlink2.h5 | Bin ...emleak_H5O_dtype_decode_helper_H5Odtype.h5 | Bin test/{ => testfiles}/mergemsg.h5 | Bin test/{ => testfiles}/multi_file_v16-r.h5 | Bin test/{ => testfiles}/multi_file_v16-s.h5 | Bin test/{ => testfiles}/noencoder.h5 | Bin test/{ => testfiles}/none.h5 | Bin test/{ => testfiles}/paged_nopersist.h5 | Bin test/{ => testfiles}/paged_persist.h5 | Bin test/{ => testfiles}/specmetaread.h5 | Bin test/{ => testfiles}/tarrold.h5 | Bin test/{ => testfiles}/tbad_msg_count.h5 | Bin test/{ => testfiles}/tbogus.h5 | Bin test/{ => testfiles}/test_filters_be.h5 | Bin test/{ => testfiles}/test_filters_le.h5 | Bin test/{ => testfiles}/th5s.h5 | Bin test/{ => testfiles}/tlayouto.h5 | Bin test/{ => testfiles}/tmtimen.h5 | Bin test/{ => testfiles}/tmtimeo.h5 | Bin {tools => test}/testfiles/tnullspace.h5 | Bin test/{ => testfiles}/tsizeslheap.h5 | Bin tools/test/h5copy/CMakeTests.cmake | 39 +- .../h5copy_extlinks_src.out.ls | 0 .../{testfiles => expected}/h5copy_help1.ddl | 0 .../{testfiles => expected}/h5copy_help2.ddl | 0 .../{testfiles => expected}/h5copy_misc1.err | 0 .../{testfiles => expected}/h5copy_misc1.out | 0 .../h5copy_plugin_fail_ERR.out.h5.txt | 0 .../h5copy_plugin_test.out.h5.txt | 0 .../{testfiles => expected}/h5copy_ref.out.ls | 0 .../{testfiles => expected}/h5copytst.out.ls | 0 .../h5copytst_new.out.ls | 0 .../{testfiles => expected}/tudfilter.h5.txt | 0 .../tudfilter.h5_ERR.txt | 0 tools/test/h5copy/testh5copy.sh.in | 14 +- tools/test/h5diff/CMakeTests.cmake | 625 +++++++-------- .../{testfiles => expected}/dangling_link.err | 0 .../{testfiles => expected}/h5diff_10.txt | 0 .../{testfiles => expected}/h5diff_100.txt | 0 .../{testfiles => expected}/h5diff_101.txt | 0 .../{testfiles => expected}/h5diff_101w.txt | 0 .../{testfiles => expected}/h5diff_102.txt | 0 .../{testfiles => expected}/h5diff_102w.txt | 0 .../{testfiles => expected}/h5diff_103.txt | 0 .../{testfiles => expected}/h5diff_103w.txt | 0 .../{testfiles => expected}/h5diff_104.txt | 0 .../{testfiles => expected}/h5diff_104w.txt | 0 .../{testfiles => expected}/h5diff_11.txt | 0 .../{testfiles => expected}/h5diff_12.txt | 0 .../{testfiles => expected}/h5diff_13.txt | 0 .../{testfiles => expected}/h5diff_14.txt | 0 .../{testfiles => expected}/h5diff_15.txt | 0 .../{testfiles => expected}/h5diff_16_1.txt | 0 .../{testfiles => expected}/h5diff_16_2.txt | 0 .../{testfiles => expected}/h5diff_16_3.txt | 0 .../{testfiles => expected}/h5diff_17.txt | 0 .../{testfiles => expected}/h5diff_171.txt | 0 .../{testfiles => expected}/h5diff_172.txt | 0 .../{testfiles => expected}/h5diff_18.txt | 0 .../{testfiles => expected}/h5diff_18_1.txt | 0 .../{testfiles => expected}/h5diff_19.txt | 0 .../{testfiles => expected}/h5diff_20.txt | 0 .../{testfiles => expected}/h5diff_200.txt | 0 .../{testfiles => expected}/h5diff_201.txt | 0 .../{testfiles => expected}/h5diff_202.txt | 0 .../{testfiles => expected}/h5diff_203.txt | 0 .../{testfiles => expected}/h5diff_204.txt | 0 .../{testfiles => expected}/h5diff_205.txt | 0 .../{testfiles => expected}/h5diff_206.txt | 0 .../{testfiles => expected}/h5diff_207.txt | 0 .../{testfiles => expected}/h5diff_208.txt | 0 .../{testfiles => expected}/h5diff_21.txt | 0 .../{testfiles => expected}/h5diff_22.txt | 0 .../{testfiles => expected}/h5diff_220.txt | 0 .../{testfiles => expected}/h5diff_221.txt | 0 .../{testfiles => expected}/h5diff_222.txt | 0 .../{testfiles => expected}/h5diff_223.txt | 0 .../{testfiles => expected}/h5diff_224.txt | 0 .../{testfiles => expected}/h5diff_23.txt | 0 .../{testfiles => expected}/h5diff_24.txt | 0 .../{testfiles => expected}/h5diff_25.txt | 0 .../{testfiles => expected}/h5diff_26.txt | 0 .../{testfiles => expected}/h5diff_27.txt | 0 .../{testfiles => expected}/h5diff_28.txt | 0 .../{testfiles => expected}/h5diff_30.txt | 0 .../{testfiles => expected}/h5diff_300.txt | 0 .../{testfiles => expected}/h5diff_400.txt | 0 .../{testfiles => expected}/h5diff_401.txt | 0 .../{testfiles => expected}/h5diff_402.txt | 0 .../{testfiles => expected}/h5diff_403.txt | 0 .../{testfiles => expected}/h5diff_404.txt | 0 .../{testfiles => expected}/h5diff_405.txt | 0 .../{testfiles => expected}/h5diff_406.txt | 0 .../{testfiles => expected}/h5diff_407.txt | 0 .../{testfiles => expected}/h5diff_408.txt | 0 .../{testfiles => expected}/h5diff_409.txt | 0 .../{testfiles => expected}/h5diff_410.txt | 0 .../{testfiles => expected}/h5diff_411.txt | 0 .../{testfiles => expected}/h5diff_412.txt | 0 .../{testfiles => expected}/h5diff_413.txt | 0 .../{testfiles => expected}/h5diff_414.txt | 0 .../{testfiles => expected}/h5diff_415.txt | 0 .../{testfiles => expected}/h5diff_416.txt | 0 .../{testfiles => expected}/h5diff_417.txt | 0 .../{testfiles => expected}/h5diff_418.txt | 0 .../{testfiles => expected}/h5diff_419.txt | 0 .../{testfiles => expected}/h5diff_420.txt | 0 .../{testfiles => expected}/h5diff_421.txt | 0 .../{testfiles => expected}/h5diff_422.txt | 0 .../{testfiles => expected}/h5diff_423.txt | 0 .../{testfiles => expected}/h5diff_424.txt | 0 .../{testfiles => expected}/h5diff_425.txt | 0 .../{testfiles => expected}/h5diff_450.txt | 0 .../{testfiles => expected}/h5diff_451.txt | 0 .../{testfiles => expected}/h5diff_452.txt | 0 .../{testfiles => expected}/h5diff_453.txt | 0 .../{testfiles => expected}/h5diff_454.txt | 0 .../{testfiles => expected}/h5diff_455.txt | 0 .../{testfiles => expected}/h5diff_456.txt | 0 .../{testfiles => expected}/h5diff_457.txt | 0 .../{testfiles => expected}/h5diff_458.txt | 0 .../{testfiles => expected}/h5diff_459.txt | 0 .../{testfiles => expected}/h5diff_465.txt | 0 .../{testfiles => expected}/h5diff_466.txt | 0 .../{testfiles => expected}/h5diff_467.txt | 0 .../{testfiles => expected}/h5diff_468.txt | 0 .../{testfiles => expected}/h5diff_469.txt | 0 .../{testfiles => expected}/h5diff_471.txt | 0 .../{testfiles => expected}/h5diff_472.txt | 0 .../{testfiles => expected}/h5diff_473.txt | 0 .../{testfiles => expected}/h5diff_474.txt | 0 .../{testfiles => expected}/h5diff_475.txt | 0 .../{testfiles => expected}/h5diff_480.txt | 0 .../{testfiles => expected}/h5diff_481.txt | 0 .../{testfiles => expected}/h5diff_482.txt | 0 .../{testfiles => expected}/h5diff_483.txt | 0 .../{testfiles => expected}/h5diff_484.txt | 0 .../{testfiles => expected}/h5diff_485.txt | 0 .../{testfiles => expected}/h5diff_486.txt | 0 .../{testfiles => expected}/h5diff_487.txt | 0 .../{testfiles => expected}/h5diff_50.txt | 0 .../{testfiles => expected}/h5diff_500.txt | 0 .../{testfiles => expected}/h5diff_501.txt | 0 .../{testfiles => expected}/h5diff_502.txt | 0 .../{testfiles => expected}/h5diff_503.txt | 0 .../{testfiles => expected}/h5diff_504.txt | 0 .../{testfiles => expected}/h5diff_505.txt | 0 .../{testfiles => expected}/h5diff_506.txt | 0 .../{testfiles => expected}/h5diff_507.txt | 0 .../{testfiles => expected}/h5diff_508.txt | 0 .../{testfiles => expected}/h5diff_509.txt | 0 .../{testfiles => expected}/h5diff_51.txt | 0 .../{testfiles => expected}/h5diff_510.txt | 0 .../{testfiles => expected}/h5diff_511.txt | 0 .../{testfiles => expected}/h5diff_512.txt | 0 .../{testfiles => expected}/h5diff_513.txt | 0 .../{testfiles => expected}/h5diff_514.txt | 0 .../{testfiles => expected}/h5diff_515.txt | 0 .../{testfiles => expected}/h5diff_516.txt | 0 .../{testfiles => expected}/h5diff_517.txt | 0 .../{testfiles => expected}/h5diff_518.txt | 0 .../{testfiles => expected}/h5diff_52.txt | 0 .../{testfiles => expected}/h5diff_53.txt | 0 .../{testfiles => expected}/h5diff_530.txt | 0 .../{testfiles => expected}/h5diff_54.txt | 0 .../{testfiles => expected}/h5diff_540.txt | 0 .../{testfiles => expected}/h5diff_55.txt | 0 .../{testfiles => expected}/h5diff_56.txt | 0 .../{testfiles => expected}/h5diff_57.txt | 0 .../{testfiles => expected}/h5diff_58.txt | 0 .../{testfiles => expected}/h5diff_58_ref.txt | 0 .../{testfiles => expected}/h5diff_59.txt | 0 .../{testfiles => expected}/h5diff_60.txt | 0 .../{testfiles => expected}/h5diff_600.txt | 0 .../{testfiles => expected}/h5diff_601.txt | 0 .../h5diff_601_ERR.err | 0 .../{testfiles => expected}/h5diff_603.txt | 0 .../{testfiles => expected}/h5diff_604.txt | 0 .../{testfiles => expected}/h5diff_605.txt | 0 .../{testfiles => expected}/h5diff_606.txt | 0 .../{testfiles => expected}/h5diff_607.txt | 0 .../{testfiles => expected}/h5diff_608.txt | 0 .../{testfiles => expected}/h5diff_609.txt | 0 .../{testfiles => expected}/h5diff_61.txt | 0 .../{testfiles => expected}/h5diff_610.txt | 0 .../{testfiles => expected}/h5diff_612.txt | 0 .../{testfiles => expected}/h5diff_613.txt | 0 .../{testfiles => expected}/h5diff_614.txt | 0 .../{testfiles => expected}/h5diff_615.txt | 0 .../{testfiles => expected}/h5diff_616.txt | 0 .../{testfiles => expected}/h5diff_617.txt | 0 .../{testfiles => expected}/h5diff_618.txt | 0 .../{testfiles => expected}/h5diff_619.txt | 0 .../{testfiles => expected}/h5diff_62.txt | 0 .../{testfiles => expected}/h5diff_621.txt | 0 .../{testfiles => expected}/h5diff_622.txt | 0 .../{testfiles => expected}/h5diff_623.txt | 0 .../{testfiles => expected}/h5diff_624.txt | 0 .../{testfiles => expected}/h5diff_625.txt | 0 .../{testfiles => expected}/h5diff_626.txt | 0 .../{testfiles => expected}/h5diff_627.txt | 0 .../{testfiles => expected}/h5diff_628.txt | 0 .../{testfiles => expected}/h5diff_629.txt | 0 .../{testfiles => expected}/h5diff_63.txt | 0 .../{testfiles => expected}/h5diff_630.txt | 0 .../{testfiles => expected}/h5diff_631.txt | 0 .../{testfiles => expected}/h5diff_640.txt | 0 .../{testfiles => expected}/h5diff_641.txt | 0 .../{testfiles => expected}/h5diff_642.txt | 0 .../{testfiles => expected}/h5diff_643.txt | 0 .../{testfiles => expected}/h5diff_644.txt | 0 .../{testfiles => expected}/h5diff_645.txt | 0 .../{testfiles => expected}/h5diff_646.txt | 0 .../{testfiles => expected}/h5diff_70.txt | 0 .../{testfiles => expected}/h5diff_700.txt | 0 .../{testfiles => expected}/h5diff_701.txt | 0 .../{testfiles => expected}/h5diff_702.txt | 0 .../{testfiles => expected}/h5diff_703.txt | 0 .../{testfiles => expected}/h5diff_704.txt | 0 .../{testfiles => expected}/h5diff_705.txt | 0 .../{testfiles => expected}/h5diff_706.txt | 0 .../{testfiles => expected}/h5diff_707.txt | 0 .../{testfiles => expected}/h5diff_708.txt | 0 .../{testfiles => expected}/h5diff_709.txt | 0 .../{testfiles => expected}/h5diff_710.txt | 0 .../{testfiles => expected}/h5diff_80.txt | 0 .../{testfiles => expected}/h5diff_800.txt | 0 .../{testfiles => expected}/h5diff_801.txt | 0 .../{testfiles => expected}/h5diff_830.txt | 0 .../{testfiles => expected}/h5diff_8625.txt | 0 .../{testfiles => expected}/h5diff_8639.txt | 0 .../{testfiles => expected}/h5diff_90.txt | 0 .../{testfiles => expected}/h5diff_900.txt | 0 .../{testfiles => expected}/h5diff_901.txt | 0 .../{testfiles => expected}/h5diff_902.txt | 0 .../{testfiles => expected}/h5diff_eps.txt | 0 .../{testfiles => expected}/h5diff_reg.txt | 0 .../{testfiles => expected}/h5diff_ud.txt | 0 .../{testfiles => expected}/h5diff_udfail.err | 0 .../{testfiles => expected}/h5diff_udfail.txt | 0 .../{testfiles => expected}/h5diff_v1.txt | 0 .../{testfiles => expected}/h5diff_v2.txt | 0 .../{testfiles => expected}/h5diff_v3.txt | 0 .../{testfiles => expected}/h5diff_vlstr.txt | 0 tools/test/h5diff/h5diff_plugin.sh.in | 7 +- tools/test/h5diff/testh5diff.sh.in | 476 ++++++------ tools/test/h5dump/CMakeTests.cmake | 724 +++++++++--------- tools/test/h5dump/CMakeTestsPBITS.cmake | 18 +- tools/test/h5dump/CMakeTestsVDS.cmake | 17 +- tools/test/h5dump/CMakeTestsXML.cmake | 251 +++--- tools/test/h5dump/CMakeVFDTests.cmake | 4 +- .../tnofilename-with-packed-bits.err | 0 .../{ => pbits}/tpbitsCharLengthExceeded.err | 0 .../{ => pbits}/tpbitsCharOffsetExceeded.err | 0 .../errfiles/{ => pbits}/tpbitsIncomplete.err | 0 .../{ => pbits}/tpbitsIntLengthExceeded.err | 0 .../{ => pbits}/tpbitsIntOffsetExceeded.err | 0 .../{ => pbits}/tpbitsLengthExceeded.err | 0 .../{ => pbits}/tpbitsLengthPositive.err | 0 .../{ => pbits}/tpbitsLongLengthExceeded.err | 0 .../{ => pbits}/tpbitsLongOffsetExceeded.err | 0 .../{ => pbits}/tpbitsMaxExceeded.err | 0 .../{ => pbits}/tpbitsOffsetExceeded.err | 0 .../{ => pbits}/tpbitsOffsetNegative.err | 0 .../h5dump/expected}/charsets.ddl | 0 .../h5dump/expected}/err_attr_dspace.ddl | 0 .../h5dump/expected}/file_space.ddl | 0 .../h5dump/expected}/filter_fail.ddl | 0 .../h5dump/expected}/h5dump-help.txt | 0 .../h5dump/expected}/non_existing.ddl | 0 .../h5dump/expected}/out3.h5import | 0 .../h5dump/expected}/packedbits.ddl | 0 .../pbits/tnofilename-with-packed-bits.ddl | 0 .../h5dump/expected}/pbits/tpbitsArray.ddl | 0 .../pbits/tpbitsCharLengthExceeded.ddl | 0 .../pbits/tpbitsCharOffsetExceeded.ddl | 0 .../h5dump/expected}/pbits/tpbitsCompound.ddl | 0 .../expected}/pbits/tpbitsIncomplete.ddl | 0 .../pbits/tpbitsIntLengthExceeded.ddl | 0 .../pbits/tpbitsIntOffsetExceeded.ddl | 0 .../expected}/pbits/tpbitsLengthExceeded.ddl | 0 .../expected}/pbits/tpbitsLengthPositive.ddl | 0 .../pbits/tpbitsLongLengthExceeded.ddl | 0 .../pbits/tpbitsLongOffsetExceeded.ddl | 0 .../h5dump/expected}/pbits/tpbitsMax.ddl | 0 .../expected}/pbits/tpbitsMaxExceeded.ddl | 0 .../expected}/pbits/tpbitsOffsetExceeded.ddl | 0 .../expected}/pbits/tpbitsOffsetNegative.ddl | 0 .../expected}/pbits/tpbitsOverlapped.ddl | 0 .../h5dump/expected}/pbits/tpbitsSigned.ddl | 0 .../h5dump/expected}/pbits/tpbitsSigned2.ddl | 0 .../h5dump/expected}/pbits/tpbitsSigned4.ddl | 0 .../expected}/pbits/tpbitsSignedInt.ddl | 0 .../expected}/pbits/tpbitsSignedInt4.ddl | 0 .../expected}/pbits/tpbitsSignedInt8.ddl | 0 .../expected}/pbits/tpbitsSignedIntWhole.ddl | 0 .../expected}/pbits/tpbitsSignedLong.ddl | 0 .../expected}/pbits/tpbitsSignedLong16.ddl | 0 .../expected}/pbits/tpbitsSignedLong8.ddl | 0 .../expected}/pbits/tpbitsSignedLongLong.ddl | 0 .../pbits/tpbitsSignedLongLong16.ddl | 0 .../pbits/tpbitsSignedLongLong32.ddl | 0 .../pbits/tpbitsSignedLongLongWhole.ddl | 0 .../pbits/tpbitsSignedLongLongWhole1.ddl | 0 .../pbits/tpbitsSignedLongLongWhole63.ddl | 0 .../expected}/pbits/tpbitsSignedLongWhole.ddl | 0 .../expected}/pbits/tpbitsSignedWhole.ddl | 0 .../h5dump/expected}/pbits/tpbitsUnsigned.ddl | 0 .../expected}/pbits/tpbitsUnsigned2.ddl | 0 .../expected}/pbits/tpbitsUnsigned4.ddl | 0 .../expected}/pbits/tpbitsUnsignedInt.ddl | 0 .../expected}/pbits/tpbitsUnsignedInt4.ddl | 0 .../expected}/pbits/tpbitsUnsignedInt8.ddl | 0 .../pbits/tpbitsUnsignedIntWhole.ddl | 0 .../expected}/pbits/tpbitsUnsignedLong.ddl | 0 .../expected}/pbits/tpbitsUnsignedLong16.ddl | 0 .../expected}/pbits/tpbitsUnsignedLong8.ddl | 0 .../pbits/tpbitsUnsignedLongLong.ddl | 0 .../pbits/tpbitsUnsignedLongLong16.ddl | 0 .../pbits/tpbitsUnsignedLongLong32.ddl | 0 .../pbits/tpbitsUnsignedLongLongWhole.ddl | 0 .../pbits/tpbitsUnsignedLongLongWhole1.ddl | 0 .../pbits/tpbitsUnsignedLongLongWhole63.ddl | 0 .../pbits/tpbitsUnsignedLongWhole.ddl | 0 .../expected}/pbits/tpbitsUnsignedWhole.ddl | 0 .../h5dump/expected}/tall-1.ddl | 0 .../h5dump/expected}/tall-2.ddl | 0 .../h5dump/expected}/tall-2A.ddl | 0 .../h5dump/expected}/tall-2A0.ddl | 0 .../h5dump/expected}/tall-2B.ddl | 0 .../h5dump/expected}/tall-3.ddl | 0 .../h5dump/expected}/tall-4s.ddl | 0 .../h5dump/expected}/tall-5s.ddl | 0 .../h5dump/expected}/tall-6.ddl | 0 .../h5dump/expected}/tall-7.ddl | 0 .../h5dump/expected}/tall-7N.ddl | 0 .../h5dump/expected}/tallfilters.ddl | 0 .../h5dump/expected}/tarray1.ddl | 0 .../h5dump/expected}/tarray1_big.ddl | 0 .../h5dump/expected}/tarray2.ddl | 0 .../h5dump/expected}/tarray3.ddl | 0 .../h5dump/expected}/tarray4.ddl | 0 .../h5dump/expected}/tarray5.ddl | 0 .../h5dump/expected}/tarray6.ddl | 0 .../h5dump/expected}/tarray7.ddl | 0 .../h5dump/expected}/tarray8.ddl | 0 .../h5dump/expected}/tattr-1.ddl | 0 .../h5dump/expected}/tattr-2.ddl | 0 .../h5dump/expected}/tattr-3.ddl | 0 .../h5dump/expected}/tattr-4_be.ddl | 0 .../h5dump/expected}/tattrcontents1.ddl | 0 .../h5dump/expected}/tattrcontents2.ddl | 0 .../h5dump/expected}/tattrintsize.ddl | 0 .../h5dump/expected}/tattrreg.ddl | 0 .../h5dump/expected}/tattrregR.ddl | 0 .../h5dump/expected}/tbigdims.ddl | 0 .../h5dump/expected}/tbin1.ddl | 0 .../h5dump/expected}/tbin2.ddl | 0 .../h5dump/expected}/tbin3.ddl | 0 .../h5dump/expected}/tbin4.ddl | 0 .../h5dump/expected}/tbinregR.ddl | 0 .../h5dump/expected}/tbitnopaque_be.ddl | 0 .../h5dump/expected}/tbitnopaque_le.ddl | 0 .../h5dump/expected}/tboot1.ddl | 0 .../h5dump/expected}/tboot2.ddl | 0 .../h5dump/expected}/tboot2A.ddl | 0 .../h5dump/expected}/tboot2B.ddl | 0 .../h5dump/expected}/tchar1.ddl | 0 .../h5dump/expected}/tchunked.ddl | 0 .../h5dump/expected}/tcmpdattrintsize.ddl | 0 .../h5dump/expected}/tcmpdintarray.ddl | 0 .../h5dump/expected}/tcmpdints.ddl | 0 .../h5dump/expected}/tcmpdintsize.ddl | 0 .../h5dump/expected}/tcomp-1.ddl | 0 .../h5dump/expected}/tcomp-2.ddl | 0 .../h5dump/expected}/tcomp-3.ddl | 0 .../h5dump/expected}/tcomp-4.ddl | 0 .../h5dump/expected}/tcompact.ddl | 0 .../h5dump/expected}/tcompound_complex2.ddl | 0 .../h5dump/expected}/tcontents.ddl | 0 .../h5dump/expected}/tcontiguos.ddl | 0 .../h5dump/expected}/tdatareg.ddl | 0 .../h5dump/expected}/tdataregR.ddl | 0 .../h5dump/expected}/tdeflate.ddl | 0 .../h5dump/expected}/tdset-1.ddl | 0 .../h5dump/expected}/tdset-2.ddl | 0 .../h5dump/expected}/tdset-3s.ddl | 0 .../h5dump/expected}/tempty.ddl | 0 .../h5dump/expected}/texceedsubblock.ddl | 0 .../h5dump/expected}/texceedsubcount.ddl | 0 .../h5dump/expected}/texceedsubstart.ddl | 0 .../h5dump/expected}/texceedsubstride.ddl | 0 .../h5dump/expected}/texternal.ddl | 0 .../h5dump/expected}/textlink.ddl | 0 .../h5dump/expected}/textlinkfar.ddl | 0 .../h5dump/expected}/textlinksrc.ddl | 0 .../h5dump/expected}/tfamily.ddl | 0 .../h5dump/expected}/tfill.ddl | 0 .../h5dump/expected}/tfletcher32.ddl | 0 .../h5dump/expected}/tfloatsattrs.ddl | 0 .../h5dump/expected}/tfloatsattrs.wddl | 0 .../h5dump/expected}/tfpformat.ddl | 0 .../h5dump/expected}/tgroup-1.ddl | 0 .../h5dump/expected}/tgroup-2.ddl | 0 .../h5dump/expected}/tgrp_comments.ddl | 0 .../h5dump/expected}/tgrpnullspace.ddl | 0 .../h5dump/expected}/thlink-1.ddl | 0 .../h5dump/expected}/thlink-2.ddl | 0 .../h5dump/expected}/thlink-3.ddl | 0 .../h5dump/expected}/thlink-4.ddl | 0 .../h5dump/expected}/thlink-5.ddl | 0 .../h5dump/expected}/thyperslab.ddl | 0 .../h5dump/expected}/tindicesno.ddl | 0 .../h5dump/expected}/tindicessub1.ddl | 0 .../h5dump/expected}/tindicessub2.ddl | 0 .../h5dump/expected}/tindicessub3.ddl | 0 .../h5dump/expected}/tindicessub4.ddl | 0 .../h5dump/expected}/tindicesyes.ddl | 0 .../h5dump/expected}/tints4dims.ddl | 0 .../h5dump/expected}/tints4dimsBlock2.ddl | 0 .../h5dump/expected}/tints4dimsBlockEq.ddl | 0 .../h5dump/expected}/tints4dimsCount2.ddl | 0 .../h5dump/expected}/tints4dimsCountEq.ddl | 0 .../h5dump/expected}/tints4dimsStride2.ddl | 0 .../h5dump/expected}/tintsattrs.ddl | 0 .../h5dump/expected}/tintsnodata.ddl | 0 .../h5dump/expected}/tlarge_objname.ddl | 0 .../h5dump/expected}/tldouble.ddl | 0 .../h5dump/expected}/tldouble_scalar.ddl | 0 .../h5dump/expected}/tlonglinks.ddl | 0 .../h5dump/expected}/tloop-1.ddl | 0 .../h5dump/expected}/tmulti.ddl | 0 .../h5dump/expected}/tmultifile.ddl | 0 .../h5dump/expected}/tnamed_dtype_attr.ddl | 0 .../h5dump/expected}/tnbit.ddl | 0 .../h5dump/expected}/tnestcomp-1.ddl | 0 .../h5dump/expected}/tnestedcmpddt.ddl | 0 .../h5dump/expected}/tno-subset.ddl | 0 .../h5dump/expected}/tnoattrdata.ddl | 0 .../h5dump/expected}/tnoattrddl.ddl | 0 .../h5dump/expected}/tnodata.ddl | 0 .../h5dump/expected}/tnoddl.ddl | 0 .../h5dump/expected}/tnoddlfile.ddl | 0 .../h5dump/expected}/tnullspace.ddl | 0 .../h5dump/expected}/torderattr1.ddl | 0 .../h5dump/expected}/torderattr2.ddl | 0 .../h5dump/expected}/torderattr3.ddl | 0 .../h5dump/expected}/torderattr4.ddl | 0 .../h5dump/expected}/tordercontents1.ddl | 0 .../h5dump/expected}/tordercontents2.ddl | 0 .../h5dump/expected}/tordergr1.ddl | 0 .../h5dump/expected}/tordergr2.ddl | 0 .../h5dump/expected}/tordergr3.ddl | 0 .../h5dump/expected}/tordergr4.ddl | 0 .../h5dump/expected}/tordergr5.ddl | 0 .../h5dump/expected}/torderlinks1.ddl | 0 .../h5dump/expected}/torderlinks2.ddl | 0 .../h5dump/expected}/tperror.ddl | 0 .../h5dump/expected}/tqmarkfile.ddl | 0 .../h5dump/expected}/trawdatafile.ddl | 0 .../h5dump/expected}/trawssetfile.ddl | 0 .../h5dump/expected}/treadfilter.ddl | 0 .../h5dump/expected}/treadintfilter.ddl | 0 .../h5dump/expected}/trefer_attrR.ddl | 0 .../h5dump/expected}/trefer_compatR.ddl | 0 .../h5dump/expected}/trefer_extR.ddl | 0 .../h5dump/expected}/trefer_grpR.ddl | 0 .../h5dump/expected}/trefer_objR.ddl | 0 .../h5dump/expected}/trefer_obj_delR.ddl | 0 .../h5dump/expected}/trefer_paramR.ddl | 0 .../h5dump/expected}/trefer_regR.ddl | 0 .../h5dump/expected}/trefer_reg_1dR.ddl | 0 .../h5dump/expected}/treference.ddl | 0 .../h5dump/expected}/tsaf.ddl | 0 .../h5dump/expected}/tscalarattrintsize.ddl | 0 .../h5dump/expected}/tscalarintattrsize.ddl | 0 .../h5dump/expected}/tscalarintsize.ddl | 0 .../h5dump/expected}/tscalarstring.ddl | 0 .../h5dump/expected}/tscaleoffset.ddl | 0 .../h5dump/expected}/tshuffle.ddl | 0 .../h5dump/expected}/tslink-1.ddl | 0 .../h5dump/expected}/tslink-2.ddl | 0 .../h5dump/expected}/tslink-D.ddl | 0 .../h5dump/expected}/tsplit_file.ddl | 0 .../h5dump/expected}/tst_onion_dset_1d.ddl | 0 .../h5dump/expected}/tst_onion_dset_ext.ddl | 0 .../h5dump/expected}/tst_onion_objs.ddl | 0 .../expected}/tst_onion_revision_count.ddl | 0 .../h5dump/expected}/tstarfile.ddl | 0 .../h5dump/expected}/tstr-1.ddl | 0 .../h5dump/expected}/tstr-2.ddl | 0 .../h5dump/expected}/tstring.ddl | 0 .../h5dump/expected}/tstring2.ddl | 0 .../h5dump/expected}/tstringe.ddl | 0 .../h5dump/expected}/tszip.ddl | 0 .../h5dump/expected}/tudfilter.ddl | 0 .../h5dump/expected}/tudlink-1.ddl | 0 .../h5dump/expected}/tudlink-2.ddl | 0 .../h5dump/expected}/tuserfilter.ddl | 0 .../h5dump/expected}/tvldtypes1.ddl | 0 .../h5dump/expected}/tvldtypes2.ddl | 0 .../h5dump/expected}/tvldtypes3.ddl | 0 .../h5dump/expected}/tvldtypes4.ddl | 0 .../h5dump/expected}/tvldtypes5.ddl | 0 .../h5dump/expected}/tvlenstr_array.ddl | 0 .../h5dump/expected}/tvlstr.ddl | 0 .../h5dump/expected}/tvms.ddl | 0 .../h5dump/expected}/twidedisplay.ddl | 0 .../h5dump/expected}/twithddlfile.ddl | 0 .../h5dump/expected}/vds/tvds-1.ddl | 0 .../h5dump/expected}/vds/tvds-2.ddl | 0 .../h5dump/expected}/vds/tvds-3_1.ddl | 0 .../h5dump/expected}/vds/tvds-3_2.ddl | 0 .../h5dump/expected}/vds/tvds-4.ddl | 0 .../h5dump/expected}/vds/tvds-5.ddl | 0 .../h5dump/expected}/vds/tvds_layout-1.ddl | 0 .../h5dump/expected}/vds/tvds_layout-2.ddl | 0 .../h5dump/expected}/vds/tvds_layout-3_1.ddl | 0 .../h5dump/expected}/vds/tvds_layout-3_2.ddl | 0 .../h5dump/expected}/vds/tvds_layout-4.ddl | 0 .../h5dump/expected}/vds/tvds_layout-5.ddl | 0 .../h5dump/expected}/vds/vds-first.ddl | 0 .../h5dump/expected}/vds/vds-gap1.ddl | 0 .../h5dump/expected}/vds/vds-gap2.ddl | 0 .../h5dump/expected}/vds/vds_layout-eiger.ddl | 0 .../expected}/vds/vds_layout-maxmin.ddl | 0 .../h5dump/expected/xml}/tall-2A.h5.xml | 0 .../h5dump/expected/xml}/tall.h5.xml | 0 .../h5dump/expected/xml}/tarray1.h5.xml | 0 .../h5dump/expected/xml}/tarray2.h5.xml | 0 .../h5dump/expected/xml}/tarray3.h5.xml | 0 .../h5dump/expected/xml}/tarray6.h5.xml | 0 .../h5dump/expected/xml}/tarray7.h5.xml | 0 .../h5dump/expected/xml}/tattr.h5.xml | 0 .../h5dump/expected/xml}/tbitfields_be.h5.xml | 0 .../h5dump/expected/xml}/tbitfields_le.h5.xml | 0 .../h5dump/expected/xml}/tcompound.h5.xml | 0 .../h5dump/expected/xml}/tcompound2.h5.xml | 0 .../expected/xml}/tcompound_complex.h5.xml | 0 .../h5dump/expected/xml}/tdatareg.h5.xml | 0 .../h5dump/expected/xml}/tdset.h5.xml | 0 .../h5dump/expected/xml}/tdset2.h5.xml | 0 .../h5dump/expected/xml}/tempty-dtd-2.h5.xml | 0 .../expected/xml}/tempty-dtd-uri.h5.xml | 0 .../h5dump/expected/xml}/tempty-dtd.h5.xml | 0 .../h5dump/expected/xml}/tempty-nons-2.h5.xml | 0 .../expected/xml}/tempty-nons-uri.h5.xml | 0 .../h5dump/expected/xml}/tempty-nons.h5.xml | 0 .../h5dump/expected/xml}/tempty-ns-2.h5.xml | 0 .../h5dump/expected/xml}/tempty-ns.h5.xml | 0 .../h5dump/expected/xml}/tempty.h5.xml | 0 .../h5dump/expected/xml}/tenum.h5.xml | 0 .../h5dump/expected/xml}/test35.nc.xml | 0 .../h5dump/expected/xml}/textlink.h5.xml | 0 .../h5dump/expected/xml}/tfpformat.h5.xml | 0 .../h5dump/expected/xml}/tgroup.h5.xml | 0 .../h5dump/expected/xml}/thlink.h5.xml | 0 .../h5dump/expected/xml}/tloop.h5.xml | 0 .../h5dump/expected/xml}/tloop2.h5.xml | 0 .../h5dump/expected/xml}/tmany.h5.xml | 0 .../h5dump/expected/xml}/tname-amp.h5.xml | 0 .../h5dump/expected/xml}/tname-apos.h5.xml | 0 .../h5dump/expected/xml}/tname-gt.h5.xml | 0 .../h5dump/expected/xml}/tname-lt.h5.xml | 0 .../h5dump/expected/xml}/tname-quot.h5.xml | 0 .../h5dump/expected/xml}/tname-sp.h5.xml | 0 .../expected/xml}/tnamed_dtype_attr.h5.xml | 0 .../h5dump/expected/xml}/tnestedcomp.h5.xml | 0 .../h5dump/expected/xml}/tnodata.h5.xml | 0 .../h5dump/expected/xml}/tnullspace.h5.xml | 0 .../h5dump/expected/xml}/tobjref.h5.xml | 0 .../h5dump/expected/xml}/topaque.h5.xml | 0 .../h5dump/expected/xml}/torderattr1.h5.xml | 0 .../h5dump/expected/xml}/torderattr2.h5.xml | 0 .../h5dump/expected/xml}/torderattr3.h5.xml | 0 .../h5dump/expected/xml}/torderattr4.h5.xml | 0 .../expected/xml}/tref-escapes-at.h5.xml | 0 .../h5dump/expected/xml}/tref-escapes.h5.xml | 0 .../h5dump/expected/xml}/tref.h5.xml | 0 .../h5dump/expected/xml}/tsaf.h5.xml | 0 .../h5dump/expected/xml}/tslink.h5.xml | 0 .../h5dump/expected/xml}/tstr.h5.xml | 0 .../h5dump/expected/xml}/tstr2.h5.xml | 0 .../h5dump/expected/xml}/tstring-at.h5.xml | 0 .../h5dump/expected/xml}/tstring.h5.xml | 0 .../h5dump/expected/xml}/tudlink.h5.xml | 0 .../h5dump/expected/xml}/tvldtypes1.h5.xml | 0 .../h5dump/expected/xml}/tvldtypes2.h5.xml | 0 .../h5dump/expected/xml}/tvldtypes3.h5.xml | 0 .../h5dump/expected/xml}/tvldtypes4.h5.xml | 0 .../h5dump/expected/xml}/tvldtypes5.h5.xml | 0 .../h5dump/expected/xml}/tvlstr.h5.xml | 0 .../h5dump/expected}/zerodim.ddl | 0 .../h5dump/exportfiles}/tall-6.exp | 0 .../h5dump/exportfiles}/tbinregR.exp | 0 .../h5dump/exportfiles}/tnoddlfile.exp | 0 .../h5dump/exportfiles}/trawdatafile.exp | 0 .../h5dump/exportfiles}/trawssetfile.exp | 0 .../h5dump/exportfiles}/tstr2bin2.exp | 0 .../h5dump/exportfiles}/tstr2bin6.exp | 0 .../h5dump/exportfiles}/twithddl.exp | 0 .../h5dump/exportfiles}/twithddlfile.exp | 0 tools/test/h5dump/h5dump_plugin.sh.in | 6 +- tools/{ => test/h5dump}/testfiles/charsets.h5 | Bin .../h5dump}/testfiles/err_attr_dspace.h5 | Bin .../{ => test/h5dump}/testfiles/file_space.h5 | Bin .../h5dump}/testfiles/filter_fail.h5 | Bin .../{ => test/h5dump}/testfiles/packedbits.h5 | Bin .../h5dump}/testfiles/t128bit_float.h5 | Bin .../testfiles/tCVE-2021-37501_attr_decode.h5 | Bin .../testfiles/tCVE_2018_11206_fill_new.h5 | Bin .../testfiles/tCVE_2018_11206_fill_old.h5 | Bin .../{ => test/h5dump}/testfiles/taindices.h5 | Bin tools/{ => test/h5dump}/testfiles/tall.h5 | Bin tools/{ => test/h5dump}/testfiles/tarray1.h5 | Bin .../h5dump}/testfiles/tarray1_big.h5 | Bin tools/{ => test/h5dump}/testfiles/tarray2.h5 | Bin tools/{ => test/h5dump}/testfiles/tarray3.h5 | Bin tools/{ => test/h5dump}/testfiles/tarray4.h5 | Bin tools/{ => test/h5dump}/testfiles/tarray5.h5 | Bin tools/{ => test/h5dump}/testfiles/tarray6.h5 | Bin tools/{ => test/h5dump}/testfiles/tarray7.h5 | Bin tools/{ => test/h5dump}/testfiles/tarray8.h5 | Bin tools/{ => test/h5dump}/testfiles/tattr.h5 | Bin tools/{ => test/h5dump}/testfiles/tattr2.h5 | Bin .../{ => test/h5dump}/testfiles/tattr4_be.h5 | Bin .../h5dump}/testfiles/tattrintsize.h5 | Bin tools/{ => test/h5dump}/testfiles/tattrreg.h5 | Bin tools/{ => test/h5dump}/testfiles/tbigdims.h5 | Bin tools/{ => test/h5dump}/testfiles/tbinary.h5 | Bin .../h5dump}/testfiles/tbitnopaque.h5 | Bin tools/{ => test/h5dump}/testfiles/tchar.h5 | Bin .../h5dump}/testfiles/tcmpdattrintsize.h5 | Bin .../h5dump}/testfiles/tcmpdintarray.h5 | Bin .../{ => test/h5dump}/testfiles/tcmpdints.h5 | Bin .../h5dump}/testfiles/tcmpdintsize.h5 | Bin .../{ => test/h5dump}/testfiles/tcompound.h5 | Bin .../h5dump}/testfiles/tcompound_complex.h5 | Bin .../h5dump}/testfiles/tcompound_complex2.h5 | Bin tools/{ => test/h5dump}/testfiles/tdatareg.h5 | Bin tools/{ => test/h5dump}/testfiles/tdset.h5 | Bin tools/{ => test/h5dump}/testfiles/tempty.h5 | Bin tools/{ => test/h5dump}/testfiles/textlink.h5 | Bin .../h5dump}/testfiles/textlinkfar.h5 | Bin .../h5dump}/testfiles/textlinksrc.h5 | Bin .../h5dump}/testfiles/textlinktar.h5 | Bin .../h5dump}/testfiles/tfamily00000.h5 | Bin .../h5dump}/testfiles/tfamily00001.h5 | Bin .../h5dump}/testfiles/tfamily00002.h5 | Bin .../h5dump}/testfiles/tfamily00003.h5 | Bin .../h5dump}/testfiles/tfamily00004.h5 | Bin .../h5dump}/testfiles/tfamily00005.h5 | Bin .../h5dump}/testfiles/tfamily00006.h5 | Bin .../h5dump}/testfiles/tfamily00007.h5 | Bin .../h5dump}/testfiles/tfamily00008.h5 | Bin .../h5dump}/testfiles/tfamily00009.h5 | Bin .../h5dump}/testfiles/tfamily00010.h5 | Bin .../h5dump}/testfiles/tfcontents1.h5 | Bin .../h5dump}/testfiles/tfcontents2.h5 | Bin tools/{ => test/h5dump}/testfiles/tfilters.h5 | Bin .../h5dump}/testfiles/tfloatsattrs.h5 | Bin .../{ => test/h5dump}/testfiles/tfpformat.h5 | Bin tools/{ => test/h5dump}/testfiles/tfvalues.h5 | Bin tools/{ => test/h5dump}/testfiles/tgroup.h5 | Bin .../h5dump}/testfiles/tgrp_comments.h5 | Bin .../h5dump}/testfiles/tgrpnullspace.h5 | Bin tools/{ => test/h5dump}/testfiles/thlink.h5 | Bin .../{ => test/h5dump}/testfiles/thyperslab.h5 | Bin .../{ => test/h5dump}/testfiles/tints4dims.h5 | Bin .../{ => test/h5dump}/testfiles/tintsattrs.h5 | Bin .../h5dump}/testfiles/tintsnodata.h5 | Bin .../h5dump}/testfiles/tlarge_objname.h5 | Bin tools/{ => test/h5dump}/testfiles/tldouble.h5 | Bin .../h5dump}/testfiles/tldouble_scalar.h5 | Bin .../{ => test/h5dump}/testfiles/tlonglinks.h5 | Bin tools/{ => test/h5dump}/testfiles/tloop.h5 | Bin tools/{ => test/h5dump}/testfiles/tmulti-b.h5 | Bin tools/{ => test/h5dump}/testfiles/tmulti-g.h5 | 0 tools/{ => test/h5dump}/testfiles/tmulti-l.h5 | Bin tools/{ => test/h5dump}/testfiles/tmulti-o.h5 | Bin tools/{ => test/h5dump}/testfiles/tmulti-r.h5 | Bin tools/{ => test/h5dump}/testfiles/tmulti-s.h5 | Bin .../h5dump}/testfiles/tnamed_dtype_attr.h5 | Bin .../h5dump}/testfiles/tnestedcmpddt.h5 | Bin .../h5dump}/testfiles/tnestedcomp.h5 | Bin .../{ => test/h5dump}/testfiles/tno-subset.h5 | Bin tools/test/h5dump/testfiles/tnullspace.h5 | Bin 0 -> 3624 bytes .../{ => test/h5dump}/testfiles/torderattr.h5 | Bin tools/{ => test/h5dump}/testfiles/tordergr.h5 | Bin .../h5dump}/testfiles/trefer_attr.h5 | Bin .../h5dump}/testfiles/trefer_compat.h5 | Bin .../h5dump}/testfiles/trefer_ext1.h5 | Bin .../h5dump}/testfiles/trefer_ext2.h5 | Bin .../{ => test/h5dump}/testfiles/trefer_grp.h5 | Bin .../{ => test/h5dump}/testfiles/trefer_obj.h5 | Bin .../h5dump}/testfiles/trefer_obj_del.h5 | Bin .../h5dump}/testfiles/trefer_param.h5 | Bin .../{ => test/h5dump}/testfiles/trefer_reg.h5 | Bin .../h5dump}/testfiles/trefer_reg_1d.h5 | Bin tools/{ => test/h5dump}/testfiles/tsaf.h5 | Bin .../h5dump}/testfiles/tscalarattrintsize.h5 | Bin .../h5dump}/testfiles/tscalarintattrsize.h5 | Bin .../h5dump}/testfiles/tscalarintsize.h5 | Bin .../h5dump}/testfiles/tscalarstring.h5 | Bin tools/{ => test/h5dump}/testfiles/tslink.h5 | Bin .../{ => test/h5dump}/testfiles/tsoftlinks.h5 | Bin .../h5dump}/testfiles/tsplit_file-m.h5 | Bin .../h5dump}/testfiles/tsplit_file-r.h5 | Bin .../h5dump}/testfiles/tst_onion_dset_1d.h5 | Bin .../testfiles/tst_onion_dset_1d.h5.onion | Bin .../h5dump}/testfiles/tst_onion_dset_ext.h5 | Bin .../testfiles/tst_onion_dset_ext.h5.onion | Bin .../h5dump}/testfiles/tst_onion_objs.h5 | Bin .../h5dump}/testfiles/tst_onion_objs.h5.onion | Bin tools/{ => test/h5dump}/testfiles/tstr.h5 | Bin tools/{ => test/h5dump}/testfiles/tstr2.h5 | Bin tools/{ => test/h5dump}/testfiles/tstr3.h5 | Bin .../{ => test/h5dump}/testfiles/tudfilter.h5 | Bin tools/{ => test/h5dump}/testfiles/tudlink.h5 | Bin .../{ => test/h5dump}/testfiles/tvldtypes1.h5 | Bin .../{ => test/h5dump}/testfiles/tvldtypes2.h5 | Bin .../{ => test/h5dump}/testfiles/tvldtypes3.h5 | Bin .../{ => test/h5dump}/testfiles/tvldtypes4.h5 | Bin .../{ => test/h5dump}/testfiles/tvldtypes5.h5 | Bin .../h5dump}/testfiles/tvlenstr_array.h5 | Bin tools/{ => test/h5dump}/testfiles/tvlstr.h5 | Bin tools/{ => test/h5dump}/testfiles/tvms.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/1_a.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/1_b.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/1_c.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/1_d.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/1_e.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/1_f.h5 | Bin .../{ => test/h5dump}/testfiles/vds/1_vds.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/2_a.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/2_b.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/2_c.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/2_d.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/2_e.h5 | Bin .../{ => test/h5dump}/testfiles/vds/2_vds.h5 | Bin .../h5dump}/testfiles/vds/3_1_vds.h5 | Bin .../h5dump}/testfiles/vds/3_2_vds.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/4_0.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/4_1.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/4_2.h5 | Bin .../{ => test/h5dump}/testfiles/vds/4_vds.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/5_a.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/5_b.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/5_c.h5 | Bin .../{ => test/h5dump}/testfiles/vds/5_vds.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/a.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/b.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/c.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/d.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/f-0.h5 | Bin tools/{ => test/h5dump}/testfiles/vds/f-3.h5 | Bin .../h5dump}/testfiles/vds/vds-eiger.h5 | Bin .../vds/vds-percival-unlim-maxmin.h5 | Bin .../h5dump/testfiles/xml}/tbitfields.h5 | Bin .../h5dump/testfiles/xml}/tcompound2.h5 | Bin .../h5dump/testfiles/xml}/tdset2.h5 | Bin .../h5dump/testfiles/xml}/tenum.h5 | Bin .../h5dump/testfiles/xml}/test35.nc | Bin .../h5dump/testfiles/xml}/tloop2.h5 | Bin .../h5dump/testfiles/xml}/tmany.h5 | Bin .../h5dump/testfiles/xml}/tname-amp.h5 | Bin .../h5dump/testfiles/xml}/tname-apos.h5 | Bin .../h5dump/testfiles/xml}/tname-gt.h5 | Bin .../h5dump/testfiles/xml}/tname-lt.h5 | Bin .../h5dump/testfiles/xml}/tname-quot.h5 | Bin .../h5dump/testfiles/xml}/tname-sp.h5 | Bin .../h5dump/testfiles/xml}/tnodata.h5 | Bin .../h5dump/testfiles/xml}/tobjref.h5 | Bin .../h5dump/testfiles/xml}/topaque.h5 | Bin .../h5dump/testfiles/xml}/tref-escapes-at.h5 | Bin .../h5dump/testfiles/xml}/tref-escapes.h5 | Bin .../h5dump/testfiles/xml}/tref.h5 | Bin .../h5dump/testfiles/xml}/tstring-at.h5 | Bin .../h5dump/testfiles/xml}/tstring.h5 | Bin tools/{ => test/h5dump}/testfiles/zerodim.h5 | Bin tools/test/h5dump/testh5dump.sh.in | 392 +++++----- tools/test/h5dump/testh5dumppbits.sh.in | 140 ++-- tools/test/h5dump/testh5dumpvds.sh.in | 40 +- tools/test/h5dump/testh5dumpxml.sh.in | 185 ++--- tools/test/h5format_convert/CMakeTests.cmake | 6 +- .../{testfiles => expected}/h5fc_d_file-d.ddl | 0 .../{testfiles => expected}/h5fc_d_file.ddl | 0 .../h5fc_d_file.ddl.err | 0 .../{testfiles => expected}/h5fc_dname.ddl | 0 .../{testfiles => expected}/h5fc_dname.err | 0 .../{testfiles => expected}/h5fc_ext1_f.ddl | 0 .../{testfiles => expected}/h5fc_ext1_i.ddl | 0 .../{testfiles => expected}/h5fc_ext1_s.ddl | 0 .../{testfiles => expected}/h5fc_ext2_if.ddl | 0 .../{testfiles => expected}/h5fc_ext2_is.ddl | 0 .../{testfiles => expected}/h5fc_ext2_sf.ddl | 0 .../{testfiles => expected}/h5fc_ext3_isf.ddl | 0 .../{testfiles => expected}/h5fc_help.ddl | 0 .../h5fc_nonexistdset_file.ddl.err | 0 .../h5fc_nonexistfile.ddl.err | 0 .../{testfiles => expected}/h5fc_nooption.ddl | 0 .../{testfiles => expected}/h5fc_v_all.ddl | 0 .../{testfiles => expected}/h5fc_v_bt1.ddl | 0 .../{testfiles => expected}/h5fc_v_err.ddl | 0 .../h5fc_v_err.ddl.err | 0 .../{testfiles => expected}/h5fc_v_n_1d.ddl | 0 .../{testfiles => expected}/h5fc_v_n_all.ddl | 0 .../h5fc_v_ndata_bt1.ddl | 0 .../h5fc_v_non_chunked.ddl | 0 .../old_h5fc_ext1_f.ddl | 0 .../old_h5fc_ext1_i.ddl | 0 .../old_h5fc_ext1_s.ddl | 0 .../old_h5fc_ext2_if.ddl | 0 .../old_h5fc_ext2_is.ddl | 0 .../old_h5fc_ext2_sf.ddl | 0 .../old_h5fc_ext3_isf.ddl | 0 tools/test/h5format_convert/testh5fc.sh.in | 66 +- tools/test/h5import/CMakeTests.cmake | 14 +- tools/test/h5import/h5importtestutil.sh.in | 9 +- tools/test/h5jam/CMakeTests.cmake | 4 +- .../{testfiles => expected}/h5jam-help.txt | 0 .../h5jam-ub-nohdf5.txt | 0 .../{testfiles => expected}/h5unjam-help.txt | 0 .../h5jam/{testfiles => expected}/u10.txt | 0 .../h5jam/{testfiles => expected}/u511.txt | 0 .../h5jam/{testfiles => expected}/u512.txt | 0 .../h5jam/{testfiles => expected}/u513.txt | 0 tools/test/h5jam/testh5jam.sh.in | 20 +- tools/test/h5ls/CMakeTests.cmake | 193 ++--- tools/test/h5ls/CMakeTestsVDS.cmake | 17 +- .../h5ls/expected}/help-1.ls | 0 .../h5ls/expected}/help-2.ls | 0 .../h5ls/expected}/help-3.ls | 0 .../h5ls/expected}/nosuchfile.ls | 0 .../h5ls/expected}/tall-1.ls | 0 .../h5ls/expected}/tall-2.ls | 0 .../h5ls/expected}/tarray1.ls | 0 .../h5ls/expected}/tattr2.ls | 0 .../h5ls/expected}/tattrreg_be.ls | 0 .../h5ls/expected}/tattrreg_le.ls | 0 .../h5ls/expected}/tcomp-1.ls | 0 .../h5ls/expected}/tdataregbe.ls | 0 .../h5ls/expected}/tdataregle.ls | 0 .../h5ls/expected}/tdset-1.ls | 0 .../h5ls/expected}/tdset_idx.ls | 0 .../h5ls/expected}/tempty.ls | 0 .../h5ls/expected}/textlink-1.ls | 0 .../h5ls/expected}/textlinksrc-1-old.ls | 0 .../h5ls/expected}/textlinksrc-1.ls | 0 .../h5ls/expected}/textlinksrc-2-old.ls | 0 .../h5ls/expected}/textlinksrc-2.ls | 0 .../h5ls/expected}/textlinksrc-3-old.ls | 0 .../h5ls/expected}/textlinksrc-3.ls | 0 .../h5ls/expected}/textlinksrc-4.ls | 0 .../h5ls/expected}/textlinksrc-5.ls | 0 .../h5ls/expected}/textlinksrc-6-old.ls | 0 .../h5ls/expected}/textlinksrc-6.ls | 0 .../h5ls/expected}/textlinksrc-7-old.ls | 0 .../h5ls/expected}/textlinksrc-7.ls | 0 .../h5ls/expected}/textlinksrc-nodangle-1.ls | 0 .../h5ls/expected}/textlinksrc-nodangle-2.ls | 0 .../h5ls/expected}/tgroup-1.ls | 0 .../h5ls/expected}/tgroup-2.ls | 0 .../h5ls/expected}/tgroup-3.ls | 0 .../h5ls/expected}/tgroup.ls | 0 .../h5ls/expected}/tgrp_comments.ls | 0 .../h5ls/expected}/tgrpnullspace.ls | 0 .../h5ls/expected}/thlink-1.ls | 0 .../h5ls/expected}/thlinks-nodangle-1.ls | 0 .../h5ls/expected}/tloop-1.ls | 0 .../h5ls/expected}/tmultifile.ls | 0 .../h5ls/expected}/tnestcomp-1.ls | 0 .../h5ls/expected}/tnestcomp-2.ls | 0 .../h5ls/expected}/tnestcomp-3.ls | 0 .../h5ls/expected}/tnestcomp-4.ls | 0 .../{testfiles => test/h5ls/expected}/tsaf.ls | 0 .../h5ls/expected}/tslink-1.ls | 0 .../h5ls/expected}/tsoftlinks-1.ls | 0 .../h5ls/expected}/tsoftlinks-2.ls | 0 .../h5ls/expected}/tsoftlinks-3.ls | 0 .../h5ls/expected}/tsoftlinks-4.ls | 0 .../h5ls/expected}/tsoftlinks-5.ls | 0 .../h5ls/expected}/tsoftlinks-nodangle-1.ls | 0 .../h5ls/expected}/tstr-1.ls | 0 .../h5ls/expected}/tudfilter.ls | 0 .../h5ls/expected}/tudlink-1.ls | 0 .../h5ls/expected}/tvldtypes1.ls | 0 .../h5ls/expected}/tvldtypes2be.ls | 0 .../h5ls/expected}/tvldtypes2le.ls | 0 .../h5ls/expected}/vds/tvds-1.ls | 0 .../h5ls/expected}/vds/tvds-2.ls | 0 .../h5ls/expected}/vds/tvds-3_1.ls | 0 .../h5ls/expected}/vds/tvds-3_2.ls | 0 .../h5ls/expected}/vds/tvds-4.ls | 0 .../h5ls/expected}/vds/tvds-5.ls | 0 tools/test/h5ls/h5ls_plugin.sh.in | 9 +- tools/{ => test/h5ls}/testfiles/tdset_idx.h5 | Bin tools/test/h5ls/testh5ls.sh.in | 168 ++-- tools/test/h5ls/testh5lsvds.sh.in | 64 +- tools/test/h5repack/CMakeTests.cmake | 347 +++++---- .../1_vds.h5-vds_dset_chunk20x10x5-v.ddl | 0 .../2_vds.h5-vds_chunk3x6x9-v.ddl | 0 .../3_1_vds.h5-vds_chunk2x5x8-v.ddl | 0 .../4_vds.h5-vds_compa-v.ddl | 0 .../4_vds.h5-vds_conti-v.ddl | 0 .../GS.h5repack_paged_nopersist.h5.ddl | 0 .../S.h5repack_fsm_aggr_persist.h5.ddl | 0 .../SP.h5repack_fsm_aggr_nopersist.h5.ddl | 0 .../SP.h5repack_paged_persist.h5.ddl | 0 .../SPT.h5repack_aggr.h5.ddl | 0 .../STG.h5repack_none.h5.ddl | 0 .../attrregion.tattrreg.h5.ddl | 0 .../crtorder.tordergr.h5.ddl | 0 .../dataregion.tdatareg.h5.ddl | 0 .../deflate_limit.h5repack_layout.h5.ddl | 0 ...tlinks_src-base.h5copy_extlinks_src.h5.ddl | 0 ...links_src-merge.h5copy_extlinks_src.h5.tst | 0 ..._src-mergeprune.h5copy_extlinks_src.h5.ddl | 0 ...links_src-prune.h5copy_extlinks_src.h5.ddl | 0 .../{testfiles => expected}/h5repack-help.txt | 0 ...repack_filters.h5-gzip_verbose_filters.tst | 0 .../h5repack_layout.UD.h5-plugin_none.ddl | 0 ...ack_layout.h5-dset2_chunk_20x10-errstk.tst | 0 .../h5repack_layout.h5-plugin_test.ddl | 0 ...h5repack_layout.h5-plugin_version_test.ddl | 0 .../h5repack_layout.h5-plugin_zero.ddl | 0 .../h5repack_layout.h5.ddl | 0 .../onion.tst_onion_dset_1d.h5.ddl | 0 .../onion.tst_onion_dset_ext.h5.ddl | 0 .../onion.tst_onion_objs.h5.ddl | 0 .../plugin_none.h5repack_layout.UD.h5.tst | 0 .../plugin_test.h5repack_layout.h5.tst | 0 ...plugin_version_test.h5repack_layout.h5.tst | 0 .../plugin_zero.h5repack_layout.h5.tst | 0 .../textlink-base.textlink.h5.ddl | 0 .../textlink-merge.textlink.h5.tst | 0 .../textlink-mergeprune.textlink.h5.ddl | 0 .../textlink-prune.textlink.h5.ddl | 0 .../textlinkfar-base.textlinkfar.h5.ddl | 0 .../textlinkfar-merge.textlinkfar.h5.tst | 0 .../textlinkfar-mergeprune.textlinkfar.h5.ddl | 0 .../textlinkfar-prune.textlinkfar.h5.ddl | 0 .../textlinksrc-base.textlinksrc.h5.ddl | 0 .../textlinksrc-merge.textlinksrc.h5.tst | 0 .../textlinksrc-mergeprune.textlinksrc.h5.ddl | 0 .../textlinksrc-prune.textlinksrc.h5.ddl | 0 .../textlinktar-base.textlinktar.h5.ddl | 0 .../textlinktar-merge.textlinktar.h5.tst | 0 .../textlinktar-mergeprune.textlinktar.h5.ddl | 0 .../textlinktar-prune.textlinktar.h5.ddl | 0 .../tsoftlinks-base.tsoftlinks.h5.ddl | 0 .../tsoftlinks-merge.tsoftlinks.h5.tst | 0 .../tsoftlinks-mergeprune.tsoftlinks.h5.ddl | 0 .../tsoftlinks-prune.tsoftlinks.h5.ddl | 0 tools/test/h5repack/h5repack.sh.in | 210 ++--- tools/test/h5repack/h5repack_plugin.sh.in | 13 +- .../h5repack/testfiles/h5copy_extlinks_src.h5 | Bin 2184 -> 0 bytes .../h5repack/testfiles/h5copy_extlinks_trg.h5 | Bin 2168 -> 0 bytes tools/test/h5stat/CMakeTests.cmake | 6 +- .../{testfiles => expected}/h5stat_dims1.ddl | 0 .../{testfiles => expected}/h5stat_dims2.ddl | 0 .../h5stat_err1_dims.err | 0 .../h5stat_err1_links.err | 0 .../h5stat_err1_numattrs.err | 0 .../h5stat_err2_numattrs.err | 0 .../h5stat_err_old_fill.ddl | 0 .../h5stat_err_old_fill.err | 0 .../h5stat_err_old_layout.ddl | 0 .../h5stat_err_old_layout.err | 0 .../h5stat_err_refcount.ddl | 0 .../h5stat_err_refcount.err | 0 .../h5stat_filters-F.ddl | 0 .../h5stat_filters-UD.ddl | 0 .../h5stat_filters-UT.ddl | 0 .../h5stat_filters-d.ddl | 0 .../h5stat_filters-dT.ddl | 0 .../h5stat_filters-file.ddl | 0 .../h5stat_filters-g.ddl | 0 .../h5stat_filters.ddl | 0 .../{testfiles => expected}/h5stat_help1.ddl | 0 .../{testfiles => expected}/h5stat_help2.ddl | 0 .../{testfiles => expected}/h5stat_idx.ddl | 0 .../{testfiles => expected}/h5stat_links1.ddl | 0 .../{testfiles => expected}/h5stat_links2.ddl | 0 .../{testfiles => expected}/h5stat_links3.ddl | 0 .../{testfiles => expected}/h5stat_links4.ddl | 0 .../{testfiles => expected}/h5stat_links5.ddl | 0 .../h5stat_newgrat-UA.ddl | 0 .../h5stat_newgrat-UG.ddl | 0 .../h5stat_newgrat.ddl | 0 .../{testfiles => expected}/h5stat_nofile.ddl | 0 .../{testfiles => expected}/h5stat_nofile.err | 0 .../h5stat_notexist.ddl | 0 .../h5stat_notexist.err | 0 .../h5stat_numattrs1.ddl | 0 .../h5stat_numattrs2.ddl | 0 .../h5stat_numattrs3.ddl | 0 .../h5stat_numattrs4.ddl | 0 .../{testfiles => expected}/h5stat_tsohm.ddl | 0 tools/test/h5stat/testh5stat.sh.in | 86 +-- tools/test/misc/CMakeTestsClear.cmake | 15 +- tools/test/misc/CMakeTestsMkgrp.cmake | 4 +- tools/test/misc/CMakeTestsRepart.cmake | 2 +- .../h5clear_equal_after_size.ddl | 0 .../h5clear_equal_before_size.ddl | 0 .../h5clear_greater_after_size.ddl | 0 .../h5clear_greater_before_size.ddl | 0 .../h5clear_less_after_size.ddl | 0 .../h5clear_less_before_size.ddl | 0 .../h5clear_missing_file.ddl | 0 .../h5clear_missing_file.err | 0 .../h5clear_no_mdc_image.err | 0 .../h5clear_noclose_after_size.ddl | 0 .../h5clear_noclose_before_size.ddl | 0 .../h5clear_open_fail.err | 0 .../h5clear_status_noclose_after_size.ddl | 0 .../{testfiles => expected}/h5clear_usage.ddl | 0 .../h5clear_user_equal_after_size.ddl | 0 .../h5clear_user_equal_before_size.ddl | 0 .../h5clear_user_greater_after_size.ddl | 0 .../h5clear_user_greater_before_size.ddl | 0 .../h5clear_user_less_after_size.ddl | 0 .../h5clear_user_less_before_size.ddl | 0 .../{testfiles => expected}/h5mkgrp_help.txt | 0 .../misc/expected}/h5mkgrp_nested_lp.ls | 0 .../misc/expected}/h5mkgrp_nested_mult_lp.ls | 0 .../misc/expected}/h5mkgrp_nested_mult_p.ls | 0 .../misc/expected}/h5mkgrp_nested_p.ls | 0 .../misc/expected}/h5mkgrp_several.ls | 0 .../misc/expected}/h5mkgrp_several_l.ls | 0 .../misc/expected}/h5mkgrp_several_p.ls | 0 .../misc/expected}/h5mkgrp_several_v.ls | 0 .../misc/expected}/h5mkgrp_single.ls | 0 .../misc/expected}/h5mkgrp_single_l.ls | 0 .../misc/expected}/h5mkgrp_single_p.ls | 0 .../misc/expected}/h5mkgrp_single_v.ls | 0 .../misc}/testfiles/family_file00000.h5 | Bin .../misc}/testfiles/family_file00001.h5 | Bin .../misc}/testfiles/family_file00002.h5 | Bin .../misc}/testfiles/family_file00003.h5 | Bin .../misc}/testfiles/family_file00004.h5 | Bin .../misc}/testfiles/family_file00005.h5 | Bin .../misc}/testfiles/family_file00006.h5 | Bin .../misc}/testfiles/family_file00007.h5 | Bin .../misc}/testfiles/family_file00008.h5 | Bin .../misc}/testfiles/family_file00009.h5 | Bin .../misc}/testfiles/family_file00010.h5 | Bin .../misc}/testfiles/family_file00011.h5 | Bin .../misc}/testfiles/family_file00012.h5 | Bin .../misc}/testfiles/family_file00013.h5 | Bin .../misc}/testfiles/family_file00014.h5 | Bin .../misc}/testfiles/family_file00015.h5 | Bin .../misc}/testfiles/family_file00016.h5 | Bin .../misc}/testfiles/family_file00017.h5 | Bin tools/test/misc/testh5clear.sh.in | 40 +- tools/test/misc/testh5mkgrp.sh.in | 28 +- tools/test/misc/testh5repart.sh.in | 40 +- tools/test/perform/CMakeTests.cmake | 2 +- utils/tools/test/h5dwalk/testh5dwalk.sh.in | 5 +- 1163 files changed, 2292 insertions(+), 2224 deletions(-) rename hl/test/{ => testfiles}/dsdata.txt (100%) rename hl/test/{ => testfiles}/dslat.txt (100%) rename hl/test/{ => testfiles}/dslon.txt (100%) rename hl/test/{ => testfiles}/dtype_file.txt (100%) rename hl/test/{ => testfiles}/dtype_file_readable.txt (100%) rename hl/test/{ => testfiles}/earth.pal (100%) rename hl/test/{ => testfiles}/image24pixel.txt (100%) rename hl/test/{ => testfiles}/image24plane.txt (100%) rename hl/test/{ => testfiles}/image8.txt (100%) rename hl/test/{ => testfiles}/sepia.pal (100%) rename hl/test/{ => testfiles}/test_ds_be.h5 (100%) rename hl/test/{ => testfiles}/test_ds_be_new_ref-32bit.h5 (100%) rename hl/test/{ => testfiles}/test_ds_be_new_ref.h5 (100%) rename hl/test/{ => testfiles}/test_ds_le.h5 (100%) rename hl/test/{ => testfiles}/test_ds_le_new_ref.h5 (100%) rename hl/test/{ => testfiles}/test_ld.h5 (100%) rename hl/test/{ => testfiles}/test_table_be.h5 (100%) rename hl/test/{ => testfiles}/test_table_cray.h5 (100%) rename hl/test/{ => testfiles}/test_table_le.h5 (100%) rename hl/test/{ => testfiles}/usa.wri (100%) rename hl/tools/{ => h5watch}/testfiles/w-err-cmpd1.err (100%) rename hl/tools/{ => h5watch}/testfiles/w-err-cmpd2.err (100%) rename hl/tools/{ => h5watch}/testfiles/w-err-cmpd3.err (100%) rename hl/tools/{ => h5watch}/testfiles/w-err-cmpd4.err (100%) rename hl/tools/{ => h5watch}/testfiles/w-err-cmpd5.err (100%) rename hl/tools/{ => h5watch}/testfiles/w-err-dset-nomax.err (100%) rename hl/tools/{ => h5watch}/testfiles/w-err-dset-none.err (100%) rename hl/tools/{ => h5watch}/testfiles/w-err-dset1.err (100%) rename hl/tools/{ => h5watch}/testfiles/w-err-dset2.err (100%) rename hl/tools/{ => h5watch}/testfiles/w-err-file.err (100%) rename hl/tools/{ => h5watch}/testfiles/w-err-poll.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-err-poll0.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-err-std.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-err-width.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-cmpd-esc-f1.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-cmpd-esc-f3.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-cmpd-esc-ff2.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-cmpd-esc.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-cmpd-f1.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-cmpd-f2.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-cmpd-ff3.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-cmpd-label.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-cmpd-two-f1.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-cmpd-two-f3.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-cmpd-two-ff2.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-cmpd-two.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-cmpd.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-early.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-late.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-one-d.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-one-simple.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-one.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-two-d.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-two-width.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-ext-two.ddl (100%) rename hl/tools/{ => h5watch}/testfiles/w-help1.ddl (100%) rename test/{ => testfiles}/aggr.h5 (100%) rename test/{ => testfiles}/bad_compound.h5 (100%) rename test/{ => testfiles}/bad_offset.h5 (100%) rename test/{ => testfiles}/be_data.h5 (100%) rename test/{ => testfiles}/be_extlink1.h5 (100%) rename test/{ => testfiles}/be_extlink2.h5 (100%) rename test/{ => testfiles}/btree_idx_1_6.h5 (100%) rename test/{ => testfiles}/btree_idx_1_8.h5 (100%) rename test/{ => testfiles}/corrupt_stab_msg.h5 (100%) rename test/{ => testfiles}/cve_2020_10810.h5 (100%) rename test/{ => testfiles}/cve_2020_10812.h5 (100%) rename test/{ => testfiles}/deflate.h5 (100%) rename test/{ => testfiles}/family_v16-000000.h5 (100%) rename test/{ => testfiles}/family_v16-000001.h5 (100%) rename test/{ => testfiles}/family_v16-000002.h5 (100%) rename test/{ => testfiles}/family_v16-000003.h5 (100%) rename test/{ => testfiles}/file_image_core_test.h5 (100%) rename test/{ => testfiles}/filespace_1_6.h5 (100%) rename test/{ => testfiles}/filespace_1_8.h5 (100%) rename test/{ => testfiles}/fill18.h5 (100%) rename test/{ => testfiles}/fill_old.h5 (100%) rename test/{ => testfiles}/filter_error.h5 (100%) rename test/{ => testfiles}/fsm_aggr_nopersist.h5 (100%) rename test/{ => testfiles}/fsm_aggr_persist.h5 (100%) rename test/{ => testfiles}/group_old.h5 (100%) rename test/{ => testfiles}/h5fc_ext1_f.h5 (100%) rename test/{ => testfiles}/h5fc_ext1_i.h5 (100%) rename test/{ => testfiles}/h5fc_ext2_if.h5 (100%) rename test/{ => testfiles}/h5fc_ext2_sf.h5 (100%) rename test/{ => testfiles}/h5fc_ext3_isf.h5 (100%) rename test/{ => testfiles}/h5fc_ext_none.h5 (100%) rename test/{ => testfiles}/le_data.h5 (100%) rename test/{ => testfiles}/le_extlink1.h5 (100%) rename test/{ => testfiles}/le_extlink2.h5 (100%) rename test/{ => testfiles}/memleak_H5O_dtype_decode_helper_H5Odtype.h5 (100%) rename test/{ => testfiles}/mergemsg.h5 (100%) rename test/{ => testfiles}/multi_file_v16-r.h5 (100%) rename test/{ => testfiles}/multi_file_v16-s.h5 (100%) rename test/{ => testfiles}/noencoder.h5 (100%) rename test/{ => testfiles}/none.h5 (100%) rename test/{ => testfiles}/paged_nopersist.h5 (100%) rename test/{ => testfiles}/paged_persist.h5 (100%) rename test/{ => testfiles}/specmetaread.h5 (100%) rename test/{ => testfiles}/tarrold.h5 (100%) rename test/{ => testfiles}/tbad_msg_count.h5 (100%) rename test/{ => testfiles}/tbogus.h5 (100%) rename test/{ => testfiles}/test_filters_be.h5 (100%) rename test/{ => testfiles}/test_filters_le.h5 (100%) rename test/{ => testfiles}/th5s.h5 (100%) rename test/{ => testfiles}/tlayouto.h5 (100%) rename test/{ => testfiles}/tmtimen.h5 (100%) rename test/{ => testfiles}/tmtimeo.h5 (100%) rename {tools => test}/testfiles/tnullspace.h5 (100%) rename test/{ => testfiles}/tsizeslheap.h5 (100%) rename tools/test/h5copy/{testfiles => expected}/h5copy_extlinks_src.out.ls (100%) rename tools/test/h5copy/{testfiles => expected}/h5copy_help1.ddl (100%) rename tools/test/h5copy/{testfiles => expected}/h5copy_help2.ddl (100%) rename tools/test/h5copy/{testfiles => expected}/h5copy_misc1.err (100%) rename tools/test/h5copy/{testfiles => expected}/h5copy_misc1.out (100%) rename tools/test/h5copy/{testfiles => expected}/h5copy_plugin_fail_ERR.out.h5.txt (100%) rename tools/test/h5copy/{testfiles => expected}/h5copy_plugin_test.out.h5.txt (100%) rename tools/test/h5copy/{testfiles => expected}/h5copy_ref.out.ls (100%) rename tools/test/h5copy/{testfiles => expected}/h5copytst.out.ls (100%) rename tools/test/h5copy/{testfiles => expected}/h5copytst_new.out.ls (100%) rename tools/test/h5copy/{testfiles => expected}/tudfilter.h5.txt (100%) rename tools/test/h5copy/{testfiles => expected}/tudfilter.h5_ERR.txt (100%) rename tools/test/h5diff/{testfiles => expected}/dangling_link.err (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_10.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_100.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_101.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_101w.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_102.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_102w.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_103.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_103w.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_104.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_104w.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_11.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_12.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_13.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_14.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_15.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_16_1.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_16_2.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_16_3.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_17.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_171.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_172.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_18.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_18_1.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_19.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_20.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_200.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_201.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_202.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_203.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_204.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_205.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_206.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_207.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_208.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_21.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_22.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_220.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_221.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_222.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_223.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_224.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_23.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_24.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_25.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_26.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_27.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_28.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_30.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_300.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_400.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_401.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_402.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_403.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_404.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_405.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_406.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_407.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_408.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_409.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_410.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_411.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_412.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_413.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_414.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_415.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_416.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_417.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_418.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_419.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_420.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_421.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_422.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_423.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_424.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_425.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_450.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_451.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_452.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_453.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_454.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_455.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_456.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_457.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_458.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_459.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_465.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_466.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_467.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_468.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_469.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_471.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_472.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_473.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_474.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_475.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_480.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_481.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_482.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_483.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_484.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_485.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_486.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_487.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_50.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_500.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_501.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_502.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_503.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_504.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_505.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_506.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_507.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_508.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_509.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_51.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_510.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_511.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_512.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_513.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_514.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_515.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_516.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_517.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_518.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_52.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_53.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_530.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_54.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_540.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_55.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_56.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_57.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_58.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_58_ref.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_59.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_60.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_600.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_601.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_601_ERR.err (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_603.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_604.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_605.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_606.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_607.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_608.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_609.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_61.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_610.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_612.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_613.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_614.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_615.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_616.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_617.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_618.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_619.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_62.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_621.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_622.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_623.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_624.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_625.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_626.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_627.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_628.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_629.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_63.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_630.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_631.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_640.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_641.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_642.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_643.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_644.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_645.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_646.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_70.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_700.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_701.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_702.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_703.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_704.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_705.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_706.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_707.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_708.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_709.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_710.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_80.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_800.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_801.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_830.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_8625.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_8639.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_90.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_900.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_901.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_902.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_eps.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_reg.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_ud.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_udfail.err (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_udfail.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_v1.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_v2.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_v3.txt (100%) rename tools/test/h5diff/{testfiles => expected}/h5diff_vlstr.txt (100%) rename tools/test/h5dump/errfiles/{ => pbits}/tnofilename-with-packed-bits.err (100%) rename tools/test/h5dump/errfiles/{ => pbits}/tpbitsCharLengthExceeded.err (100%) rename tools/test/h5dump/errfiles/{ => pbits}/tpbitsCharOffsetExceeded.err (100%) rename tools/test/h5dump/errfiles/{ => pbits}/tpbitsIncomplete.err (100%) rename tools/test/h5dump/errfiles/{ => pbits}/tpbitsIntLengthExceeded.err (100%) rename tools/test/h5dump/errfiles/{ => pbits}/tpbitsIntOffsetExceeded.err (100%) rename tools/test/h5dump/errfiles/{ => pbits}/tpbitsLengthExceeded.err (100%) rename tools/test/h5dump/errfiles/{ => pbits}/tpbitsLengthPositive.err (100%) rename tools/test/h5dump/errfiles/{ => pbits}/tpbitsLongLengthExceeded.err (100%) rename tools/test/h5dump/errfiles/{ => pbits}/tpbitsLongOffsetExceeded.err (100%) rename tools/test/h5dump/errfiles/{ => pbits}/tpbitsMaxExceeded.err (100%) rename tools/test/h5dump/errfiles/{ => pbits}/tpbitsOffsetExceeded.err (100%) rename tools/test/h5dump/errfiles/{ => pbits}/tpbitsOffsetNegative.err (100%) rename tools/{testfiles => test/h5dump/expected}/charsets.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/err_attr_dspace.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/file_space.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/filter_fail.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/h5dump-help.txt (100%) rename tools/{testfiles => test/h5dump/expected}/non_existing.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/out3.h5import (100%) rename tools/{testfiles => test/h5dump/expected}/packedbits.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tnofilename-with-packed-bits.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsArray.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsCharLengthExceeded.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsCharOffsetExceeded.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsCompound.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsIncomplete.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsIntLengthExceeded.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsIntOffsetExceeded.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsLengthExceeded.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsLengthPositive.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsLongLengthExceeded.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsLongOffsetExceeded.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsMax.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsMaxExceeded.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsOffsetExceeded.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsOffsetNegative.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsOverlapped.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSigned.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSigned2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSigned4.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSignedInt.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSignedInt4.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSignedInt8.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSignedIntWhole.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSignedLong.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSignedLong16.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSignedLong8.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSignedLongLong.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSignedLongLong16.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSignedLongLong32.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSignedLongLongWhole.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSignedLongLongWhole1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSignedLongLongWhole63.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSignedLongWhole.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsSignedWhole.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsigned.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsigned2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsigned4.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsignedInt.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsignedInt4.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsignedInt8.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsignedIntWhole.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsignedLong.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsignedLong16.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsignedLong8.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsignedLongLong.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsignedLongLong16.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsignedLongLong32.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsignedLongLongWhole.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsignedLongLongWhole1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsignedLongLongWhole63.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsignedLongWhole.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/pbits/tpbitsUnsignedWhole.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tall-1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tall-2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tall-2A.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tall-2A0.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tall-2B.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tall-3.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tall-4s.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tall-5s.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tall-6.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tall-7.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tall-7N.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tallfilters.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tarray1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tarray1_big.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tarray2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tarray3.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tarray4.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tarray5.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tarray6.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tarray7.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tarray8.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tattr-1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tattr-2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tattr-3.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tattr-4_be.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tattrcontents1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tattrcontents2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tattrintsize.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tattrreg.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tattrregR.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tbigdims.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tbin1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tbin2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tbin3.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tbin4.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tbinregR.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tbitnopaque_be.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tbitnopaque_le.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tboot1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tboot2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tboot2A.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tboot2B.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tchar1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tchunked.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tcmpdattrintsize.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tcmpdintarray.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tcmpdints.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tcmpdintsize.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tcomp-1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tcomp-2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tcomp-3.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tcomp-4.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tcompact.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tcompound_complex2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tcontents.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tcontiguos.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tdatareg.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tdataregR.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tdeflate.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tdset-1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tdset-2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tdset-3s.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tempty.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/texceedsubblock.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/texceedsubcount.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/texceedsubstart.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/texceedsubstride.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/texternal.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/textlink.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/textlinkfar.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/textlinksrc.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tfamily.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tfill.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tfletcher32.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tfloatsattrs.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tfloatsattrs.wddl (100%) rename tools/{testfiles => test/h5dump/expected}/tfpformat.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tgroup-1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tgroup-2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tgrp_comments.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tgrpnullspace.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/thlink-1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/thlink-2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/thlink-3.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/thlink-4.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/thlink-5.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/thyperslab.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tindicesno.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tindicessub1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tindicessub2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tindicessub3.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tindicessub4.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tindicesyes.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tints4dims.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tints4dimsBlock2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tints4dimsBlockEq.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tints4dimsCount2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tints4dimsCountEq.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tints4dimsStride2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tintsattrs.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tintsnodata.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tlarge_objname.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tldouble.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tldouble_scalar.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tlonglinks.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tloop-1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tmulti.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tmultifile.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tnamed_dtype_attr.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tnbit.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tnestcomp-1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tnestedcmpddt.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tno-subset.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tnoattrdata.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tnoattrddl.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tnodata.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tnoddl.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tnoddlfile.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tnullspace.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/torderattr1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/torderattr2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/torderattr3.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/torderattr4.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tordercontents1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tordercontents2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tordergr1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tordergr2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tordergr3.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tordergr4.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tordergr5.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/torderlinks1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/torderlinks2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tperror.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tqmarkfile.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/trawdatafile.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/trawssetfile.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/treadfilter.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/treadintfilter.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/trefer_attrR.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/trefer_compatR.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/trefer_extR.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/trefer_grpR.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/trefer_objR.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/trefer_obj_delR.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/trefer_paramR.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/trefer_regR.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/trefer_reg_1dR.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/treference.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tsaf.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tscalarattrintsize.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tscalarintattrsize.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tscalarintsize.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tscalarstring.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tscaleoffset.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tshuffle.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tslink-1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tslink-2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tslink-D.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tsplit_file.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tst_onion_dset_1d.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tst_onion_dset_ext.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tst_onion_objs.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tst_onion_revision_count.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tstarfile.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tstr-1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tstr-2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tstring.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tstring2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tstringe.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tszip.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tudfilter.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tudlink-1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tudlink-2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tuserfilter.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tvldtypes1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tvldtypes2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tvldtypes3.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tvldtypes4.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tvldtypes5.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tvlenstr_array.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tvlstr.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/tvms.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/twidedisplay.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/twithddlfile.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/vds/tvds-1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/vds/tvds-2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/vds/tvds-3_1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/vds/tvds-3_2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/vds/tvds-4.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/vds/tvds-5.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/vds/tvds_layout-1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/vds/tvds_layout-2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/vds/tvds_layout-3_1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/vds/tvds_layout-3_2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/vds/tvds_layout-4.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/vds/tvds_layout-5.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/vds/vds-first.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/vds/vds-gap1.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/vds/vds-gap2.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/vds/vds_layout-eiger.ddl (100%) rename tools/{testfiles => test/h5dump/expected}/vds/vds_layout-maxmin.ddl (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tall-2A.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tall.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tarray1.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tarray2.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tarray3.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tarray6.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tarray7.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tattr.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tbitfields_be.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tbitfields_le.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tcompound.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tcompound2.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tcompound_complex.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tdatareg.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tdset.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tdset2.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tempty-dtd-2.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tempty-dtd-uri.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tempty-dtd.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tempty-nons-2.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tempty-nons-uri.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tempty-nons.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tempty-ns-2.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tempty-ns.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tempty.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tenum.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/test35.nc.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/textlink.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tfpformat.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tgroup.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/thlink.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tloop.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tloop2.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tmany.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tname-amp.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tname-apos.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tname-gt.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tname-lt.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tname-quot.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tname-sp.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tnamed_dtype_attr.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tnestedcomp.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tnodata.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tnullspace.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tobjref.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/topaque.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/torderattr1.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/torderattr2.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/torderattr3.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/torderattr4.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tref-escapes-at.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tref-escapes.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tref.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tsaf.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tslink.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tstr.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tstr2.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tstring-at.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tstring.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tudlink.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tvldtypes1.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tvldtypes2.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tvldtypes3.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tvldtypes4.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tvldtypes5.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected/xml}/tvlstr.h5.xml (100%) rename tools/{testfiles => test/h5dump/expected}/zerodim.ddl (100%) rename tools/{testfiles => test/h5dump/exportfiles}/tall-6.exp (100%) rename tools/{testfiles => test/h5dump/exportfiles}/tbinregR.exp (100%) rename tools/{testfiles => test/h5dump/exportfiles}/tnoddlfile.exp (100%) rename tools/{testfiles => test/h5dump/exportfiles}/trawdatafile.exp (100%) rename tools/{testfiles => test/h5dump/exportfiles}/trawssetfile.exp (100%) rename tools/{testfiles => test/h5dump/exportfiles}/tstr2bin2.exp (100%) rename tools/{testfiles => test/h5dump/exportfiles}/tstr2bin6.exp (100%) rename tools/{testfiles => test/h5dump/exportfiles}/twithddl.exp (100%) rename tools/{testfiles => test/h5dump/exportfiles}/twithddlfile.exp (100%) rename tools/{ => test/h5dump}/testfiles/charsets.h5 (100%) rename tools/{ => test/h5dump}/testfiles/err_attr_dspace.h5 (100%) rename tools/{ => test/h5dump}/testfiles/file_space.h5 (100%) rename tools/{ => test/h5dump}/testfiles/filter_fail.h5 (100%) rename tools/{ => test/h5dump}/testfiles/packedbits.h5 (100%) rename tools/{ => test/h5dump}/testfiles/t128bit_float.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tCVE-2021-37501_attr_decode.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tCVE_2018_11206_fill_new.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tCVE_2018_11206_fill_old.h5 (100%) rename tools/{ => test/h5dump}/testfiles/taindices.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tall.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tarray1.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tarray1_big.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tarray2.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tarray3.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tarray4.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tarray5.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tarray6.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tarray7.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tarray8.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tattr.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tattr2.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tattr4_be.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tattrintsize.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tattrreg.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tbigdims.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tbinary.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tbitnopaque.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tchar.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tcmpdattrintsize.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tcmpdintarray.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tcmpdints.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tcmpdintsize.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tcompound.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tcompound_complex.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tcompound_complex2.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tdatareg.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tdset.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tempty.h5 (100%) rename tools/{ => test/h5dump}/testfiles/textlink.h5 (100%) rename tools/{ => test/h5dump}/testfiles/textlinkfar.h5 (100%) rename tools/{ => test/h5dump}/testfiles/textlinksrc.h5 (100%) rename tools/{ => test/h5dump}/testfiles/textlinktar.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tfamily00000.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tfamily00001.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tfamily00002.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tfamily00003.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tfamily00004.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tfamily00005.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tfamily00006.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tfamily00007.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tfamily00008.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tfamily00009.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tfamily00010.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tfcontents1.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tfcontents2.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tfilters.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tfloatsattrs.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tfpformat.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tfvalues.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tgroup.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tgrp_comments.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tgrpnullspace.h5 (100%) rename tools/{ => test/h5dump}/testfiles/thlink.h5 (100%) rename tools/{ => test/h5dump}/testfiles/thyperslab.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tints4dims.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tintsattrs.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tintsnodata.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tlarge_objname.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tldouble.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tldouble_scalar.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tlonglinks.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tloop.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tmulti-b.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tmulti-g.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tmulti-l.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tmulti-o.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tmulti-r.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tmulti-s.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tnamed_dtype_attr.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tnestedcmpddt.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tnestedcomp.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tno-subset.h5 (100%) create mode 100644 tools/test/h5dump/testfiles/tnullspace.h5 rename tools/{ => test/h5dump}/testfiles/torderattr.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tordergr.h5 (100%) rename tools/{ => test/h5dump}/testfiles/trefer_attr.h5 (100%) rename tools/{ => test/h5dump}/testfiles/trefer_compat.h5 (100%) rename tools/{ => test/h5dump}/testfiles/trefer_ext1.h5 (100%) rename tools/{ => test/h5dump}/testfiles/trefer_ext2.h5 (100%) rename tools/{ => test/h5dump}/testfiles/trefer_grp.h5 (100%) rename tools/{ => test/h5dump}/testfiles/trefer_obj.h5 (100%) rename tools/{ => test/h5dump}/testfiles/trefer_obj_del.h5 (100%) rename tools/{ => test/h5dump}/testfiles/trefer_param.h5 (100%) rename tools/{ => test/h5dump}/testfiles/trefer_reg.h5 (100%) rename tools/{ => test/h5dump}/testfiles/trefer_reg_1d.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tsaf.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tscalarattrintsize.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tscalarintattrsize.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tscalarintsize.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tscalarstring.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tslink.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tsoftlinks.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tsplit_file-m.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tsplit_file-r.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tst_onion_dset_1d.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tst_onion_dset_1d.h5.onion (100%) rename tools/{ => test/h5dump}/testfiles/tst_onion_dset_ext.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tst_onion_dset_ext.h5.onion (100%) rename tools/{ => test/h5dump}/testfiles/tst_onion_objs.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tst_onion_objs.h5.onion (100%) rename tools/{ => test/h5dump}/testfiles/tstr.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tstr2.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tstr3.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tudfilter.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tudlink.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tvldtypes1.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tvldtypes2.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tvldtypes3.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tvldtypes4.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tvldtypes5.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tvlenstr_array.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tvlstr.h5 (100%) rename tools/{ => test/h5dump}/testfiles/tvms.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/1_a.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/1_b.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/1_c.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/1_d.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/1_e.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/1_f.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/1_vds.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/2_a.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/2_b.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/2_c.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/2_d.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/2_e.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/2_vds.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/3_1_vds.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/3_2_vds.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/4_0.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/4_1.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/4_2.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/4_vds.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/5_a.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/5_b.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/5_c.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/5_vds.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/a.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/b.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/c.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/d.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/f-0.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/f-3.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/vds-eiger.h5 (100%) rename tools/{ => test/h5dump}/testfiles/vds/vds-percival-unlim-maxmin.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tbitfields.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tcompound2.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tdset2.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tenum.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/test35.nc (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tloop2.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tmany.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tname-amp.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tname-apos.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tname-gt.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tname-lt.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tname-quot.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tname-sp.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tnodata.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tobjref.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/topaque.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tref-escapes-at.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tref-escapes.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tref.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tstring-at.h5 (100%) rename tools/{testfiles => test/h5dump/testfiles/xml}/tstring.h5 (100%) rename tools/{ => test/h5dump}/testfiles/zerodim.h5 (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_d_file-d.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_d_file.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_d_file.ddl.err (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_dname.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_dname.err (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_ext1_f.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_ext1_i.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_ext1_s.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_ext2_if.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_ext2_is.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_ext2_sf.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_ext3_isf.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_help.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_nonexistdset_file.ddl.err (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_nonexistfile.ddl.err (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_nooption.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_v_all.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_v_bt1.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_v_err.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_v_err.ddl.err (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_v_n_1d.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_v_n_all.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_v_ndata_bt1.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/h5fc_v_non_chunked.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/old_h5fc_ext1_f.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/old_h5fc_ext1_i.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/old_h5fc_ext1_s.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/old_h5fc_ext2_if.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/old_h5fc_ext2_is.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/old_h5fc_ext2_sf.ddl (100%) rename tools/test/h5format_convert/{testfiles => expected}/old_h5fc_ext3_isf.ddl (100%) rename tools/test/h5jam/{testfiles => expected}/h5jam-help.txt (100%) rename tools/test/h5jam/{testfiles => expected}/h5jam-ub-nohdf5.txt (100%) rename tools/test/h5jam/{testfiles => expected}/h5unjam-help.txt (100%) rename tools/test/h5jam/{testfiles => expected}/u10.txt (100%) rename tools/test/h5jam/{testfiles => expected}/u511.txt (100%) rename tools/test/h5jam/{testfiles => expected}/u512.txt (100%) rename tools/test/h5jam/{testfiles => expected}/u513.txt (100%) rename tools/{testfiles => test/h5ls/expected}/help-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/help-2.ls (100%) rename tools/{testfiles => test/h5ls/expected}/help-3.ls (100%) rename tools/{testfiles => test/h5ls/expected}/nosuchfile.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tall-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tall-2.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tarray1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tattr2.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tattrreg_be.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tattrreg_le.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tcomp-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tdataregbe.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tdataregle.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tdset-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tdset_idx.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tempty.ls (100%) rename tools/{testfiles => test/h5ls/expected}/textlink-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/textlinksrc-1-old.ls (100%) rename tools/{testfiles => test/h5ls/expected}/textlinksrc-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/textlinksrc-2-old.ls (100%) rename tools/{testfiles => test/h5ls/expected}/textlinksrc-2.ls (100%) rename tools/{testfiles => test/h5ls/expected}/textlinksrc-3-old.ls (100%) rename tools/{testfiles => test/h5ls/expected}/textlinksrc-3.ls (100%) rename tools/{testfiles => test/h5ls/expected}/textlinksrc-4.ls (100%) rename tools/{testfiles => test/h5ls/expected}/textlinksrc-5.ls (100%) rename tools/{testfiles => test/h5ls/expected}/textlinksrc-6-old.ls (100%) rename tools/{testfiles => test/h5ls/expected}/textlinksrc-6.ls (100%) rename tools/{testfiles => test/h5ls/expected}/textlinksrc-7-old.ls (100%) rename tools/{testfiles => test/h5ls/expected}/textlinksrc-7.ls (100%) rename tools/{testfiles => test/h5ls/expected}/textlinksrc-nodangle-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/textlinksrc-nodangle-2.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tgroup-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tgroup-2.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tgroup-3.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tgroup.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tgrp_comments.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tgrpnullspace.ls (100%) rename tools/{testfiles => test/h5ls/expected}/thlink-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/thlinks-nodangle-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tloop-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tmultifile.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tnestcomp-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tnestcomp-2.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tnestcomp-3.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tnestcomp-4.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tsaf.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tslink-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tsoftlinks-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tsoftlinks-2.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tsoftlinks-3.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tsoftlinks-4.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tsoftlinks-5.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tsoftlinks-nodangle-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tstr-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tudfilter.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tudlink-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tvldtypes1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tvldtypes2be.ls (100%) rename tools/{testfiles => test/h5ls/expected}/tvldtypes2le.ls (100%) rename tools/{testfiles => test/h5ls/expected}/vds/tvds-1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/vds/tvds-2.ls (100%) rename tools/{testfiles => test/h5ls/expected}/vds/tvds-3_1.ls (100%) rename tools/{testfiles => test/h5ls/expected}/vds/tvds-3_2.ls (100%) rename tools/{testfiles => test/h5ls/expected}/vds/tvds-4.ls (100%) rename tools/{testfiles => test/h5ls/expected}/vds/tvds-5.ls (100%) rename tools/{ => test/h5ls}/testfiles/tdset_idx.h5 (100%) rename tools/test/h5repack/{testfiles => expected}/1_vds.h5-vds_dset_chunk20x10x5-v.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/2_vds.h5-vds_chunk3x6x9-v.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/3_1_vds.h5-vds_chunk2x5x8-v.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/4_vds.h5-vds_compa-v.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/4_vds.h5-vds_conti-v.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/GS.h5repack_paged_nopersist.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/S.h5repack_fsm_aggr_persist.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/SP.h5repack_fsm_aggr_nopersist.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/SP.h5repack_paged_persist.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/SPT.h5repack_aggr.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/STG.h5repack_none.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/attrregion.tattrreg.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/crtorder.tordergr.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/dataregion.tdatareg.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/deflate_limit.h5repack_layout.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst (100%) rename tools/test/h5repack/{testfiles => expected}/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/h5repack-help.txt (100%) rename tools/test/h5repack/{testfiles => expected}/h5repack_filters.h5-gzip_verbose_filters.tst (100%) rename tools/test/h5repack/{testfiles => expected}/h5repack_layout.UD.h5-plugin_none.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst (100%) rename tools/test/h5repack/{testfiles => expected}/h5repack_layout.h5-plugin_test.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/h5repack_layout.h5-plugin_version_test.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/h5repack_layout.h5-plugin_zero.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/h5repack_layout.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/onion.tst_onion_dset_1d.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/onion.tst_onion_dset_ext.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/onion.tst_onion_objs.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/plugin_none.h5repack_layout.UD.h5.tst (100%) rename tools/test/h5repack/{testfiles => expected}/plugin_test.h5repack_layout.h5.tst (100%) rename tools/test/h5repack/{testfiles => expected}/plugin_version_test.h5repack_layout.h5.tst (100%) rename tools/test/h5repack/{testfiles => expected}/plugin_zero.h5repack_layout.h5.tst (100%) rename tools/test/h5repack/{testfiles => expected}/textlink-base.textlink.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/textlink-merge.textlink.h5.tst (100%) rename tools/test/h5repack/{testfiles => expected}/textlink-mergeprune.textlink.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/textlink-prune.textlink.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/textlinkfar-base.textlinkfar.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/textlinkfar-merge.textlinkfar.h5.tst (100%) rename tools/test/h5repack/{testfiles => expected}/textlinkfar-mergeprune.textlinkfar.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/textlinkfar-prune.textlinkfar.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/textlinksrc-base.textlinksrc.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/textlinksrc-merge.textlinksrc.h5.tst (100%) rename tools/test/h5repack/{testfiles => expected}/textlinksrc-mergeprune.textlinksrc.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/textlinksrc-prune.textlinksrc.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/textlinktar-base.textlinktar.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/textlinktar-merge.textlinktar.h5.tst (100%) rename tools/test/h5repack/{testfiles => expected}/textlinktar-mergeprune.textlinktar.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/textlinktar-prune.textlinktar.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/tsoftlinks-base.tsoftlinks.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/tsoftlinks-merge.tsoftlinks.h5.tst (100%) rename tools/test/h5repack/{testfiles => expected}/tsoftlinks-mergeprune.tsoftlinks.h5.ddl (100%) rename tools/test/h5repack/{testfiles => expected}/tsoftlinks-prune.tsoftlinks.h5.ddl (100%) delete mode 100644 tools/test/h5repack/testfiles/h5copy_extlinks_src.h5 delete mode 100644 tools/test/h5repack/testfiles/h5copy_extlinks_trg.h5 rename tools/test/h5stat/{testfiles => expected}/h5stat_dims1.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_dims2.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_err1_dims.err (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_err1_links.err (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_err1_numattrs.err (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_err2_numattrs.err (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_err_old_fill.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_err_old_fill.err (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_err_old_layout.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_err_old_layout.err (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_err_refcount.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_err_refcount.err (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_filters-F.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_filters-UD.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_filters-UT.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_filters-d.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_filters-dT.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_filters-file.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_filters-g.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_filters.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_help1.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_help2.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_idx.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_links1.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_links2.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_links3.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_links4.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_links5.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_newgrat-UA.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_newgrat-UG.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_newgrat.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_nofile.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_nofile.err (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_notexist.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_notexist.err (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_numattrs1.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_numattrs2.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_numattrs3.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_numattrs4.ddl (100%) rename tools/test/h5stat/{testfiles => expected}/h5stat_tsohm.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5clear_equal_after_size.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5clear_equal_before_size.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5clear_greater_after_size.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5clear_greater_before_size.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5clear_less_after_size.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5clear_less_before_size.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5clear_missing_file.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5clear_missing_file.err (100%) rename tools/test/misc/{testfiles => expected}/h5clear_no_mdc_image.err (100%) rename tools/test/misc/{testfiles => expected}/h5clear_noclose_after_size.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5clear_noclose_before_size.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5clear_open_fail.err (100%) rename tools/test/misc/{testfiles => expected}/h5clear_status_noclose_after_size.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5clear_usage.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5clear_user_equal_after_size.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5clear_user_equal_before_size.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5clear_user_greater_after_size.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5clear_user_greater_before_size.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5clear_user_less_after_size.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5clear_user_less_before_size.ddl (100%) rename tools/test/misc/{testfiles => expected}/h5mkgrp_help.txt (100%) rename tools/{testfiles => test/misc/expected}/h5mkgrp_nested_lp.ls (100%) rename tools/{testfiles => test/misc/expected}/h5mkgrp_nested_mult_lp.ls (100%) rename tools/{testfiles => test/misc/expected}/h5mkgrp_nested_mult_p.ls (100%) rename tools/{testfiles => test/misc/expected}/h5mkgrp_nested_p.ls (100%) rename tools/{testfiles => test/misc/expected}/h5mkgrp_several.ls (100%) rename tools/{testfiles => test/misc/expected}/h5mkgrp_several_l.ls (100%) rename tools/{testfiles => test/misc/expected}/h5mkgrp_several_p.ls (100%) rename tools/{testfiles => test/misc/expected}/h5mkgrp_several_v.ls (100%) rename tools/{testfiles => test/misc/expected}/h5mkgrp_single.ls (100%) rename tools/{testfiles => test/misc/expected}/h5mkgrp_single_l.ls (100%) rename tools/{testfiles => test/misc/expected}/h5mkgrp_single_p.ls (100%) rename tools/{testfiles => test/misc/expected}/h5mkgrp_single_v.ls (100%) rename tools/{ => test/misc}/testfiles/family_file00000.h5 (100%) rename tools/{ => test/misc}/testfiles/family_file00001.h5 (100%) rename tools/{ => test/misc}/testfiles/family_file00002.h5 (100%) rename tools/{ => test/misc}/testfiles/family_file00003.h5 (100%) rename tools/{ => test/misc}/testfiles/family_file00004.h5 (100%) rename tools/{ => test/misc}/testfiles/family_file00005.h5 (100%) rename tools/{ => test/misc}/testfiles/family_file00006.h5 (100%) rename tools/{ => test/misc}/testfiles/family_file00007.h5 (100%) rename tools/{ => test/misc}/testfiles/family_file00008.h5 (100%) rename tools/{ => test/misc}/testfiles/family_file00009.h5 (100%) rename tools/{ => test/misc}/testfiles/family_file00010.h5 (100%) rename tools/{ => test/misc}/testfiles/family_file00011.h5 (100%) rename tools/{ => test/misc}/testfiles/family_file00012.h5 (100%) rename tools/{ => test/misc}/testfiles/family_file00013.h5 (100%) rename tools/{ => test/misc}/testfiles/family_file00014.h5 (100%) rename tools/{ => test/misc}/testfiles/family_file00015.h5 (100%) rename tools/{ => test/misc}/testfiles/family_file00016.h5 (100%) rename tools/{ => test/misc}/testfiles/family_file00017.h5 (100%) diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 070f26f0b92..51c9c83958d 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -394,7 +394,11 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "${HDF5_PACKAGE_URL}") set(CPACK_WIX_PROPERTY_ARPHELPLINK "${HDF5_PACKAGE_BUGREPORT}") if (BUILD_SHARED_LIBS) - set (WIX_CMP_NAME "${HDF5_LIB_NAME}${CMAKE_DEBUG_POSTFIX}") + if (${HDF_CFG_NAME} MATCHES "Debug" OR ${HDF_CFG_NAME} MATCHES "Developer") + set (WIX_CMP_NAME "${HDF5_LIB_NAME}${CMAKE_DEBUG_POSTFIX}") + else () + set (WIX_CMP_NAME "${HDF5_LIB_NAME}") + endif () configure_file (${HDF_RESOURCES_DIR}/patch.xml.in ${HDF5_BINARY_DIR}/patch.xml @ONLY) set(CPACK_WIX_PATCH_FILE "${HDF5_BINARY_DIR}/patch.xml") endif () diff --git a/CMakeLists.txt b/CMakeLists.txt index 788ca57916f..da6a4d1fa8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -222,6 +222,7 @@ set (HDF5_HL_CPP_SRC_DIR ${HDF5_SOURCE_DIR}/hl/c++) set (HDF5_HL_TOOLS_DIR ${HDF5_SOURCE_DIR}/hl/tools) set (HDF5_TOOLS_DIR ${HDF5_SOURCE_DIR}/tools) set (HDF5_TOOLS_SRC_DIR ${HDF5_SOURCE_DIR}/tools/src) +set (HDF5_TOOLS_TST_DIR ${HDF5_SOURCE_DIR}/tools/test) set (HDF5_PERFORM_SRC_DIR ${HDF5_SOURCE_DIR}/tools/src/perform) set (HDF5_UTILS_DIR ${HDF5_SOURCE_DIR}/utils) set (HDF5_F90_SRC_DIR ${HDF5_SOURCE_DIR}/fortran) diff --git a/config/cmake/fileCompareTest.cmake b/config/cmake/fileCompareTest.cmake index 18a29d913fa..5cd56ee06e1 100644 --- a/config/cmake/fileCompareTest.cmake +++ b/config/cmake/fileCompareTest.cmake @@ -66,7 +66,7 @@ else () endif () elseif (TEST_FUNCTION MATCHES "LTEQ") if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE) - message (VERBOSES "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}") + message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}") else () message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less or equal ${TEST_FOLDER}/${TEST_TWOFILE}") endif () diff --git a/hl/test/CMakeTests.cmake b/hl/test/CMakeTests.cmake index 9d3ff0c2221..781ed143219 100644 --- a/hl/test/CMakeTests.cmake +++ b/hl/test/CMakeTests.cmake @@ -41,7 +41,7 @@ set (HL_REFERENCE_TEST_FILES #-- Copy the necessary files. # -------------------------------------------------------------------- foreach (h5_file ${HL_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_HL_TEST_SOURCE_DIR}/${h5_file}" "${HDF5_HL_TEST_BINARY_DIR}/${h5_file}" "hl_test_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${HDF5_HL_TEST_BINARY_DIR}/testfiles/${h5_file}" "hl_test_files") endforeach () add_custom_target(hl_test_files ALL COMMENT "Copying files needed by hl_test tests" DEPENDS ${hl_test_files_list}) diff --git a/hl/test/dsdata.txt b/hl/test/testfiles/dsdata.txt similarity index 100% rename from hl/test/dsdata.txt rename to hl/test/testfiles/dsdata.txt diff --git a/hl/test/dslat.txt b/hl/test/testfiles/dslat.txt similarity index 100% rename from hl/test/dslat.txt rename to hl/test/testfiles/dslat.txt diff --git a/hl/test/dslon.txt b/hl/test/testfiles/dslon.txt similarity index 100% rename from hl/test/dslon.txt rename to hl/test/testfiles/dslon.txt diff --git a/hl/test/dtype_file.txt b/hl/test/testfiles/dtype_file.txt similarity index 100% rename from hl/test/dtype_file.txt rename to hl/test/testfiles/dtype_file.txt diff --git a/hl/test/dtype_file_readable.txt b/hl/test/testfiles/dtype_file_readable.txt similarity index 100% rename from hl/test/dtype_file_readable.txt rename to hl/test/testfiles/dtype_file_readable.txt diff --git a/hl/test/earth.pal b/hl/test/testfiles/earth.pal similarity index 100% rename from hl/test/earth.pal rename to hl/test/testfiles/earth.pal diff --git a/hl/test/image24pixel.txt b/hl/test/testfiles/image24pixel.txt similarity index 100% rename from hl/test/image24pixel.txt rename to hl/test/testfiles/image24pixel.txt diff --git a/hl/test/image24plane.txt b/hl/test/testfiles/image24plane.txt similarity index 100% rename from hl/test/image24plane.txt rename to hl/test/testfiles/image24plane.txt diff --git a/hl/test/image8.txt b/hl/test/testfiles/image8.txt similarity index 100% rename from hl/test/image8.txt rename to hl/test/testfiles/image8.txt diff --git a/hl/test/sepia.pal b/hl/test/testfiles/sepia.pal similarity index 100% rename from hl/test/sepia.pal rename to hl/test/testfiles/sepia.pal diff --git a/hl/test/test_ds_be.h5 b/hl/test/testfiles/test_ds_be.h5 similarity index 100% rename from hl/test/test_ds_be.h5 rename to hl/test/testfiles/test_ds_be.h5 diff --git a/hl/test/test_ds_be_new_ref-32bit.h5 b/hl/test/testfiles/test_ds_be_new_ref-32bit.h5 similarity index 100% rename from hl/test/test_ds_be_new_ref-32bit.h5 rename to hl/test/testfiles/test_ds_be_new_ref-32bit.h5 diff --git a/hl/test/test_ds_be_new_ref.h5 b/hl/test/testfiles/test_ds_be_new_ref.h5 similarity index 100% rename from hl/test/test_ds_be_new_ref.h5 rename to hl/test/testfiles/test_ds_be_new_ref.h5 diff --git a/hl/test/test_ds_le.h5 b/hl/test/testfiles/test_ds_le.h5 similarity index 100% rename from hl/test/test_ds_le.h5 rename to hl/test/testfiles/test_ds_le.h5 diff --git a/hl/test/test_ds_le_new_ref.h5 b/hl/test/testfiles/test_ds_le_new_ref.h5 similarity index 100% rename from hl/test/test_ds_le_new_ref.h5 rename to hl/test/testfiles/test_ds_le_new_ref.h5 diff --git a/hl/test/test_ld.h5 b/hl/test/testfiles/test_ld.h5 similarity index 100% rename from hl/test/test_ld.h5 rename to hl/test/testfiles/test_ld.h5 diff --git a/hl/test/test_table_be.h5 b/hl/test/testfiles/test_table_be.h5 similarity index 100% rename from hl/test/test_table_be.h5 rename to hl/test/testfiles/test_table_be.h5 diff --git a/hl/test/test_table_cray.h5 b/hl/test/testfiles/test_table_cray.h5 similarity index 100% rename from hl/test/test_table_cray.h5 rename to hl/test/testfiles/test_table_cray.h5 diff --git a/hl/test/test_table_le.h5 b/hl/test/testfiles/test_table_le.h5 similarity index 100% rename from hl/test/test_table_le.h5 rename to hl/test/testfiles/test_table_le.h5 diff --git a/hl/test/usa.wri b/hl/test/testfiles/usa.wri similarity index 100% rename from hl/test/usa.wri rename to hl/test/testfiles/usa.wri diff --git a/hl/tools/gif2h5/CMakeTests.cmake b/hl/tools/gif2h5/CMakeTests.cmake index b2a8e27f26f..dd0ccc456a2 100644 --- a/hl/tools/gif2h5/CMakeTests.cmake +++ b/hl/tools/gif2h5/CMakeTests.cmake @@ -22,9 +22,9 @@ file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") # # copy test files from source to build dir # -HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/image1.gif" "${PROJECT_BINARY_DIR}/testfiles/image1.gif" "gif2h5_files") -HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/h52giftst.h5" "${PROJECT_BINARY_DIR}/testfiles/h52giftst.h5" "gif2h5_files") -HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/ex_image2.h5" "${PROJECT_BINARY_DIR}/testfiles/ex_image2.h5" "gif2h5_files") +HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/image1.gif" "${PROJECT_BINARY_DIR}/testfiles/image1.gif" "gif2h5_files") +HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/h52giftst.h5" "${PROJECT_BINARY_DIR}/testfiles/h52giftst.h5" "gif2h5_files") +HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/ex_image2.h5" "${PROJECT_BINARY_DIR}/testfiles/ex_image2.h5" "gif2h5_files") add_custom_target(gif2h5_files ALL COMMENT "Copying files needed by gif2h5 tests" DEPENDS ${gif2h5_files_list}) # Remove any output file left over from previous test run diff --git a/hl/tools/h5watch/CMakeTests.cmake b/hl/tools/h5watch/CMakeTests.cmake index a7828b30fa6..7c1a7f56374 100644 --- a/hl/tools/h5watch/CMakeTests.cmake +++ b/hl/tools/h5watch/CMakeTests.cmake @@ -58,7 +58,7 @@ set (H5WATCH_TEST_FILES file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") foreach (h5watch_file ${H5WATCH_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_DIR}/testfiles/${h5watch_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5watch_file}" "H5WATCH_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5watch_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5watch_file}" "H5WATCH_files") endforeach () add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tests" DEPENDS ${H5WATCH_files_list}) diff --git a/hl/tools/testfiles/w-err-cmpd1.err b/hl/tools/h5watch/testfiles/w-err-cmpd1.err similarity index 100% rename from hl/tools/testfiles/w-err-cmpd1.err rename to hl/tools/h5watch/testfiles/w-err-cmpd1.err diff --git a/hl/tools/testfiles/w-err-cmpd2.err b/hl/tools/h5watch/testfiles/w-err-cmpd2.err similarity index 100% rename from hl/tools/testfiles/w-err-cmpd2.err rename to hl/tools/h5watch/testfiles/w-err-cmpd2.err diff --git a/hl/tools/testfiles/w-err-cmpd3.err b/hl/tools/h5watch/testfiles/w-err-cmpd3.err similarity index 100% rename from hl/tools/testfiles/w-err-cmpd3.err rename to hl/tools/h5watch/testfiles/w-err-cmpd3.err diff --git a/hl/tools/testfiles/w-err-cmpd4.err b/hl/tools/h5watch/testfiles/w-err-cmpd4.err similarity index 100% rename from hl/tools/testfiles/w-err-cmpd4.err rename to hl/tools/h5watch/testfiles/w-err-cmpd4.err diff --git a/hl/tools/testfiles/w-err-cmpd5.err b/hl/tools/h5watch/testfiles/w-err-cmpd5.err similarity index 100% rename from hl/tools/testfiles/w-err-cmpd5.err rename to hl/tools/h5watch/testfiles/w-err-cmpd5.err diff --git a/hl/tools/testfiles/w-err-dset-nomax.err b/hl/tools/h5watch/testfiles/w-err-dset-nomax.err similarity index 100% rename from hl/tools/testfiles/w-err-dset-nomax.err rename to hl/tools/h5watch/testfiles/w-err-dset-nomax.err diff --git a/hl/tools/testfiles/w-err-dset-none.err b/hl/tools/h5watch/testfiles/w-err-dset-none.err similarity index 100% rename from hl/tools/testfiles/w-err-dset-none.err rename to hl/tools/h5watch/testfiles/w-err-dset-none.err diff --git a/hl/tools/testfiles/w-err-dset1.err b/hl/tools/h5watch/testfiles/w-err-dset1.err similarity index 100% rename from hl/tools/testfiles/w-err-dset1.err rename to hl/tools/h5watch/testfiles/w-err-dset1.err diff --git a/hl/tools/testfiles/w-err-dset2.err b/hl/tools/h5watch/testfiles/w-err-dset2.err similarity index 100% rename from hl/tools/testfiles/w-err-dset2.err rename to hl/tools/h5watch/testfiles/w-err-dset2.err diff --git a/hl/tools/testfiles/w-err-file.err b/hl/tools/h5watch/testfiles/w-err-file.err similarity index 100% rename from hl/tools/testfiles/w-err-file.err rename to hl/tools/h5watch/testfiles/w-err-file.err diff --git a/hl/tools/testfiles/w-err-poll.ddl b/hl/tools/h5watch/testfiles/w-err-poll.ddl similarity index 100% rename from hl/tools/testfiles/w-err-poll.ddl rename to hl/tools/h5watch/testfiles/w-err-poll.ddl diff --git a/hl/tools/testfiles/w-err-poll0.ddl b/hl/tools/h5watch/testfiles/w-err-poll0.ddl similarity index 100% rename from hl/tools/testfiles/w-err-poll0.ddl rename to hl/tools/h5watch/testfiles/w-err-poll0.ddl diff --git a/hl/tools/testfiles/w-err-std.ddl b/hl/tools/h5watch/testfiles/w-err-std.ddl similarity index 100% rename from hl/tools/testfiles/w-err-std.ddl rename to hl/tools/h5watch/testfiles/w-err-std.ddl diff --git a/hl/tools/testfiles/w-err-width.ddl b/hl/tools/h5watch/testfiles/w-err-width.ddl similarity index 100% rename from hl/tools/testfiles/w-err-width.ddl rename to hl/tools/h5watch/testfiles/w-err-width.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-f1.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f1.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-esc-f1.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f1.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-f3.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f3.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-esc-f3.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f3.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-ff2.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-ff2.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-esc-ff2.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-esc-ff2.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-esc.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-esc.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-esc.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-f1.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-f1.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-f1.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-f1.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-f2.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-f2.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-f2.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-f2.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-ff3.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-ff3.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-ff3.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-ff3.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-label.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-label.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-label.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-label.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-two-f1.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f1.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-two-f1.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-two-f1.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-two-f3.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f3.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-two-f3.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-two-f3.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-two-ff2.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-ff2.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-two-ff2.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-two-ff2.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-two.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-two.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-two.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd.ddl diff --git a/hl/tools/testfiles/w-ext-early.ddl b/hl/tools/h5watch/testfiles/w-ext-early.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-early.ddl rename to hl/tools/h5watch/testfiles/w-ext-early.ddl diff --git a/hl/tools/testfiles/w-ext-late.ddl b/hl/tools/h5watch/testfiles/w-ext-late.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-late.ddl rename to hl/tools/h5watch/testfiles/w-ext-late.ddl diff --git a/hl/tools/testfiles/w-ext-one-d.ddl b/hl/tools/h5watch/testfiles/w-ext-one-d.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-one-d.ddl rename to hl/tools/h5watch/testfiles/w-ext-one-d.ddl diff --git a/hl/tools/testfiles/w-ext-one-simple.ddl b/hl/tools/h5watch/testfiles/w-ext-one-simple.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-one-simple.ddl rename to hl/tools/h5watch/testfiles/w-ext-one-simple.ddl diff --git a/hl/tools/testfiles/w-ext-one.ddl b/hl/tools/h5watch/testfiles/w-ext-one.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-one.ddl rename to hl/tools/h5watch/testfiles/w-ext-one.ddl diff --git a/hl/tools/testfiles/w-ext-two-d.ddl b/hl/tools/h5watch/testfiles/w-ext-two-d.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-two-d.ddl rename to hl/tools/h5watch/testfiles/w-ext-two-d.ddl diff --git a/hl/tools/testfiles/w-ext-two-width.ddl b/hl/tools/h5watch/testfiles/w-ext-two-width.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-two-width.ddl rename to hl/tools/h5watch/testfiles/w-ext-two-width.ddl diff --git a/hl/tools/testfiles/w-ext-two.ddl b/hl/tools/h5watch/testfiles/w-ext-two.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-two.ddl rename to hl/tools/h5watch/testfiles/w-ext-two.ddl diff --git a/hl/tools/testfiles/w-help1.ddl b/hl/tools/h5watch/testfiles/w-help1.ddl similarity index 100% rename from hl/tools/testfiles/w-help1.ddl rename to hl/tools/h5watch/testfiles/w-help1.ddl diff --git a/hl/tools/h5watch/testh5watch.sh.in b/hl/tools/h5watch/testh5watch.sh.in index fb047cd3042..a1daeec9bf1 100644 --- a/hl/tools/h5watch/testh5watch.sh.in +++ b/hl/tools/h5watch/testh5watch.sh.in @@ -66,7 +66,7 @@ fi nerrors=0 verbose=yes -test -d ../testfiles || mkdir ../testfiles +test -d ./testfiles || mkdir ./testfiles # Print a line-line message left justified in a field of 70 characters # beginning with the word "Testing". @@ -97,9 +97,9 @@ TESTING() { # $2 -- expected return code # $3 and on -- arguments for h5watch TOOLTEST() { - expect="$srcdir/../testfiles/$1" - actual="../testfiles/`basename $1 .ddl`.out" - actual_err="../testfiles/`basename $1 .ddl`.err" + expect="$srcdir/testfiles/$1" + actual="testfiles/`basename $1 .ddl`.out" + actual_err="testfiles/`basename $1 .ddl`.err" shift retvalexpect=$1 shift @@ -146,10 +146,10 @@ TOOLTEST() { # $2 -- expected return code # $3 and on -- arguments for h5watch TOOLTEST_ERR() { - expect="$srcdir/../testfiles/$1" - expect_err="$srcdir/../testfiles/`basename $1 .ddl`.err" - actual="../testfiles/`basename $1 .ddl`.out" - actual_err="../testfiles/`basename $1 .ddl`.out.err" + expect="$srcdir/testfiles/$1" + expect_err="$srcdir/testfiles/`basename $1 .ddl`.err" + actual="testfiles/`basename $1 .ddl`.out" + actual_err="testfiles/`basename $1 .ddl`.out.err" shift retvalexpect=$1 shift @@ -201,8 +201,8 @@ try=0 while [ $try -lt $TRY_MAX ] ; do cp $WATCHFILE $TESTFILE # Copy the file being watched/extended to a temporary file - actual="../testfiles/`basename $3 .ddl`.out" # The actual output - expect="$srcdir/../testfiles/$3" # The expected output + actual="testfiles/`basename $3 .ddl`.out" # The actual output + expect="$srcdir/testfiles/$3" # The expected output # # Set up options and object to h5watch if test -z "$2"; then diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt index 9f148e21baa..967795bdd83 100644 --- a/java/test/CMakeLists.txt +++ b/java/test/CMakeLists.txt @@ -104,12 +104,12 @@ HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_ HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/h5ex_g_iterateL2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_files") HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/h5ex_g_iterateO1.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_files") HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/h5ex_g_iterateO2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_files") -HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") -HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") -HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") -HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") -HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") -HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") +HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") +HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") +HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") +HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") +HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") +HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") add_custom_target(${HDF5_JAVA_TEST_LIB_TARGET}_files ALL COMMENT "Copying files needed by ${HDF5_JAVA_TEST_LIB_TARGET} tests" DEPENDS ${${HDF5_JAVA_TEST_LIB_TARGET}_files_list}) @@ -248,12 +248,12 @@ if (HDF5_TEST_JAVA AND HDF5_TEST_SERIAL) HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/${voltest}/h5ex_g_iterateL2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/${voltest}/h5ex_g_iterateO1.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/${voltest}/h5ex_g_iterateO2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/${voltest}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/${voltest}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/${voltest}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/${voltest}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") add_custom_target(${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files ALL COMMENT "Copying files needed by ${HDF5_JAVA_TEST_LIB_TARGET} tests" DEPENDS ${${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files_list}) diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in index 0690081386a..981d945965b 100644 --- a/java/test/junit.sh.in +++ b/java/test/junit.sh.in @@ -46,7 +46,7 @@ HDFLIB_HOME="$top_srcdir/java/lib" BLDDIR="." BLDLIBDIR="$BLDDIR/testlibs" HDFTEST_HOME="$top_srcdir/java/test" -TOOLS_TESTFILES="$top_srcdir/tools/testfiles" +DUMP_TESTFILES="$top_srcdir/tools/test/h5dump/testfiles" JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar TESTJARFILE=jar@PACKAGE_TARNAME@test.jar @@ -258,12 +258,12 @@ COPY_DATAFILES_TO_BLDDIR() $CP -f $HDFTEST_HOME/h5ex_g_iterate.orig $BLDDIR/h5ex_g_iterateL2.hdf $CP -f $HDFTEST_HOME/h5ex_g_iterate.orig $BLDDIR/h5ex_g_iterateO1.hdf $CP -f $HDFTEST_HOME/h5ex_g_iterate.orig $BLDDIR/h5ex_g_iterateO2.hdf - $CP -f $TOOLS_TESTFILES/trefer_reg.h5 $BLDDIR/trefer_reg.h5 - $CP -f $TOOLS_TESTFILES/trefer_attr.h5 $BLDDIR/trefer_attr.h5 - $CP -f $TOOLS_TESTFILES/tdatareg.h5 $BLDDIR/tdatareg.h5 - $CP -f $TOOLS_TESTFILES/tattrreg.h5 $BLDDIR/tattrreg.h5 - $CP -f $TOOLS_TESTFILES/tintsattrs.h5 $BLDDIR/tintsattrs.h5 - $CP -f $TOOLS_TESTFILES/tfloatsattrs.h5 $BLDDIR/tfloatsattrs.h5 + $CP -f $DUMP_TESTFILES/trefer_reg.h5 $BLDDIR/trefer_reg.h5 + $CP -f $DUMP_TESTFILES/trefer_attr.h5 $BLDDIR/trefer_attr.h5 + $CP -f $DUMP_TESTFILES/tdatareg.h5 $BLDDIR/tdatareg.h5 + $CP -f $DUMP_TESTFILES/tattrreg.h5 $BLDDIR/tattrreg.h5 + $CP -f $DUMP_TESTFILES/tintsattrs.h5 $BLDDIR/tintsattrs.h5 + $CP -f $DUMP_TESTFILES/tfloatsattrs.h5 $BLDDIR/tfloatsattrs.h5 } CLEAN_DATAFILES_AND_BLDDIR() diff --git a/test/CMakePassthroughVOLTests.cmake b/test/CMakePassthroughVOLTests.cmake index 94433de43c9..a5d9b598fb8 100644 --- a/test/CMakePassthroughVOLTests.cmake +++ b/test/CMakePassthroughVOLTests.cmake @@ -37,26 +37,26 @@ endforeach () foreach (voltest ${VOL_LIST}) foreach (h5_tfile ${HDF5_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/${voltest}/${h5_tfile}" "HDF5_VOLTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/${voltest}/${h5_tfile}" "HDF5_VOLTEST_LIB_files") endforeach () endforeach () foreach (voltest ${VOL_LIST}) foreach (ref_file ${HDF5_REFERENCE_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/${voltest}/${ref_file}" "HDF5_VOLTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/${voltest}/${ref_file}" "HDF5_VOLTEST_LIB_files") endforeach () endforeach () foreach (voltest ${VOL_LIST}) foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/${h5_file}" "${HDF5_TEST_BINARY_DIR}/${voltest}/${h5_file}" "HDF5_VOLTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${voltest}/${h5_file}" "HDF5_VOLTEST_LIB_files") endforeach () endforeach () foreach (voltest ${VOL_LIST}) foreach (plistfile ${HDF5_REFERENCE_PLIST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/${voltest}/testfiles/plist_files/${plistfile}" "HDF5_VOLTEST_LIB_files") - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/${voltest}/testfiles/plist_files/def_${plistfile}" "HDF5_VOLTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/${voltest}/testfiles/plist_files/${plistfile}" "HDF5_VOLTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/${voltest}/testfiles/plist_files/def_${plistfile}" "HDF5_VOLTEST_LIB_files") endforeach () endforeach () diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index fa38a76de5d..cab01f6f637 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -36,12 +36,9 @@ add_custom_command ( ) foreach (h5_tfile ${HDF5_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/H5TEST/${h5_tfile}" "HDF5_TEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/${h5_tfile}" "HDF5_TEST_LIB_files") endforeach () -# -------------------------------------------------------------------- -# Copy all the HDF5 files from the test directory into the source directory -# -------------------------------------------------------------------- set (HDF5_REFERENCE_FILES err_compat_1 err_compat_2 @@ -51,7 +48,7 @@ set (HDF5_REFERENCE_FILES ) foreach (ref_file ${HDF5_REFERENCE_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/H5TEST/${ref_file}" "HDF5_TEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/${ref_file}" "HDF5_TEST_LIB_files") endforeach () # -------------------------------------------------------------------- @@ -109,8 +106,8 @@ set (HDF5_REFERENCE_PLIST_FILES ) foreach (plistfile ${HDF5_REFERENCE_PLIST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/plist_files/${plistfile}" "HDF5_TEST_LIB_files") - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/plist_files/def_${plistfile}" "HDF5_TEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/plist_files/${plistfile}" "HDF5_TEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/plist_files/def_${plistfile}" "HDF5_TEST_LIB_files") endforeach () # -------------------------------------------------------------------- @@ -172,7 +169,7 @@ set (HDF5_REFERENCE_TEST_FILES ) foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/${h5_file}" "${HDF5_TEST_BINARY_DIR}/H5TEST/${h5_file}" "HDF5_TEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${HDF5_TEST_BINARY_DIR}/H5TEST/testfiles/${h5_file}" "HDF5_TEST_LIB_files") endforeach () add_custom_target(HDF5_TEST_LIB_files ALL COMMENT "Copying files needed by HDF5_TEST_LIB tests" DEPENDS ${HDF5_TEST_LIB_files_list}) diff --git a/test/CMakeVFDTests.cmake b/test/CMakeVFDTests.cmake index 7648166b7bc..ed7bd8639e3 100644 --- a/test/CMakeVFDTests.cmake +++ b/test/CMakeVFDTests.cmake @@ -26,26 +26,26 @@ endforeach () foreach (vfdtest ${VFD_LIST}) foreach (h5_tfile ${HDF5_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}" "HDF5_VFDTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/${h5_tfile}" "HDF5_VFDTEST_LIB_files") endforeach () endforeach () foreach (vfdtest ${VFD_LIST}) foreach (ref_file ${HDF5_REFERENCE_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/${vfdtest}/${ref_file}" "HDF5_VFDTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/${ref_file}" "HDF5_VFDTEST_LIB_files") endforeach () endforeach () foreach (vfdtest ${VFD_LIST}) foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/${h5_file}" "${HDF5_TEST_BINARY_DIR}/${vfdtest}/${h5_file}" "HDF5_VFDTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${HDF5_TEST_BINARY_DIR}/${vfdtest}/testfiles/${h5_file}" "HDF5_VFDTEST_LIB_files") endforeach () endforeach () foreach (vfdtest ${VFD_LIST}) foreach (plistfile ${HDF5_REFERENCE_PLIST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/plist_files/${plistfile}" "HDF5_VFDTEST_LIB_files") - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/plist_files/def_${plistfile}" "HDF5_VFDTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/plist_files/${plistfile}" "HDF5_VFDTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/plist_files/def_${plistfile}" "HDF5_VFDTEST_LIB_files") endforeach () endforeach () diff --git a/test/enc_dec_plist_cross_platform.c b/test/enc_dec_plist_cross_platform.c index b9dc16a0747..a3682147843 100644 --- a/test/enc_dec_plist_cross_platform.c +++ b/test/enc_dec_plist_cross_platform.c @@ -31,121 +31,121 @@ main(void) /******* ENCODE/DECODE DCPLS *****/ TESTING("Default DCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_dcpl_") < 0) + if (test_plists("plist_files/def_dcpl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("DCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/dcpl_") < 0) + if (test_plists("plist_files/dcpl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE DAPLS *****/ TESTING("Default DAPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_dapl_") < 0) + if (test_plists("plist_files/def_dapl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("DAPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/dapl_") < 0) + if (test_plists("plist_files/dapl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE DXPLS *****/ TESTING("Default DXPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_dxpl_") < 0) + if (test_plists("plist_files/def_dxpl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("DXPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/dxpl_") < 0) + if (test_plists("plist_files/dxpl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE GCPLS *****/ TESTING("Default GCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_gcpl_") < 0) + if (test_plists("plist_files/def_gcpl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("GCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/gcpl_") < 0) + if (test_plists("plist_files/gcpl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE LCPLS *****/ TESTING("Default LCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_lcpl_") < 0) + if (test_plists("plist_files/def_lcpl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("LCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/lcpl_") < 0) + if (test_plists("plist_files/lcpl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE LAPLS *****/ TESTING("Default LAPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_lapl_") < 0) + if (test_plists("plist_files/def_lapl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("LAPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/lapl_") < 0) + if (test_plists("plist_files/lapl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE OCPLS *****/ TESTING("Default OCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_ocpl_") < 0) + if (test_plists("plist_files/def_ocpl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("OCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/ocpl_") < 0) + if (test_plists("plist_files/ocpl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE OCPYPLS *****/ TESTING("Default OCPYPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_ocpypl_") < 0) + if (test_plists("plist_files/def_ocpypl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("OCPYPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/ocpypl_") < 0) + if (test_plists("plist_files/ocpypl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE FCPLS *****/ TESTING("Default FCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_fcpl_") < 0) + if (test_plists("plist_files/def_fcpl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("FCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/fcpl_") < 0) + if (test_plists("plist_files/fcpl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE FAPLS *****/ TESTING("Default FAPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_fapl_") < 0) + if (test_plists("plist_files/def_fapl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("FAPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/fapl_") < 0) + if (test_plists("plist_files/fapl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE STRCPLS *****/ TESTING("Default STRCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_strcpl_") < 0) + if (test_plists("plist_files/def_strcpl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("STRCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/strcpl_") < 0) + if (test_plists("plist_files/strcpl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE ACPLS *****/ TESTING("Default ACPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_acpl_") < 0) + if (test_plists("plist_files/def_acpl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("ACPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/acpl_") < 0) + if (test_plists("plist_files/acpl_") < 0) FAIL_STACK_ERROR; PASSED(); diff --git a/test/gen_plist.c b/test/gen_plist.c index ba16a4f5056..6d40ae707f5 100644 --- a/test/gen_plist.c +++ b/test/gen_plist.c @@ -105,7 +105,7 @@ main(void) if ((dcpl1 = H5Pcreate(H5P_DATASET_CREATE)) < 0) assert(dcpl1 > 0); - if ((ret = encode_plist(dcpl1, little_endian, word_length, "testfiles/plist_files/def_dcpl_")) < 0) + if ((ret = encode_plist(dcpl1, little_endian, word_length, "plist_files/def_dcpl_")) < 0) assert(ret > 0); if ((ret = H5Pset_chunk(dcpl1, 1, &chunk_size)) < 0) @@ -132,7 +132,7 @@ main(void) if ((ret = H5Pset_external(dcpl1, "ext4.data", (off_t)0, (hsize_t)(max_size[0] * sizeof(int) / 4))) < 0) assert(ret > 0); - if ((ret = encode_plist(dcpl1, little_endian, word_length, "testfiles/plist_files/dcpl_")) < 0) + if ((ret = encode_plist(dcpl1, little_endian, word_length, "plist_files/dcpl_")) < 0) assert(ret > 0); /* release resource */ @@ -143,13 +143,13 @@ main(void) if ((dapl1 = H5Pcreate(H5P_DATASET_ACCESS)) < 0) assert(dapl1 > 0); - if ((ret = encode_plist(dapl1, little_endian, word_length, "testfiles/plist_files/def_dapl_")) < 0) + if ((ret = encode_plist(dapl1, little_endian, word_length, "plist_files/def_dapl_")) < 0) assert(ret > 0); if ((ret = H5Pset_chunk_cache(dapl1, nslots, nbytes, w0)) < 0) assert(ret > 0); - if ((ret = encode_plist(dapl1, little_endian, word_length, "testfiles/plist_files/dapl_")) < 0) + if ((ret = encode_plist(dapl1, little_endian, word_length, "plist_files/dapl_")) < 0) assert(ret > 0); /* release resource */ @@ -160,7 +160,7 @@ main(void) if ((dxpl1 = H5Pcreate(H5P_DATASET_XFER)) < 0) assert(dxpl1 > 0); - if ((ret = encode_plist(dxpl1, little_endian, word_length, "testfiles/plist_files/def_dxpl_")) < 0) + if ((ret = encode_plist(dxpl1, little_endian, word_length, "plist_files/def_dxpl_")) < 0) assert(ret > 0); if ((ret = H5Pset_btree_ratios(dxpl1, 0.2, 0.6, 0.2)) < 0) @@ -189,7 +189,7 @@ main(void) if ((ret = H5Pset_modify_write_buf(dxpl1, true)) < 0) assert(ret > 0); - if ((ret = encode_plist(dxpl1, little_endian, word_length, "testfiles/plist_files/dxpl_")) < 0) + if ((ret = encode_plist(dxpl1, little_endian, word_length, "plist_files/dxpl_")) < 0) assert(ret > 0); /* release resource */ @@ -200,7 +200,7 @@ main(void) if ((gcpl1 = H5Pcreate(H5P_GROUP_CREATE)) < 0) assert(gcpl1 > 0); - if ((ret = encode_plist(gcpl1, little_endian, word_length, "testfiles/plist_files/def_gcpl_")) < 0) + if ((ret = encode_plist(gcpl1, little_endian, word_length, "plist_files/def_gcpl_")) < 0) assert(ret > 0); if ((ret = H5Pset_local_heap_size_hint(gcpl1, 256)) < 0) @@ -219,7 +219,7 @@ main(void) if ((ret = H5Pset_link_creation_order(gcpl1, (H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED))) < 0) assert(ret > 0); - if ((ret = encode_plist(gcpl1, little_endian, word_length, "testfiles/plist_files/gcpl_")) < 0) + if ((ret = encode_plist(gcpl1, little_endian, word_length, "plist_files/gcpl_")) < 0) assert(ret > 0); /* release resource */ @@ -230,13 +230,13 @@ main(void) if ((lcpl1 = H5Pcreate(H5P_LINK_CREATE)) < 0) assert(lcpl1 > 0); - if ((ret = encode_plist(lcpl1, little_endian, word_length, "testfiles/plist_files/def_lcpl_")) < 0) + if ((ret = encode_plist(lcpl1, little_endian, word_length, "plist_files/def_lcpl_")) < 0) assert(ret > 0); if ((ret = H5Pset_create_intermediate_group(lcpl1, 1 /*true*/)) < 0) assert(ret > 0); - if ((ret = encode_plist(lcpl1, little_endian, word_length, "testfiles/plist_files/lcpl_")) < 0) + if ((ret = encode_plist(lcpl1, little_endian, word_length, "plist_files/lcpl_")) < 0) assert(ret > 0); /* release resource */ @@ -247,7 +247,7 @@ main(void) if ((ocpypl1 = H5Pcreate(H5P_OBJECT_COPY)) < 0) assert(ocpypl1 > 0); - if ((ret = encode_plist(ocpypl1, little_endian, word_length, "testfiles/plist_files/def_ocpypl_")) < 0) + if ((ret = encode_plist(ocpypl1, little_endian, word_length, "plist_files/def_ocpypl_")) < 0) assert(ret > 0); ret = H5Pset_copy_object(ocpypl1, H5O_COPY_EXPAND_EXT_LINK_FLAG); @@ -259,7 +259,7 @@ main(void) ret = H5Padd_merge_committed_dtype_path(ocpypl1, "bar"); assert(ret >= 0); - if ((ret = encode_plist(ocpypl1, little_endian, word_length, "testfiles/plist_files/ocpypl_")) < 0) + if ((ret = encode_plist(ocpypl1, little_endian, word_length, "plist_files/ocpypl_")) < 0) assert(ret > 0); /* release resource */ @@ -270,7 +270,7 @@ main(void) if ((ocpl1 = H5Pcreate(H5P_OBJECT_CREATE)) < 0) assert(ocpl1 > 0); - if ((ret = encode_plist(ocpl1, little_endian, word_length, "testfiles/plist_files/def_ocpl_")) < 0) + if ((ret = encode_plist(ocpl1, little_endian, word_length, "plist_files/def_ocpl_")) < 0) assert(ret > 0); if ((ret = H5Pset_attr_creation_order(ocpl1, (H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED))) < 0) @@ -282,7 +282,7 @@ main(void) if ((ret = H5Pset_filter(ocpl1, H5Z_FILTER_FLETCHER32, 0, (size_t)0, NULL)) < 0) assert(ret > 0); - if ((ret = encode_plist(ocpl1, little_endian, word_length, "testfiles/plist_files/ocpl_")) < 0) + if ((ret = encode_plist(ocpl1, little_endian, word_length, "plist_files/ocpl_")) < 0) assert(ret > 0); /* release resource */ @@ -293,7 +293,7 @@ main(void) if ((lapl1 = H5Pcreate(H5P_LINK_ACCESS)) < 0) assert(lapl1 > 0); - if ((ret = encode_plist(lapl1, little_endian, word_length, "testfiles/plist_files/def_lapl_")) < 0) + if ((ret = encode_plist(lapl1, little_endian, word_length, "plist_files/def_lapl_")) < 0) assert(ret > 0); if ((ret = H5Pset_nlinks(lapl1, (size_t)134)) < 0) @@ -318,7 +318,7 @@ main(void) if ((ret = H5Pclose(fapl1)) < 0) assert(ret > 0); - if ((ret = encode_plist(lapl1, little_endian, word_length, "testfiles/plist_files/lapl_")) < 0) + if ((ret = encode_plist(lapl1, little_endian, word_length, "plist_files/lapl_")) < 0) assert(ret > 0); /* release resource */ @@ -329,7 +329,7 @@ main(void) if ((fapl1 = H5Pcreate(H5P_FILE_ACCESS)) < 0) assert(fapl1 > 0); - if ((ret = encode_plist(fapl1, little_endian, word_length, "testfiles/plist_files/def_fapl_")) < 0) + if ((ret = encode_plist(fapl1, little_endian, word_length, "plist_files/def_fapl_")) < 0) assert(ret > 0); if ((ret = H5Pset_family_offset(fapl1, 1024)) < 0) @@ -359,7 +359,7 @@ main(void) if ((ret = H5Pset_mdc_image_config(fapl1, &my_cache_image_config)) < 0) assert(ret > 0); - if ((ret = encode_plist(fapl1, little_endian, word_length, "testfiles/plist_files/fapl_")) < 0) + if ((ret = encode_plist(fapl1, little_endian, word_length, "plist_files/fapl_")) < 0) assert(ret > 0); /* release resource */ @@ -370,7 +370,7 @@ main(void) if ((fcpl1 = H5Pcreate(H5P_FILE_CREATE)) < 0) assert(fcpl1 > 0); - if ((ret = encode_plist(fcpl1, little_endian, word_length, "testfiles/plist_files/def_fcpl_")) < 0) + if ((ret = encode_plist(fcpl1, little_endian, word_length, "plist_files/def_fcpl_")) < 0) assert(ret > 0); if ((ret = H5Pset_userblock(fcpl1, 1024) < 0)) @@ -400,7 +400,7 @@ main(void) if ((ret = H5Pset_file_space_page_size(fcpl1, (hsize_t)4096)) < 0) assert(ret > 0); - if ((ret = encode_plist(fcpl1, little_endian, word_length, "testfiles/plist_files/fcpl_")) < 0) + if ((ret = encode_plist(fcpl1, little_endian, word_length, "plist_files/fcpl_")) < 0) assert(ret > 0); /* release resource */ @@ -411,13 +411,13 @@ main(void) strcpl1 = H5Pcreate(H5P_STRING_CREATE); assert(strcpl1 > 0); - ret = encode_plist(strcpl1, little_endian, word_length, "testfiles/plist_files/def_strcpl_"); + ret = encode_plist(strcpl1, little_endian, word_length, "plist_files/def_strcpl_"); assert(ret > 0); ret = H5Pset_char_encoding(strcpl1, H5T_CSET_UTF8); assert(ret >= 0); - ret = encode_plist(strcpl1, little_endian, word_length, "testfiles/plist_files/strcpl_"); + ret = encode_plist(strcpl1, little_endian, word_length, "plist_files/strcpl_"); assert(ret > 0); /* release resource */ @@ -428,13 +428,13 @@ main(void) acpl1 = H5Pcreate(H5P_ATTRIBUTE_CREATE); assert(acpl1 > 0); - ret = encode_plist(acpl1, little_endian, word_length, "testfiles/plist_files/def_acpl_"); + ret = encode_plist(acpl1, little_endian, word_length, "plist_files/def_acpl_"); assert(ret > 0); ret = H5Pset_char_encoding(acpl1, H5T_CSET_UTF8); assert(ret >= 0); - ret = encode_plist(acpl1, little_endian, word_length, "testfiles/plist_files/acpl_"); + ret = encode_plist(acpl1, little_endian, word_length, "plist_files/acpl_"); assert(ret > 0); /* release resource */ diff --git a/test/h5test.c b/test/h5test.c index e7e9ec96429..862b9a327cd 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -1894,9 +1894,9 @@ H5_get_srcdir_filename(const char *filename) /* Build path to test file. We're checking the length so suppress * the gcc format-truncation warning. */ - if ((strlen(srcdir) + strlen(filename) + 1) < sizeof(srcdir_testpath)) { + if ((strlen(srcdir) + strlen("testfiles/") + strlen(filename) + 1) < sizeof(srcdir_testpath)) { H5_GCC_DIAG_OFF("format-truncation") - snprintf(srcdir_testpath, sizeof(srcdir_testpath), "%s%s", srcdir, filename); + snprintf(srcdir_testpath, sizeof(srcdir_testpath), "%stestfiles/%s", srcdir, filename); H5_GCC_DIAG_ON("format-truncation") return srcdir_testpath; } diff --git a/test/aggr.h5 b/test/testfiles/aggr.h5 similarity index 100% rename from test/aggr.h5 rename to test/testfiles/aggr.h5 diff --git a/test/bad_compound.h5 b/test/testfiles/bad_compound.h5 similarity index 100% rename from test/bad_compound.h5 rename to test/testfiles/bad_compound.h5 diff --git a/test/bad_offset.h5 b/test/testfiles/bad_offset.h5 similarity index 100% rename from test/bad_offset.h5 rename to test/testfiles/bad_offset.h5 diff --git a/test/be_data.h5 b/test/testfiles/be_data.h5 similarity index 100% rename from test/be_data.h5 rename to test/testfiles/be_data.h5 diff --git a/test/be_extlink1.h5 b/test/testfiles/be_extlink1.h5 similarity index 100% rename from test/be_extlink1.h5 rename to test/testfiles/be_extlink1.h5 diff --git a/test/be_extlink2.h5 b/test/testfiles/be_extlink2.h5 similarity index 100% rename from test/be_extlink2.h5 rename to test/testfiles/be_extlink2.h5 diff --git a/test/btree_idx_1_6.h5 b/test/testfiles/btree_idx_1_6.h5 similarity index 100% rename from test/btree_idx_1_6.h5 rename to test/testfiles/btree_idx_1_6.h5 diff --git a/test/btree_idx_1_8.h5 b/test/testfiles/btree_idx_1_8.h5 similarity index 100% rename from test/btree_idx_1_8.h5 rename to test/testfiles/btree_idx_1_8.h5 diff --git a/test/corrupt_stab_msg.h5 b/test/testfiles/corrupt_stab_msg.h5 similarity index 100% rename from test/corrupt_stab_msg.h5 rename to test/testfiles/corrupt_stab_msg.h5 diff --git a/test/cve_2020_10810.h5 b/test/testfiles/cve_2020_10810.h5 similarity index 100% rename from test/cve_2020_10810.h5 rename to test/testfiles/cve_2020_10810.h5 diff --git a/test/cve_2020_10812.h5 b/test/testfiles/cve_2020_10812.h5 similarity index 100% rename from test/cve_2020_10812.h5 rename to test/testfiles/cve_2020_10812.h5 diff --git a/test/deflate.h5 b/test/testfiles/deflate.h5 similarity index 100% rename from test/deflate.h5 rename to test/testfiles/deflate.h5 diff --git a/test/family_v16-000000.h5 b/test/testfiles/family_v16-000000.h5 similarity index 100% rename from test/family_v16-000000.h5 rename to test/testfiles/family_v16-000000.h5 diff --git a/test/family_v16-000001.h5 b/test/testfiles/family_v16-000001.h5 similarity index 100% rename from test/family_v16-000001.h5 rename to test/testfiles/family_v16-000001.h5 diff --git a/test/family_v16-000002.h5 b/test/testfiles/family_v16-000002.h5 similarity index 100% rename from test/family_v16-000002.h5 rename to test/testfiles/family_v16-000002.h5 diff --git a/test/family_v16-000003.h5 b/test/testfiles/family_v16-000003.h5 similarity index 100% rename from test/family_v16-000003.h5 rename to test/testfiles/family_v16-000003.h5 diff --git a/test/file_image_core_test.h5 b/test/testfiles/file_image_core_test.h5 similarity index 100% rename from test/file_image_core_test.h5 rename to test/testfiles/file_image_core_test.h5 diff --git a/test/filespace_1_6.h5 b/test/testfiles/filespace_1_6.h5 similarity index 100% rename from test/filespace_1_6.h5 rename to test/testfiles/filespace_1_6.h5 diff --git a/test/filespace_1_8.h5 b/test/testfiles/filespace_1_8.h5 similarity index 100% rename from test/filespace_1_8.h5 rename to test/testfiles/filespace_1_8.h5 diff --git a/test/fill18.h5 b/test/testfiles/fill18.h5 similarity index 100% rename from test/fill18.h5 rename to test/testfiles/fill18.h5 diff --git a/test/fill_old.h5 b/test/testfiles/fill_old.h5 similarity index 100% rename from test/fill_old.h5 rename to test/testfiles/fill_old.h5 diff --git a/test/filter_error.h5 b/test/testfiles/filter_error.h5 similarity index 100% rename from test/filter_error.h5 rename to test/testfiles/filter_error.h5 diff --git a/test/fsm_aggr_nopersist.h5 b/test/testfiles/fsm_aggr_nopersist.h5 similarity index 100% rename from test/fsm_aggr_nopersist.h5 rename to test/testfiles/fsm_aggr_nopersist.h5 diff --git a/test/fsm_aggr_persist.h5 b/test/testfiles/fsm_aggr_persist.h5 similarity index 100% rename from test/fsm_aggr_persist.h5 rename to test/testfiles/fsm_aggr_persist.h5 diff --git a/test/group_old.h5 b/test/testfiles/group_old.h5 similarity index 100% rename from test/group_old.h5 rename to test/testfiles/group_old.h5 diff --git a/test/h5fc_ext1_f.h5 b/test/testfiles/h5fc_ext1_f.h5 similarity index 100% rename from test/h5fc_ext1_f.h5 rename to test/testfiles/h5fc_ext1_f.h5 diff --git a/test/h5fc_ext1_i.h5 b/test/testfiles/h5fc_ext1_i.h5 similarity index 100% rename from test/h5fc_ext1_i.h5 rename to test/testfiles/h5fc_ext1_i.h5 diff --git a/test/h5fc_ext2_if.h5 b/test/testfiles/h5fc_ext2_if.h5 similarity index 100% rename from test/h5fc_ext2_if.h5 rename to test/testfiles/h5fc_ext2_if.h5 diff --git a/test/h5fc_ext2_sf.h5 b/test/testfiles/h5fc_ext2_sf.h5 similarity index 100% rename from test/h5fc_ext2_sf.h5 rename to test/testfiles/h5fc_ext2_sf.h5 diff --git a/test/h5fc_ext3_isf.h5 b/test/testfiles/h5fc_ext3_isf.h5 similarity index 100% rename from test/h5fc_ext3_isf.h5 rename to test/testfiles/h5fc_ext3_isf.h5 diff --git a/test/h5fc_ext_none.h5 b/test/testfiles/h5fc_ext_none.h5 similarity index 100% rename from test/h5fc_ext_none.h5 rename to test/testfiles/h5fc_ext_none.h5 diff --git a/test/le_data.h5 b/test/testfiles/le_data.h5 similarity index 100% rename from test/le_data.h5 rename to test/testfiles/le_data.h5 diff --git a/test/le_extlink1.h5 b/test/testfiles/le_extlink1.h5 similarity index 100% rename from test/le_extlink1.h5 rename to test/testfiles/le_extlink1.h5 diff --git a/test/le_extlink2.h5 b/test/testfiles/le_extlink2.h5 similarity index 100% rename from test/le_extlink2.h5 rename to test/testfiles/le_extlink2.h5 diff --git a/test/memleak_H5O_dtype_decode_helper_H5Odtype.h5 b/test/testfiles/memleak_H5O_dtype_decode_helper_H5Odtype.h5 similarity index 100% rename from test/memleak_H5O_dtype_decode_helper_H5Odtype.h5 rename to test/testfiles/memleak_H5O_dtype_decode_helper_H5Odtype.h5 diff --git a/test/mergemsg.h5 b/test/testfiles/mergemsg.h5 similarity index 100% rename from test/mergemsg.h5 rename to test/testfiles/mergemsg.h5 diff --git a/test/multi_file_v16-r.h5 b/test/testfiles/multi_file_v16-r.h5 similarity index 100% rename from test/multi_file_v16-r.h5 rename to test/testfiles/multi_file_v16-r.h5 diff --git a/test/multi_file_v16-s.h5 b/test/testfiles/multi_file_v16-s.h5 similarity index 100% rename from test/multi_file_v16-s.h5 rename to test/testfiles/multi_file_v16-s.h5 diff --git a/test/noencoder.h5 b/test/testfiles/noencoder.h5 similarity index 100% rename from test/noencoder.h5 rename to test/testfiles/noencoder.h5 diff --git a/test/none.h5 b/test/testfiles/none.h5 similarity index 100% rename from test/none.h5 rename to test/testfiles/none.h5 diff --git a/test/paged_nopersist.h5 b/test/testfiles/paged_nopersist.h5 similarity index 100% rename from test/paged_nopersist.h5 rename to test/testfiles/paged_nopersist.h5 diff --git a/test/paged_persist.h5 b/test/testfiles/paged_persist.h5 similarity index 100% rename from test/paged_persist.h5 rename to test/testfiles/paged_persist.h5 diff --git a/test/specmetaread.h5 b/test/testfiles/specmetaread.h5 similarity index 100% rename from test/specmetaread.h5 rename to test/testfiles/specmetaread.h5 diff --git a/test/tarrold.h5 b/test/testfiles/tarrold.h5 similarity index 100% rename from test/tarrold.h5 rename to test/testfiles/tarrold.h5 diff --git a/test/tbad_msg_count.h5 b/test/testfiles/tbad_msg_count.h5 similarity index 100% rename from test/tbad_msg_count.h5 rename to test/testfiles/tbad_msg_count.h5 diff --git a/test/tbogus.h5 b/test/testfiles/tbogus.h5 similarity index 100% rename from test/tbogus.h5 rename to test/testfiles/tbogus.h5 diff --git a/test/test_filters_be.h5 b/test/testfiles/test_filters_be.h5 similarity index 100% rename from test/test_filters_be.h5 rename to test/testfiles/test_filters_be.h5 diff --git a/test/test_filters_le.h5 b/test/testfiles/test_filters_le.h5 similarity index 100% rename from test/test_filters_le.h5 rename to test/testfiles/test_filters_le.h5 diff --git a/test/th5s.h5 b/test/testfiles/th5s.h5 similarity index 100% rename from test/th5s.h5 rename to test/testfiles/th5s.h5 diff --git a/test/tlayouto.h5 b/test/testfiles/tlayouto.h5 similarity index 100% rename from test/tlayouto.h5 rename to test/testfiles/tlayouto.h5 diff --git a/test/tmtimen.h5 b/test/testfiles/tmtimen.h5 similarity index 100% rename from test/tmtimen.h5 rename to test/testfiles/tmtimen.h5 diff --git a/test/tmtimeo.h5 b/test/testfiles/tmtimeo.h5 similarity index 100% rename from test/tmtimeo.h5 rename to test/testfiles/tmtimeo.h5 diff --git a/tools/testfiles/tnullspace.h5 b/test/testfiles/tnullspace.h5 similarity index 100% rename from tools/testfiles/tnullspace.h5 rename to test/testfiles/tnullspace.h5 diff --git a/test/tsizeslheap.h5 b/test/testfiles/tsizeslheap.h5 similarity index 100% rename from test/tsizeslheap.h5 rename to test/testfiles/tsizeslheap.h5 diff --git a/tools/test/h5copy/CMakeTests.cmake b/tools/test/h5copy/CMakeTests.cmake index b47000a3193..e443827cd4d 100644 --- a/tools/test/h5copy/CMakeTests.cmake +++ b/tools/test/h5copy/CMakeTests.cmake @@ -20,32 +20,35 @@ # Copy all the HDF5 files from the source directory into the test directory # -------------------------------------------------------------------- set (LIST_HDF5_TEST_FILES - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_extlinks_src.h5 - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_extlinks_trg.h5 - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_ref.h5 - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copytst.h5 - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/tudfilter.h5 - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/tudfilter2.h5 + h5copy_extlinks_src.h5 + h5copy_extlinks_trg.h5 + h5copy_ref.h5 + h5copytst.h5 + tudfilter.h5 + tudfilter2.h5 ) set (LIST_OTHER_TEST_FILES - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_misc1.out - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_misc1.err - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/tudfilter.h5.txt - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/tudfilter.h5_ERR.txt - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_plugin_fail_ERR.out.h5.txt - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_plugin_test.out.h5.txt - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_help1.ddl - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_help2.ddl + h5copy_misc1.out + h5copy_misc1.err + tudfilter.h5.txt + tudfilter.h5_ERR.txt + h5copy_plugin_fail_ERR.out.h5.txt + h5copy_plugin_test.out.h5.txt + h5copy_help1.ddl + h5copy_help2.ddl ) file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") - foreach (listfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES}) - get_filename_component(fname "${listfiles}" NAME) - HDFTEST_COPY_FILE("${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5copy_files") + foreach (listfiles ${LIST_HDF5_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listfiles}" "h5copy_files") endforeach () - add_custom_target(h5copy_files ALL COMMENT "Copying files needed by h5copy tests" DEPENDS ${h5copy_files_list}) + + foreach (listothers ${LIST_OTHER_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/${listothers}" "h5copy_files") + endforeach () + add_custom_target(h5copy_files ALL COMMENT "Copying files needed by h5copy tests" DEPENDS ${h5copy_files_list}) ############################################################################## ############################################################################## diff --git a/tools/test/h5copy/testfiles/h5copy_extlinks_src.out.ls b/tools/test/h5copy/expected/h5copy_extlinks_src.out.ls similarity index 100% rename from tools/test/h5copy/testfiles/h5copy_extlinks_src.out.ls rename to tools/test/h5copy/expected/h5copy_extlinks_src.out.ls diff --git a/tools/test/h5copy/testfiles/h5copy_help1.ddl b/tools/test/h5copy/expected/h5copy_help1.ddl similarity index 100% rename from tools/test/h5copy/testfiles/h5copy_help1.ddl rename to tools/test/h5copy/expected/h5copy_help1.ddl diff --git a/tools/test/h5copy/testfiles/h5copy_help2.ddl b/tools/test/h5copy/expected/h5copy_help2.ddl similarity index 100% rename from tools/test/h5copy/testfiles/h5copy_help2.ddl rename to tools/test/h5copy/expected/h5copy_help2.ddl diff --git a/tools/test/h5copy/testfiles/h5copy_misc1.err b/tools/test/h5copy/expected/h5copy_misc1.err similarity index 100% rename from tools/test/h5copy/testfiles/h5copy_misc1.err rename to tools/test/h5copy/expected/h5copy_misc1.err diff --git a/tools/test/h5copy/testfiles/h5copy_misc1.out b/tools/test/h5copy/expected/h5copy_misc1.out similarity index 100% rename from tools/test/h5copy/testfiles/h5copy_misc1.out rename to tools/test/h5copy/expected/h5copy_misc1.out diff --git a/tools/test/h5copy/testfiles/h5copy_plugin_fail_ERR.out.h5.txt b/tools/test/h5copy/expected/h5copy_plugin_fail_ERR.out.h5.txt similarity index 100% rename from tools/test/h5copy/testfiles/h5copy_plugin_fail_ERR.out.h5.txt rename to tools/test/h5copy/expected/h5copy_plugin_fail_ERR.out.h5.txt diff --git a/tools/test/h5copy/testfiles/h5copy_plugin_test.out.h5.txt b/tools/test/h5copy/expected/h5copy_plugin_test.out.h5.txt similarity index 100% rename from tools/test/h5copy/testfiles/h5copy_plugin_test.out.h5.txt rename to tools/test/h5copy/expected/h5copy_plugin_test.out.h5.txt diff --git a/tools/test/h5copy/testfiles/h5copy_ref.out.ls b/tools/test/h5copy/expected/h5copy_ref.out.ls similarity index 100% rename from tools/test/h5copy/testfiles/h5copy_ref.out.ls rename to tools/test/h5copy/expected/h5copy_ref.out.ls diff --git a/tools/test/h5copy/testfiles/h5copytst.out.ls b/tools/test/h5copy/expected/h5copytst.out.ls similarity index 100% rename from tools/test/h5copy/testfiles/h5copytst.out.ls rename to tools/test/h5copy/expected/h5copytst.out.ls diff --git a/tools/test/h5copy/testfiles/h5copytst_new.out.ls b/tools/test/h5copy/expected/h5copytst_new.out.ls similarity index 100% rename from tools/test/h5copy/testfiles/h5copytst_new.out.ls rename to tools/test/h5copy/expected/h5copytst_new.out.ls diff --git a/tools/test/h5copy/testfiles/tudfilter.h5.txt b/tools/test/h5copy/expected/tudfilter.h5.txt similarity index 100% rename from tools/test/h5copy/testfiles/tudfilter.h5.txt rename to tools/test/h5copy/expected/tudfilter.h5.txt diff --git a/tools/test/h5copy/testfiles/tudfilter.h5_ERR.txt b/tools/test/h5copy/expected/tudfilter.h5_ERR.txt similarity index 100% rename from tools/test/h5copy/testfiles/tudfilter.h5_ERR.txt rename to tools/test/h5copy/expected/tudfilter.h5_ERR.txt diff --git a/tools/test/h5copy/testh5copy.sh.in b/tools/test/h5copy/testh5copy.sh.in index 1f64d15f037..f2c4a8e1237 100644 --- a/tools/test/h5copy/testh5copy.sh.in +++ b/tools/test/h5copy/testh5copy.sh.in @@ -24,16 +24,16 @@ USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@" # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" +SRC_H5COPY_OUTFILES="$SRC_TOOLS/test/h5copy/expected" TESTNAME=h5copy EXIT_SUCCESS=0 @@ -58,10 +58,10 @@ $SRC_H5COPY_TESTFILES/h5copy_extlinks_trg.h5 # List of expect files that will be copied over to local test dir LIST_OTHER_TEST_FILES=" -$SRC_H5COPY_TESTFILES/h5copy_misc1.out -$SRC_H5COPY_TESTFILES/h5copy_misc1.err -$SRC_H5COPY_TESTFILES/h5copy_help1.ddl -$SRC_H5COPY_TESTFILES/h5copy_help2.ddl +$SRC_H5COPY_OUTFILES/h5copy_misc1.out +$SRC_H5COPY_OUTFILES/h5copy_misc1.err +$SRC_H5COPY_OUTFILES/h5copy_help1.ddl +$SRC_H5COPY_OUTFILES/h5copy_help2.ddl " H5COPY=../../src/h5copy/h5copy # The tool name diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake index b23f885d4fd..d89df46583d 100644 --- a/tools/test/h5diff/CMakeTests.cmake +++ b/tools/test/h5diff/CMakeTests.cmake @@ -19,303 +19,307 @@ # -------------------------------------------------------------------- # Copy all the HDF5 files from the test directory into the source directory # -------------------------------------------------------------------- - set (LIST_HDF5_TEST_FILES - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_basic1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_basic2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_types.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dtypes.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr3.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset3.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_hyper1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_hyper2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_empty.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_links.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_softlinks.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_linked_softlink.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_extlink_src.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_extlink_trg.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_ext2softlink_src.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_ext2softlink_trg.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset_zero_dim_size1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset_zero_dim_size2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_danglelinks1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_danglelinks2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse_ext1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse_ext2-1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse_ext2-2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse_ext2-3.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude1-1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude1-2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude2-1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude2-2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude3-1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude3-2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_comp_vl_strs.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr_v_level1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr_v_level2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_enum_invalid_values.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/compounds_array_vlen1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/compounds_array_vlen2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/non_comparables1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/non_comparables2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/tudfilter.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/tudfilter2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_strings1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_strings2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_eps1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_eps2.h5 + # tools/testfiles/vds + set (LIST_VDS_TEST_FILES + 1_a.h5 + 1_b.h5 + 1_c.h5 + 1_d.h5 + 1_e.h5 + 1_f.h5 + 1_vds.h5 + 2_a.h5 + 2_b.h5 + 2_c.h5 + 2_d.h5 + 2_e.h5 + 2_vds.h5 + 3_1_vds.h5 + 3_2_vds.h5 + 4_0.h5 + 4_1.h5 + 4_2.h5 + 4_vds.h5 + 5_a.h5 + 5_b.h5 + 5_c.h5 + 5_vds.h5 + ) + set (LIST_DIFF_TEST_FILES + h5diff_basic1.h5 + h5diff_basic2.h5 + h5diff_types.h5 + h5diff_dtypes.h5 + h5diff_attr1.h5 + h5diff_attr2.h5 + h5diff_attr3.h5 + h5diff_dset1.h5 + h5diff_dset2.h5 + h5diff_dset3.h5 + h5diff_hyper1.h5 + h5diff_hyper2.h5 + h5diff_empty.h5 + h5diff_links.h5 + h5diff_softlinks.h5 + h5diff_linked_softlink.h5 + h5diff_extlink_src.h5 + h5diff_extlink_trg.h5 + h5diff_ext2softlink_src.h5 + h5diff_ext2softlink_trg.h5 + h5diff_dset_zero_dim_size1.h5 + h5diff_dset_zero_dim_size2.h5 + h5diff_danglelinks1.h5 + h5diff_danglelinks2.h5 + h5diff_grp_recurse1.h5 + h5diff_grp_recurse2.h5 + h5diff_grp_recurse_ext1.h5 + h5diff_grp_recurse_ext2-1.h5 + h5diff_grp_recurse_ext2-2.h5 + h5diff_grp_recurse_ext2-3.h5 + h5diff_exclude1-1.h5 + h5diff_exclude1-2.h5 + h5diff_exclude2-1.h5 + h5diff_exclude2-2.h5 + h5diff_exclude3-1.h5 + h5diff_exclude3-2.h5 + h5diff_comp_vl_strs.h5 + h5diff_attr_v_level1.h5 + h5diff_attr_v_level2.h5 + h5diff_enum_invalid_values.h5 + compounds_array_vlen1.h5 + compounds_array_vlen2.h5 + non_comparables1.h5 + non_comparables2.h5 + tudfilter.h5 + tudfilter2.h5 + h5diff_strings1.h5 + h5diff_strings2.h5 + h5diff_eps1.h5 + h5diff_eps2.h5 # onion VFD files - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_objs.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_objs.h5.onion - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_dset_ext.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_dset_ext.h5.onion - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_dset_1d.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_dset_1d.h5.onion - # tools/testfiles/vds - ${HDF5_TOOLS_DIR}/testfiles/vds/1_a.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_b.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_c.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_d.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_e.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_f.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_a.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_b.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_c.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_d.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_e.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/3_1_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/3_2_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/4_0.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/4_1.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/4_2.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/4_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/5_a.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/5_b.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/5_c.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/5_vds.h5 + h5diff_onion_objs.h5 + h5diff_onion_objs.h5.onion + h5diff_onion_dset_ext.h5 + h5diff_onion_dset_ext.h5.onion + h5diff_onion_dset_1d.h5 + h5diff_onion_dset_1d.h5.onion + ) + set (LIST_HDF5_TEST_FILES # tools/testfiles - ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5 + tvlstr.h5 #STD_REF_OBJ files - ${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_compat.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_ext1.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_ext2.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_grp.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_obj_del.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_obj.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_param.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_reg_1d.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5 + trefer_attr.h5 + trefer_compat.h5 + trefer_ext1.h5 + trefer_ext2.h5 + trefer_grp.h5 + trefer_obj_del.h5 + trefer_obj.h5 + trefer_param.h5 + trefer_reg_1d.h5 + trefer_reg.h5 ) set (LIST_OTHER_TEST_FILES - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_10.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_100.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_11.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_12.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_13.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_14.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_15.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_16_1.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_16_2.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_16_3.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_17.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_171.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_172.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_18_1.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_18.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_20.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_200.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_201.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_202.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_203.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_204.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_205.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_206.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_207.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_208.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_220.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_221.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_222.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_223.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_224.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_21.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_22.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_23.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_24.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_25.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_26.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_27.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_28.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_30.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_300.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_400.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_401.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_402.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_403.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_404.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_405.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_406.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_407.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_408.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_409.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_410.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_411.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_412.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_413.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_414.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_415.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_416.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_417.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_418.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_419.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_420.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_421.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_422.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_423.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_424.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_425.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_450.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_451.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_452.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_453.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_454.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/dangling_link.err - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_455.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_456.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_457.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_458.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_459.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_465.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_466.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_467.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_468.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_469.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_471.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_472.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_473.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_474.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_475.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_480.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_481.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_482.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_483.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_484.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_485.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_486.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_487.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_50.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_51.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_52.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_53.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_54.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_55.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_56.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_57.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_58.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_58_ref.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_59.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_500.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_501.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_502.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_503.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_504.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_505.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_506.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_507.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_508.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_509.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_510.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_511.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_512.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_513.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_514.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_515.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_516.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_517.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_518.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_530.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_540.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_60.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_61.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_62.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_63.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_600.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_601.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_601_ERR.err - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_603.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_604.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_605.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_606.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_607.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_608.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_609.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_610.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_612.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_613.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_614.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_615.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_616.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_617.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_618.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_619.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_621.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_622.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_623.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_624.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_625.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_626.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_627.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_628.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_629.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_630.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_631.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_640.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_641.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_642.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_643.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_644.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_645.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_646.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_70.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_700.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_701.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_702.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_703.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_704.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_705.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_706.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_707.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_708.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_709.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_710.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_80.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_800.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_801.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_830.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_90.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_900.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_901.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_902.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_8625.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_8639.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_reg.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_ud.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_udfail.err - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_udfail.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v1.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v2.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v3.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_vlstr.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_eps.txt + h5diff_10.txt + h5diff_100.txt + h5diff_11.txt + h5diff_12.txt + h5diff_13.txt + h5diff_14.txt + h5diff_15.txt + h5diff_16_1.txt + h5diff_16_2.txt + h5diff_16_3.txt + h5diff_17.txt + h5diff_171.txt + h5diff_172.txt + h5diff_18_1.txt + h5diff_18.txt + h5diff_20.txt + h5diff_200.txt + h5diff_201.txt + h5diff_202.txt + h5diff_203.txt + h5diff_204.txt + h5diff_205.txt + h5diff_206.txt + h5diff_207.txt + h5diff_208.txt + h5diff_220.txt + h5diff_221.txt + h5diff_222.txt + h5diff_223.txt + h5diff_224.txt + h5diff_21.txt + h5diff_22.txt + h5diff_23.txt + h5diff_24.txt + h5diff_25.txt + h5diff_26.txt + h5diff_27.txt + h5diff_28.txt + h5diff_30.txt + h5diff_300.txt + h5diff_400.txt + h5diff_401.txt + h5diff_402.txt + h5diff_403.txt + h5diff_404.txt + h5diff_405.txt + h5diff_406.txt + h5diff_407.txt + h5diff_408.txt + h5diff_409.txt + h5diff_410.txt + h5diff_411.txt + h5diff_412.txt + h5diff_413.txt + h5diff_414.txt + h5diff_415.txt + h5diff_416.txt + h5diff_417.txt + h5diff_418.txt + h5diff_419.txt + h5diff_420.txt + h5diff_421.txt + h5diff_422.txt + h5diff_423.txt + h5diff_424.txt + h5diff_425.txt + h5diff_450.txt + h5diff_451.txt + h5diff_452.txt + h5diff_453.txt + h5diff_454.txt + dangling_link.err + h5diff_455.txt + h5diff_456.txt + h5diff_457.txt + h5diff_458.txt + h5diff_459.txt + h5diff_465.txt + h5diff_466.txt + h5diff_467.txt + h5diff_468.txt + h5diff_469.txt + h5diff_471.txt + h5diff_472.txt + h5diff_473.txt + h5diff_474.txt + h5diff_475.txt + h5diff_480.txt + h5diff_481.txt + h5diff_482.txt + h5diff_483.txt + h5diff_484.txt + h5diff_485.txt + h5diff_486.txt + h5diff_487.txt + h5diff_50.txt + h5diff_51.txt + h5diff_52.txt + h5diff_53.txt + h5diff_54.txt + h5diff_55.txt + h5diff_56.txt + h5diff_57.txt + h5diff_58.txt + h5diff_58_ref.txt + h5diff_59.txt + h5diff_500.txt + h5diff_501.txt + h5diff_502.txt + h5diff_503.txt + h5diff_504.txt + h5diff_505.txt + h5diff_506.txt + h5diff_507.txt + h5diff_508.txt + h5diff_509.txt + h5diff_510.txt + h5diff_511.txt + h5diff_512.txt + h5diff_513.txt + h5diff_514.txt + h5diff_515.txt + h5diff_516.txt + h5diff_517.txt + h5diff_518.txt + h5diff_530.txt + h5diff_540.txt + h5diff_60.txt + h5diff_61.txt + h5diff_62.txt + h5diff_63.txt + h5diff_600.txt + h5diff_601.txt + h5diff_601_ERR.err + h5diff_603.txt + h5diff_604.txt + h5diff_605.txt + h5diff_606.txt + h5diff_607.txt + h5diff_608.txt + h5diff_609.txt + h5diff_610.txt + h5diff_612.txt + h5diff_613.txt + h5diff_614.txt + h5diff_615.txt + h5diff_616.txt + h5diff_617.txt + h5diff_618.txt + h5diff_619.txt + h5diff_621.txt + h5diff_622.txt + h5diff_623.txt + h5diff_624.txt + h5diff_625.txt + h5diff_626.txt + h5diff_627.txt + h5diff_628.txt + h5diff_629.txt + h5diff_630.txt + h5diff_631.txt + h5diff_640.txt + h5diff_641.txt + h5diff_642.txt + h5diff_643.txt + h5diff_644.txt + h5diff_645.txt + h5diff_646.txt + h5diff_70.txt + h5diff_700.txt + h5diff_701.txt + h5diff_702.txt + h5diff_703.txt + h5diff_704.txt + h5diff_705.txt + h5diff_706.txt + h5diff_707.txt + h5diff_708.txt + h5diff_709.txt + h5diff_710.txt + h5diff_80.txt + h5diff_800.txt + h5diff_801.txt + h5diff_830.txt + h5diff_90.txt + h5diff_900.txt + h5diff_901.txt + h5diff_902.txt + h5diff_8625.txt + h5diff_8639.txt + h5diff_reg.txt + h5diff_ud.txt + h5diff_udfail.err + h5diff_udfail.txt + h5diff_v1.txt + h5diff_v2.txt + h5diff_v3.txt + h5diff_vlstr.txt + h5diff_eps.txt ) set (LIST_WIN_TEST_FILES @@ -334,17 +338,34 @@ # # copy test files from source to build dir # - foreach (h5_tstfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES}) - get_filename_component(fname "${h5_tstfiles}" NAME) - HDFTEST_COPY_FILE("${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5diff_files") + foreach (h5_tstfiles ${LIST_DIFF_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files") + if (H5_HAVE_PARALLEL) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files") + endif () + endforeach () + foreach (h5_tstfiles ${LIST_VDS_TEST_FILES}) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files") + if (H5_HAVE_PARALLEL) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files") + endif () + endforeach () + foreach (h5_tstfiles ${LIST_HDF5_TEST_FILES}) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files") + if (H5_HAVE_PARALLEL) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files") + endif () + endforeach () + foreach (h5_tstfiles ${LIST_OTHER_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files") if (H5_HAVE_PARALLEL) - HDFTEST_COPY_FILE("${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${fname}" "h5diff_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files") endif () endforeach () # copy second version of tvlstr.h5 - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/testfiles/tvlstr2.h5" "h5diff_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/testfiles/tvlstr2.h5" "h5diff_files") if (H5_HAVE_PARALLEL) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/PAR/testfiles/tvlstr2.h5" "h5diff_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/PAR/testfiles/tvlstr2.h5" "h5diff_files") endif () @@ -361,18 +382,16 @@ endif () if (COPY_WINDOWS_FILES) foreach (h5_tstfiles ${LIST_WIN_TEST_FILES}) - get_filename_component(fname "${h5_tstfiles}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/${h5_tstfiles}w.txt" "${PROJECT_BINARY_DIR}/testfiles/${fname}.txt" "h5diff_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}w.txt" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}.txt" "h5diff_files") if (H5_HAVE_PARALLEL) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/${h5_tstfiles}w.txt" "${PROJECT_BINARY_DIR}/PAR/testfiles/${fname}.txt" "h5diff_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}w.txt" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}.txt" "h5diff_files") endif () endforeach () else () foreach (h5_tstfiles ${LIST_WIN_TEST_FILES}) - get_filename_component(fname "${h5_tstfiles}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/${h5_tstfiles}.txt" "${PROJECT_BINARY_DIR}/testfiles/${fname}.txt" "h5diff_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}.txt" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}.txt" "h5diff_files") if (H5_HAVE_PARALLEL) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/${h5_tstfiles}.txt" "${PROJECT_BINARY_DIR}/PAR/testfiles/${fname}.txt" "h5diff_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}.txt" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}.txt" "h5diff_files") endif () endforeach () endif () diff --git a/tools/test/h5diff/testfiles/dangling_link.err b/tools/test/h5diff/expected/dangling_link.err similarity index 100% rename from tools/test/h5diff/testfiles/dangling_link.err rename to tools/test/h5diff/expected/dangling_link.err diff --git a/tools/test/h5diff/testfiles/h5diff_10.txt b/tools/test/h5diff/expected/h5diff_10.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_10.txt rename to tools/test/h5diff/expected/h5diff_10.txt diff --git a/tools/test/h5diff/testfiles/h5diff_100.txt b/tools/test/h5diff/expected/h5diff_100.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_100.txt rename to tools/test/h5diff/expected/h5diff_100.txt diff --git a/tools/test/h5diff/testfiles/h5diff_101.txt b/tools/test/h5diff/expected/h5diff_101.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_101.txt rename to tools/test/h5diff/expected/h5diff_101.txt diff --git a/tools/test/h5diff/testfiles/h5diff_101w.txt b/tools/test/h5diff/expected/h5diff_101w.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_101w.txt rename to tools/test/h5diff/expected/h5diff_101w.txt diff --git a/tools/test/h5diff/testfiles/h5diff_102.txt b/tools/test/h5diff/expected/h5diff_102.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_102.txt rename to tools/test/h5diff/expected/h5diff_102.txt diff --git a/tools/test/h5diff/testfiles/h5diff_102w.txt b/tools/test/h5diff/expected/h5diff_102w.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_102w.txt rename to tools/test/h5diff/expected/h5diff_102w.txt diff --git a/tools/test/h5diff/testfiles/h5diff_103.txt b/tools/test/h5diff/expected/h5diff_103.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_103.txt rename to tools/test/h5diff/expected/h5diff_103.txt diff --git a/tools/test/h5diff/testfiles/h5diff_103w.txt b/tools/test/h5diff/expected/h5diff_103w.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_103w.txt rename to tools/test/h5diff/expected/h5diff_103w.txt diff --git a/tools/test/h5diff/testfiles/h5diff_104.txt b/tools/test/h5diff/expected/h5diff_104.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_104.txt rename to tools/test/h5diff/expected/h5diff_104.txt diff --git a/tools/test/h5diff/testfiles/h5diff_104w.txt b/tools/test/h5diff/expected/h5diff_104w.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_104w.txt rename to tools/test/h5diff/expected/h5diff_104w.txt diff --git a/tools/test/h5diff/testfiles/h5diff_11.txt b/tools/test/h5diff/expected/h5diff_11.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_11.txt rename to tools/test/h5diff/expected/h5diff_11.txt diff --git a/tools/test/h5diff/testfiles/h5diff_12.txt b/tools/test/h5diff/expected/h5diff_12.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_12.txt rename to tools/test/h5diff/expected/h5diff_12.txt diff --git a/tools/test/h5diff/testfiles/h5diff_13.txt b/tools/test/h5diff/expected/h5diff_13.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_13.txt rename to tools/test/h5diff/expected/h5diff_13.txt diff --git a/tools/test/h5diff/testfiles/h5diff_14.txt b/tools/test/h5diff/expected/h5diff_14.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_14.txt rename to tools/test/h5diff/expected/h5diff_14.txt diff --git a/tools/test/h5diff/testfiles/h5diff_15.txt b/tools/test/h5diff/expected/h5diff_15.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_15.txt rename to tools/test/h5diff/expected/h5diff_15.txt diff --git a/tools/test/h5diff/testfiles/h5diff_16_1.txt b/tools/test/h5diff/expected/h5diff_16_1.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_16_1.txt rename to tools/test/h5diff/expected/h5diff_16_1.txt diff --git a/tools/test/h5diff/testfiles/h5diff_16_2.txt b/tools/test/h5diff/expected/h5diff_16_2.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_16_2.txt rename to tools/test/h5diff/expected/h5diff_16_2.txt diff --git a/tools/test/h5diff/testfiles/h5diff_16_3.txt b/tools/test/h5diff/expected/h5diff_16_3.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_16_3.txt rename to tools/test/h5diff/expected/h5diff_16_3.txt diff --git a/tools/test/h5diff/testfiles/h5diff_17.txt b/tools/test/h5diff/expected/h5diff_17.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_17.txt rename to tools/test/h5diff/expected/h5diff_17.txt diff --git a/tools/test/h5diff/testfiles/h5diff_171.txt b/tools/test/h5diff/expected/h5diff_171.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_171.txt rename to tools/test/h5diff/expected/h5diff_171.txt diff --git a/tools/test/h5diff/testfiles/h5diff_172.txt b/tools/test/h5diff/expected/h5diff_172.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_172.txt rename to tools/test/h5diff/expected/h5diff_172.txt diff --git a/tools/test/h5diff/testfiles/h5diff_18.txt b/tools/test/h5diff/expected/h5diff_18.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_18.txt rename to tools/test/h5diff/expected/h5diff_18.txt diff --git a/tools/test/h5diff/testfiles/h5diff_18_1.txt b/tools/test/h5diff/expected/h5diff_18_1.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_18_1.txt rename to tools/test/h5diff/expected/h5diff_18_1.txt diff --git a/tools/test/h5diff/testfiles/h5diff_19.txt b/tools/test/h5diff/expected/h5diff_19.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_19.txt rename to tools/test/h5diff/expected/h5diff_19.txt diff --git a/tools/test/h5diff/testfiles/h5diff_20.txt b/tools/test/h5diff/expected/h5diff_20.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_20.txt rename to tools/test/h5diff/expected/h5diff_20.txt diff --git a/tools/test/h5diff/testfiles/h5diff_200.txt b/tools/test/h5diff/expected/h5diff_200.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_200.txt rename to tools/test/h5diff/expected/h5diff_200.txt diff --git a/tools/test/h5diff/testfiles/h5diff_201.txt b/tools/test/h5diff/expected/h5diff_201.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_201.txt rename to tools/test/h5diff/expected/h5diff_201.txt diff --git a/tools/test/h5diff/testfiles/h5diff_202.txt b/tools/test/h5diff/expected/h5diff_202.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_202.txt rename to tools/test/h5diff/expected/h5diff_202.txt diff --git a/tools/test/h5diff/testfiles/h5diff_203.txt b/tools/test/h5diff/expected/h5diff_203.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_203.txt rename to tools/test/h5diff/expected/h5diff_203.txt diff --git a/tools/test/h5diff/testfiles/h5diff_204.txt b/tools/test/h5diff/expected/h5diff_204.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_204.txt rename to tools/test/h5diff/expected/h5diff_204.txt diff --git a/tools/test/h5diff/testfiles/h5diff_205.txt b/tools/test/h5diff/expected/h5diff_205.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_205.txt rename to tools/test/h5diff/expected/h5diff_205.txt diff --git a/tools/test/h5diff/testfiles/h5diff_206.txt b/tools/test/h5diff/expected/h5diff_206.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_206.txt rename to tools/test/h5diff/expected/h5diff_206.txt diff --git a/tools/test/h5diff/testfiles/h5diff_207.txt b/tools/test/h5diff/expected/h5diff_207.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_207.txt rename to tools/test/h5diff/expected/h5diff_207.txt diff --git a/tools/test/h5diff/testfiles/h5diff_208.txt b/tools/test/h5diff/expected/h5diff_208.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_208.txt rename to tools/test/h5diff/expected/h5diff_208.txt diff --git a/tools/test/h5diff/testfiles/h5diff_21.txt b/tools/test/h5diff/expected/h5diff_21.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_21.txt rename to tools/test/h5diff/expected/h5diff_21.txt diff --git a/tools/test/h5diff/testfiles/h5diff_22.txt b/tools/test/h5diff/expected/h5diff_22.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_22.txt rename to tools/test/h5diff/expected/h5diff_22.txt diff --git a/tools/test/h5diff/testfiles/h5diff_220.txt b/tools/test/h5diff/expected/h5diff_220.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_220.txt rename to tools/test/h5diff/expected/h5diff_220.txt diff --git a/tools/test/h5diff/testfiles/h5diff_221.txt b/tools/test/h5diff/expected/h5diff_221.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_221.txt rename to tools/test/h5diff/expected/h5diff_221.txt diff --git a/tools/test/h5diff/testfiles/h5diff_222.txt b/tools/test/h5diff/expected/h5diff_222.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_222.txt rename to tools/test/h5diff/expected/h5diff_222.txt diff --git a/tools/test/h5diff/testfiles/h5diff_223.txt b/tools/test/h5diff/expected/h5diff_223.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_223.txt rename to tools/test/h5diff/expected/h5diff_223.txt diff --git a/tools/test/h5diff/testfiles/h5diff_224.txt b/tools/test/h5diff/expected/h5diff_224.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_224.txt rename to tools/test/h5diff/expected/h5diff_224.txt diff --git a/tools/test/h5diff/testfiles/h5diff_23.txt b/tools/test/h5diff/expected/h5diff_23.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_23.txt rename to tools/test/h5diff/expected/h5diff_23.txt diff --git a/tools/test/h5diff/testfiles/h5diff_24.txt b/tools/test/h5diff/expected/h5diff_24.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_24.txt rename to tools/test/h5diff/expected/h5diff_24.txt diff --git a/tools/test/h5diff/testfiles/h5diff_25.txt b/tools/test/h5diff/expected/h5diff_25.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_25.txt rename to tools/test/h5diff/expected/h5diff_25.txt diff --git a/tools/test/h5diff/testfiles/h5diff_26.txt b/tools/test/h5diff/expected/h5diff_26.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_26.txt rename to tools/test/h5diff/expected/h5diff_26.txt diff --git a/tools/test/h5diff/testfiles/h5diff_27.txt b/tools/test/h5diff/expected/h5diff_27.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_27.txt rename to tools/test/h5diff/expected/h5diff_27.txt diff --git a/tools/test/h5diff/testfiles/h5diff_28.txt b/tools/test/h5diff/expected/h5diff_28.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_28.txt rename to tools/test/h5diff/expected/h5diff_28.txt diff --git a/tools/test/h5diff/testfiles/h5diff_30.txt b/tools/test/h5diff/expected/h5diff_30.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_30.txt rename to tools/test/h5diff/expected/h5diff_30.txt diff --git a/tools/test/h5diff/testfiles/h5diff_300.txt b/tools/test/h5diff/expected/h5diff_300.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_300.txt rename to tools/test/h5diff/expected/h5diff_300.txt diff --git a/tools/test/h5diff/testfiles/h5diff_400.txt b/tools/test/h5diff/expected/h5diff_400.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_400.txt rename to tools/test/h5diff/expected/h5diff_400.txt diff --git a/tools/test/h5diff/testfiles/h5diff_401.txt b/tools/test/h5diff/expected/h5diff_401.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_401.txt rename to tools/test/h5diff/expected/h5diff_401.txt diff --git a/tools/test/h5diff/testfiles/h5diff_402.txt b/tools/test/h5diff/expected/h5diff_402.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_402.txt rename to tools/test/h5diff/expected/h5diff_402.txt diff --git a/tools/test/h5diff/testfiles/h5diff_403.txt b/tools/test/h5diff/expected/h5diff_403.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_403.txt rename to tools/test/h5diff/expected/h5diff_403.txt diff --git a/tools/test/h5diff/testfiles/h5diff_404.txt b/tools/test/h5diff/expected/h5diff_404.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_404.txt rename to tools/test/h5diff/expected/h5diff_404.txt diff --git a/tools/test/h5diff/testfiles/h5diff_405.txt b/tools/test/h5diff/expected/h5diff_405.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_405.txt rename to tools/test/h5diff/expected/h5diff_405.txt diff --git a/tools/test/h5diff/testfiles/h5diff_406.txt b/tools/test/h5diff/expected/h5diff_406.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_406.txt rename to tools/test/h5diff/expected/h5diff_406.txt diff --git a/tools/test/h5diff/testfiles/h5diff_407.txt b/tools/test/h5diff/expected/h5diff_407.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_407.txt rename to tools/test/h5diff/expected/h5diff_407.txt diff --git a/tools/test/h5diff/testfiles/h5diff_408.txt b/tools/test/h5diff/expected/h5diff_408.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_408.txt rename to tools/test/h5diff/expected/h5diff_408.txt diff --git a/tools/test/h5diff/testfiles/h5diff_409.txt b/tools/test/h5diff/expected/h5diff_409.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_409.txt rename to tools/test/h5diff/expected/h5diff_409.txt diff --git a/tools/test/h5diff/testfiles/h5diff_410.txt b/tools/test/h5diff/expected/h5diff_410.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_410.txt rename to tools/test/h5diff/expected/h5diff_410.txt diff --git a/tools/test/h5diff/testfiles/h5diff_411.txt b/tools/test/h5diff/expected/h5diff_411.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_411.txt rename to tools/test/h5diff/expected/h5diff_411.txt diff --git a/tools/test/h5diff/testfiles/h5diff_412.txt b/tools/test/h5diff/expected/h5diff_412.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_412.txt rename to tools/test/h5diff/expected/h5diff_412.txt diff --git a/tools/test/h5diff/testfiles/h5diff_413.txt b/tools/test/h5diff/expected/h5diff_413.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_413.txt rename to tools/test/h5diff/expected/h5diff_413.txt diff --git a/tools/test/h5diff/testfiles/h5diff_414.txt b/tools/test/h5diff/expected/h5diff_414.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_414.txt rename to tools/test/h5diff/expected/h5diff_414.txt diff --git a/tools/test/h5diff/testfiles/h5diff_415.txt b/tools/test/h5diff/expected/h5diff_415.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_415.txt rename to tools/test/h5diff/expected/h5diff_415.txt diff --git a/tools/test/h5diff/testfiles/h5diff_416.txt b/tools/test/h5diff/expected/h5diff_416.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_416.txt rename to tools/test/h5diff/expected/h5diff_416.txt diff --git a/tools/test/h5diff/testfiles/h5diff_417.txt b/tools/test/h5diff/expected/h5diff_417.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_417.txt rename to tools/test/h5diff/expected/h5diff_417.txt diff --git a/tools/test/h5diff/testfiles/h5diff_418.txt b/tools/test/h5diff/expected/h5diff_418.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_418.txt rename to tools/test/h5diff/expected/h5diff_418.txt diff --git a/tools/test/h5diff/testfiles/h5diff_419.txt b/tools/test/h5diff/expected/h5diff_419.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_419.txt rename to tools/test/h5diff/expected/h5diff_419.txt diff --git a/tools/test/h5diff/testfiles/h5diff_420.txt b/tools/test/h5diff/expected/h5diff_420.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_420.txt rename to tools/test/h5diff/expected/h5diff_420.txt diff --git a/tools/test/h5diff/testfiles/h5diff_421.txt b/tools/test/h5diff/expected/h5diff_421.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_421.txt rename to tools/test/h5diff/expected/h5diff_421.txt diff --git a/tools/test/h5diff/testfiles/h5diff_422.txt b/tools/test/h5diff/expected/h5diff_422.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_422.txt rename to tools/test/h5diff/expected/h5diff_422.txt diff --git a/tools/test/h5diff/testfiles/h5diff_423.txt b/tools/test/h5diff/expected/h5diff_423.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_423.txt rename to tools/test/h5diff/expected/h5diff_423.txt diff --git a/tools/test/h5diff/testfiles/h5diff_424.txt b/tools/test/h5diff/expected/h5diff_424.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_424.txt rename to tools/test/h5diff/expected/h5diff_424.txt diff --git a/tools/test/h5diff/testfiles/h5diff_425.txt b/tools/test/h5diff/expected/h5diff_425.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_425.txt rename to tools/test/h5diff/expected/h5diff_425.txt diff --git a/tools/test/h5diff/testfiles/h5diff_450.txt b/tools/test/h5diff/expected/h5diff_450.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_450.txt rename to tools/test/h5diff/expected/h5diff_450.txt diff --git a/tools/test/h5diff/testfiles/h5diff_451.txt b/tools/test/h5diff/expected/h5diff_451.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_451.txt rename to tools/test/h5diff/expected/h5diff_451.txt diff --git a/tools/test/h5diff/testfiles/h5diff_452.txt b/tools/test/h5diff/expected/h5diff_452.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_452.txt rename to tools/test/h5diff/expected/h5diff_452.txt diff --git a/tools/test/h5diff/testfiles/h5diff_453.txt b/tools/test/h5diff/expected/h5diff_453.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_453.txt rename to tools/test/h5diff/expected/h5diff_453.txt diff --git a/tools/test/h5diff/testfiles/h5diff_454.txt b/tools/test/h5diff/expected/h5diff_454.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_454.txt rename to tools/test/h5diff/expected/h5diff_454.txt diff --git a/tools/test/h5diff/testfiles/h5diff_455.txt b/tools/test/h5diff/expected/h5diff_455.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_455.txt rename to tools/test/h5diff/expected/h5diff_455.txt diff --git a/tools/test/h5diff/testfiles/h5diff_456.txt b/tools/test/h5diff/expected/h5diff_456.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_456.txt rename to tools/test/h5diff/expected/h5diff_456.txt diff --git a/tools/test/h5diff/testfiles/h5diff_457.txt b/tools/test/h5diff/expected/h5diff_457.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_457.txt rename to tools/test/h5diff/expected/h5diff_457.txt diff --git a/tools/test/h5diff/testfiles/h5diff_458.txt b/tools/test/h5diff/expected/h5diff_458.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_458.txt rename to tools/test/h5diff/expected/h5diff_458.txt diff --git a/tools/test/h5diff/testfiles/h5diff_459.txt b/tools/test/h5diff/expected/h5diff_459.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_459.txt rename to tools/test/h5diff/expected/h5diff_459.txt diff --git a/tools/test/h5diff/testfiles/h5diff_465.txt b/tools/test/h5diff/expected/h5diff_465.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_465.txt rename to tools/test/h5diff/expected/h5diff_465.txt diff --git a/tools/test/h5diff/testfiles/h5diff_466.txt b/tools/test/h5diff/expected/h5diff_466.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_466.txt rename to tools/test/h5diff/expected/h5diff_466.txt diff --git a/tools/test/h5diff/testfiles/h5diff_467.txt b/tools/test/h5diff/expected/h5diff_467.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_467.txt rename to tools/test/h5diff/expected/h5diff_467.txt diff --git a/tools/test/h5diff/testfiles/h5diff_468.txt b/tools/test/h5diff/expected/h5diff_468.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_468.txt rename to tools/test/h5diff/expected/h5diff_468.txt diff --git a/tools/test/h5diff/testfiles/h5diff_469.txt b/tools/test/h5diff/expected/h5diff_469.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_469.txt rename to tools/test/h5diff/expected/h5diff_469.txt diff --git a/tools/test/h5diff/testfiles/h5diff_471.txt b/tools/test/h5diff/expected/h5diff_471.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_471.txt rename to tools/test/h5diff/expected/h5diff_471.txt diff --git a/tools/test/h5diff/testfiles/h5diff_472.txt b/tools/test/h5diff/expected/h5diff_472.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_472.txt rename to tools/test/h5diff/expected/h5diff_472.txt diff --git a/tools/test/h5diff/testfiles/h5diff_473.txt b/tools/test/h5diff/expected/h5diff_473.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_473.txt rename to tools/test/h5diff/expected/h5diff_473.txt diff --git a/tools/test/h5diff/testfiles/h5diff_474.txt b/tools/test/h5diff/expected/h5diff_474.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_474.txt rename to tools/test/h5diff/expected/h5diff_474.txt diff --git a/tools/test/h5diff/testfiles/h5diff_475.txt b/tools/test/h5diff/expected/h5diff_475.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_475.txt rename to tools/test/h5diff/expected/h5diff_475.txt diff --git a/tools/test/h5diff/testfiles/h5diff_480.txt b/tools/test/h5diff/expected/h5diff_480.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_480.txt rename to tools/test/h5diff/expected/h5diff_480.txt diff --git a/tools/test/h5diff/testfiles/h5diff_481.txt b/tools/test/h5diff/expected/h5diff_481.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_481.txt rename to tools/test/h5diff/expected/h5diff_481.txt diff --git a/tools/test/h5diff/testfiles/h5diff_482.txt b/tools/test/h5diff/expected/h5diff_482.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_482.txt rename to tools/test/h5diff/expected/h5diff_482.txt diff --git a/tools/test/h5diff/testfiles/h5diff_483.txt b/tools/test/h5diff/expected/h5diff_483.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_483.txt rename to tools/test/h5diff/expected/h5diff_483.txt diff --git a/tools/test/h5diff/testfiles/h5diff_484.txt b/tools/test/h5diff/expected/h5diff_484.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_484.txt rename to tools/test/h5diff/expected/h5diff_484.txt diff --git a/tools/test/h5diff/testfiles/h5diff_485.txt b/tools/test/h5diff/expected/h5diff_485.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_485.txt rename to tools/test/h5diff/expected/h5diff_485.txt diff --git a/tools/test/h5diff/testfiles/h5diff_486.txt b/tools/test/h5diff/expected/h5diff_486.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_486.txt rename to tools/test/h5diff/expected/h5diff_486.txt diff --git a/tools/test/h5diff/testfiles/h5diff_487.txt b/tools/test/h5diff/expected/h5diff_487.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_487.txt rename to tools/test/h5diff/expected/h5diff_487.txt diff --git a/tools/test/h5diff/testfiles/h5diff_50.txt b/tools/test/h5diff/expected/h5diff_50.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_50.txt rename to tools/test/h5diff/expected/h5diff_50.txt diff --git a/tools/test/h5diff/testfiles/h5diff_500.txt b/tools/test/h5diff/expected/h5diff_500.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_500.txt rename to tools/test/h5diff/expected/h5diff_500.txt diff --git a/tools/test/h5diff/testfiles/h5diff_501.txt b/tools/test/h5diff/expected/h5diff_501.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_501.txt rename to tools/test/h5diff/expected/h5diff_501.txt diff --git a/tools/test/h5diff/testfiles/h5diff_502.txt b/tools/test/h5diff/expected/h5diff_502.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_502.txt rename to tools/test/h5diff/expected/h5diff_502.txt diff --git a/tools/test/h5diff/testfiles/h5diff_503.txt b/tools/test/h5diff/expected/h5diff_503.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_503.txt rename to tools/test/h5diff/expected/h5diff_503.txt diff --git a/tools/test/h5diff/testfiles/h5diff_504.txt b/tools/test/h5diff/expected/h5diff_504.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_504.txt rename to tools/test/h5diff/expected/h5diff_504.txt diff --git a/tools/test/h5diff/testfiles/h5diff_505.txt b/tools/test/h5diff/expected/h5diff_505.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_505.txt rename to tools/test/h5diff/expected/h5diff_505.txt diff --git a/tools/test/h5diff/testfiles/h5diff_506.txt b/tools/test/h5diff/expected/h5diff_506.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_506.txt rename to tools/test/h5diff/expected/h5diff_506.txt diff --git a/tools/test/h5diff/testfiles/h5diff_507.txt b/tools/test/h5diff/expected/h5diff_507.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_507.txt rename to tools/test/h5diff/expected/h5diff_507.txt diff --git a/tools/test/h5diff/testfiles/h5diff_508.txt b/tools/test/h5diff/expected/h5diff_508.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_508.txt rename to tools/test/h5diff/expected/h5diff_508.txt diff --git a/tools/test/h5diff/testfiles/h5diff_509.txt b/tools/test/h5diff/expected/h5diff_509.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_509.txt rename to tools/test/h5diff/expected/h5diff_509.txt diff --git a/tools/test/h5diff/testfiles/h5diff_51.txt b/tools/test/h5diff/expected/h5diff_51.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_51.txt rename to tools/test/h5diff/expected/h5diff_51.txt diff --git a/tools/test/h5diff/testfiles/h5diff_510.txt b/tools/test/h5diff/expected/h5diff_510.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_510.txt rename to tools/test/h5diff/expected/h5diff_510.txt diff --git a/tools/test/h5diff/testfiles/h5diff_511.txt b/tools/test/h5diff/expected/h5diff_511.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_511.txt rename to tools/test/h5diff/expected/h5diff_511.txt diff --git a/tools/test/h5diff/testfiles/h5diff_512.txt b/tools/test/h5diff/expected/h5diff_512.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_512.txt rename to tools/test/h5diff/expected/h5diff_512.txt diff --git a/tools/test/h5diff/testfiles/h5diff_513.txt b/tools/test/h5diff/expected/h5diff_513.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_513.txt rename to tools/test/h5diff/expected/h5diff_513.txt diff --git a/tools/test/h5diff/testfiles/h5diff_514.txt b/tools/test/h5diff/expected/h5diff_514.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_514.txt rename to tools/test/h5diff/expected/h5diff_514.txt diff --git a/tools/test/h5diff/testfiles/h5diff_515.txt b/tools/test/h5diff/expected/h5diff_515.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_515.txt rename to tools/test/h5diff/expected/h5diff_515.txt diff --git a/tools/test/h5diff/testfiles/h5diff_516.txt b/tools/test/h5diff/expected/h5diff_516.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_516.txt rename to tools/test/h5diff/expected/h5diff_516.txt diff --git a/tools/test/h5diff/testfiles/h5diff_517.txt b/tools/test/h5diff/expected/h5diff_517.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_517.txt rename to tools/test/h5diff/expected/h5diff_517.txt diff --git a/tools/test/h5diff/testfiles/h5diff_518.txt b/tools/test/h5diff/expected/h5diff_518.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_518.txt rename to tools/test/h5diff/expected/h5diff_518.txt diff --git a/tools/test/h5diff/testfiles/h5diff_52.txt b/tools/test/h5diff/expected/h5diff_52.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_52.txt rename to tools/test/h5diff/expected/h5diff_52.txt diff --git a/tools/test/h5diff/testfiles/h5diff_53.txt b/tools/test/h5diff/expected/h5diff_53.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_53.txt rename to tools/test/h5diff/expected/h5diff_53.txt diff --git a/tools/test/h5diff/testfiles/h5diff_530.txt b/tools/test/h5diff/expected/h5diff_530.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_530.txt rename to tools/test/h5diff/expected/h5diff_530.txt diff --git a/tools/test/h5diff/testfiles/h5diff_54.txt b/tools/test/h5diff/expected/h5diff_54.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_54.txt rename to tools/test/h5diff/expected/h5diff_54.txt diff --git a/tools/test/h5diff/testfiles/h5diff_540.txt b/tools/test/h5diff/expected/h5diff_540.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_540.txt rename to tools/test/h5diff/expected/h5diff_540.txt diff --git a/tools/test/h5diff/testfiles/h5diff_55.txt b/tools/test/h5diff/expected/h5diff_55.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_55.txt rename to tools/test/h5diff/expected/h5diff_55.txt diff --git a/tools/test/h5diff/testfiles/h5diff_56.txt b/tools/test/h5diff/expected/h5diff_56.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_56.txt rename to tools/test/h5diff/expected/h5diff_56.txt diff --git a/tools/test/h5diff/testfiles/h5diff_57.txt b/tools/test/h5diff/expected/h5diff_57.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_57.txt rename to tools/test/h5diff/expected/h5diff_57.txt diff --git a/tools/test/h5diff/testfiles/h5diff_58.txt b/tools/test/h5diff/expected/h5diff_58.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_58.txt rename to tools/test/h5diff/expected/h5diff_58.txt diff --git a/tools/test/h5diff/testfiles/h5diff_58_ref.txt b/tools/test/h5diff/expected/h5diff_58_ref.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_58_ref.txt rename to tools/test/h5diff/expected/h5diff_58_ref.txt diff --git a/tools/test/h5diff/testfiles/h5diff_59.txt b/tools/test/h5diff/expected/h5diff_59.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_59.txt rename to tools/test/h5diff/expected/h5diff_59.txt diff --git a/tools/test/h5diff/testfiles/h5diff_60.txt b/tools/test/h5diff/expected/h5diff_60.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_60.txt rename to tools/test/h5diff/expected/h5diff_60.txt diff --git a/tools/test/h5diff/testfiles/h5diff_600.txt b/tools/test/h5diff/expected/h5diff_600.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_600.txt rename to tools/test/h5diff/expected/h5diff_600.txt diff --git a/tools/test/h5diff/testfiles/h5diff_601.txt b/tools/test/h5diff/expected/h5diff_601.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_601.txt rename to tools/test/h5diff/expected/h5diff_601.txt diff --git a/tools/test/h5diff/testfiles/h5diff_601_ERR.err b/tools/test/h5diff/expected/h5diff_601_ERR.err similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_601_ERR.err rename to tools/test/h5diff/expected/h5diff_601_ERR.err diff --git a/tools/test/h5diff/testfiles/h5diff_603.txt b/tools/test/h5diff/expected/h5diff_603.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_603.txt rename to tools/test/h5diff/expected/h5diff_603.txt diff --git a/tools/test/h5diff/testfiles/h5diff_604.txt b/tools/test/h5diff/expected/h5diff_604.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_604.txt rename to tools/test/h5diff/expected/h5diff_604.txt diff --git a/tools/test/h5diff/testfiles/h5diff_605.txt b/tools/test/h5diff/expected/h5diff_605.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_605.txt rename to tools/test/h5diff/expected/h5diff_605.txt diff --git a/tools/test/h5diff/testfiles/h5diff_606.txt b/tools/test/h5diff/expected/h5diff_606.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_606.txt rename to tools/test/h5diff/expected/h5diff_606.txt diff --git a/tools/test/h5diff/testfiles/h5diff_607.txt b/tools/test/h5diff/expected/h5diff_607.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_607.txt rename to tools/test/h5diff/expected/h5diff_607.txt diff --git a/tools/test/h5diff/testfiles/h5diff_608.txt b/tools/test/h5diff/expected/h5diff_608.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_608.txt rename to tools/test/h5diff/expected/h5diff_608.txt diff --git a/tools/test/h5diff/testfiles/h5diff_609.txt b/tools/test/h5diff/expected/h5diff_609.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_609.txt rename to tools/test/h5diff/expected/h5diff_609.txt diff --git a/tools/test/h5diff/testfiles/h5diff_61.txt b/tools/test/h5diff/expected/h5diff_61.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_61.txt rename to tools/test/h5diff/expected/h5diff_61.txt diff --git a/tools/test/h5diff/testfiles/h5diff_610.txt b/tools/test/h5diff/expected/h5diff_610.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_610.txt rename to tools/test/h5diff/expected/h5diff_610.txt diff --git a/tools/test/h5diff/testfiles/h5diff_612.txt b/tools/test/h5diff/expected/h5diff_612.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_612.txt rename to tools/test/h5diff/expected/h5diff_612.txt diff --git a/tools/test/h5diff/testfiles/h5diff_613.txt b/tools/test/h5diff/expected/h5diff_613.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_613.txt rename to tools/test/h5diff/expected/h5diff_613.txt diff --git a/tools/test/h5diff/testfiles/h5diff_614.txt b/tools/test/h5diff/expected/h5diff_614.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_614.txt rename to tools/test/h5diff/expected/h5diff_614.txt diff --git a/tools/test/h5diff/testfiles/h5diff_615.txt b/tools/test/h5diff/expected/h5diff_615.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_615.txt rename to tools/test/h5diff/expected/h5diff_615.txt diff --git a/tools/test/h5diff/testfiles/h5diff_616.txt b/tools/test/h5diff/expected/h5diff_616.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_616.txt rename to tools/test/h5diff/expected/h5diff_616.txt diff --git a/tools/test/h5diff/testfiles/h5diff_617.txt b/tools/test/h5diff/expected/h5diff_617.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_617.txt rename to tools/test/h5diff/expected/h5diff_617.txt diff --git a/tools/test/h5diff/testfiles/h5diff_618.txt b/tools/test/h5diff/expected/h5diff_618.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_618.txt rename to tools/test/h5diff/expected/h5diff_618.txt diff --git a/tools/test/h5diff/testfiles/h5diff_619.txt b/tools/test/h5diff/expected/h5diff_619.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_619.txt rename to tools/test/h5diff/expected/h5diff_619.txt diff --git a/tools/test/h5diff/testfiles/h5diff_62.txt b/tools/test/h5diff/expected/h5diff_62.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_62.txt rename to tools/test/h5diff/expected/h5diff_62.txt diff --git a/tools/test/h5diff/testfiles/h5diff_621.txt b/tools/test/h5diff/expected/h5diff_621.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_621.txt rename to tools/test/h5diff/expected/h5diff_621.txt diff --git a/tools/test/h5diff/testfiles/h5diff_622.txt b/tools/test/h5diff/expected/h5diff_622.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_622.txt rename to tools/test/h5diff/expected/h5diff_622.txt diff --git a/tools/test/h5diff/testfiles/h5diff_623.txt b/tools/test/h5diff/expected/h5diff_623.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_623.txt rename to tools/test/h5diff/expected/h5diff_623.txt diff --git a/tools/test/h5diff/testfiles/h5diff_624.txt b/tools/test/h5diff/expected/h5diff_624.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_624.txt rename to tools/test/h5diff/expected/h5diff_624.txt diff --git a/tools/test/h5diff/testfiles/h5diff_625.txt b/tools/test/h5diff/expected/h5diff_625.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_625.txt rename to tools/test/h5diff/expected/h5diff_625.txt diff --git a/tools/test/h5diff/testfiles/h5diff_626.txt b/tools/test/h5diff/expected/h5diff_626.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_626.txt rename to tools/test/h5diff/expected/h5diff_626.txt diff --git a/tools/test/h5diff/testfiles/h5diff_627.txt b/tools/test/h5diff/expected/h5diff_627.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_627.txt rename to tools/test/h5diff/expected/h5diff_627.txt diff --git a/tools/test/h5diff/testfiles/h5diff_628.txt b/tools/test/h5diff/expected/h5diff_628.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_628.txt rename to tools/test/h5diff/expected/h5diff_628.txt diff --git a/tools/test/h5diff/testfiles/h5diff_629.txt b/tools/test/h5diff/expected/h5diff_629.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_629.txt rename to tools/test/h5diff/expected/h5diff_629.txt diff --git a/tools/test/h5diff/testfiles/h5diff_63.txt b/tools/test/h5diff/expected/h5diff_63.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_63.txt rename to tools/test/h5diff/expected/h5diff_63.txt diff --git a/tools/test/h5diff/testfiles/h5diff_630.txt b/tools/test/h5diff/expected/h5diff_630.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_630.txt rename to tools/test/h5diff/expected/h5diff_630.txt diff --git a/tools/test/h5diff/testfiles/h5diff_631.txt b/tools/test/h5diff/expected/h5diff_631.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_631.txt rename to tools/test/h5diff/expected/h5diff_631.txt diff --git a/tools/test/h5diff/testfiles/h5diff_640.txt b/tools/test/h5diff/expected/h5diff_640.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_640.txt rename to tools/test/h5diff/expected/h5diff_640.txt diff --git a/tools/test/h5diff/testfiles/h5diff_641.txt b/tools/test/h5diff/expected/h5diff_641.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_641.txt rename to tools/test/h5diff/expected/h5diff_641.txt diff --git a/tools/test/h5diff/testfiles/h5diff_642.txt b/tools/test/h5diff/expected/h5diff_642.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_642.txt rename to tools/test/h5diff/expected/h5diff_642.txt diff --git a/tools/test/h5diff/testfiles/h5diff_643.txt b/tools/test/h5diff/expected/h5diff_643.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_643.txt rename to tools/test/h5diff/expected/h5diff_643.txt diff --git a/tools/test/h5diff/testfiles/h5diff_644.txt b/tools/test/h5diff/expected/h5diff_644.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_644.txt rename to tools/test/h5diff/expected/h5diff_644.txt diff --git a/tools/test/h5diff/testfiles/h5diff_645.txt b/tools/test/h5diff/expected/h5diff_645.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_645.txt rename to tools/test/h5diff/expected/h5diff_645.txt diff --git a/tools/test/h5diff/testfiles/h5diff_646.txt b/tools/test/h5diff/expected/h5diff_646.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_646.txt rename to tools/test/h5diff/expected/h5diff_646.txt diff --git a/tools/test/h5diff/testfiles/h5diff_70.txt b/tools/test/h5diff/expected/h5diff_70.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_70.txt rename to tools/test/h5diff/expected/h5diff_70.txt diff --git a/tools/test/h5diff/testfiles/h5diff_700.txt b/tools/test/h5diff/expected/h5diff_700.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_700.txt rename to tools/test/h5diff/expected/h5diff_700.txt diff --git a/tools/test/h5diff/testfiles/h5diff_701.txt b/tools/test/h5diff/expected/h5diff_701.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_701.txt rename to tools/test/h5diff/expected/h5diff_701.txt diff --git a/tools/test/h5diff/testfiles/h5diff_702.txt b/tools/test/h5diff/expected/h5diff_702.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_702.txt rename to tools/test/h5diff/expected/h5diff_702.txt diff --git a/tools/test/h5diff/testfiles/h5diff_703.txt b/tools/test/h5diff/expected/h5diff_703.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_703.txt rename to tools/test/h5diff/expected/h5diff_703.txt diff --git a/tools/test/h5diff/testfiles/h5diff_704.txt b/tools/test/h5diff/expected/h5diff_704.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_704.txt rename to tools/test/h5diff/expected/h5diff_704.txt diff --git a/tools/test/h5diff/testfiles/h5diff_705.txt b/tools/test/h5diff/expected/h5diff_705.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_705.txt rename to tools/test/h5diff/expected/h5diff_705.txt diff --git a/tools/test/h5diff/testfiles/h5diff_706.txt b/tools/test/h5diff/expected/h5diff_706.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_706.txt rename to tools/test/h5diff/expected/h5diff_706.txt diff --git a/tools/test/h5diff/testfiles/h5diff_707.txt b/tools/test/h5diff/expected/h5diff_707.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_707.txt rename to tools/test/h5diff/expected/h5diff_707.txt diff --git a/tools/test/h5diff/testfiles/h5diff_708.txt b/tools/test/h5diff/expected/h5diff_708.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_708.txt rename to tools/test/h5diff/expected/h5diff_708.txt diff --git a/tools/test/h5diff/testfiles/h5diff_709.txt b/tools/test/h5diff/expected/h5diff_709.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_709.txt rename to tools/test/h5diff/expected/h5diff_709.txt diff --git a/tools/test/h5diff/testfiles/h5diff_710.txt b/tools/test/h5diff/expected/h5diff_710.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_710.txt rename to tools/test/h5diff/expected/h5diff_710.txt diff --git a/tools/test/h5diff/testfiles/h5diff_80.txt b/tools/test/h5diff/expected/h5diff_80.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_80.txt rename to tools/test/h5diff/expected/h5diff_80.txt diff --git a/tools/test/h5diff/testfiles/h5diff_800.txt b/tools/test/h5diff/expected/h5diff_800.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_800.txt rename to tools/test/h5diff/expected/h5diff_800.txt diff --git a/tools/test/h5diff/testfiles/h5diff_801.txt b/tools/test/h5diff/expected/h5diff_801.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_801.txt rename to tools/test/h5diff/expected/h5diff_801.txt diff --git a/tools/test/h5diff/testfiles/h5diff_830.txt b/tools/test/h5diff/expected/h5diff_830.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_830.txt rename to tools/test/h5diff/expected/h5diff_830.txt diff --git a/tools/test/h5diff/testfiles/h5diff_8625.txt b/tools/test/h5diff/expected/h5diff_8625.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_8625.txt rename to tools/test/h5diff/expected/h5diff_8625.txt diff --git a/tools/test/h5diff/testfiles/h5diff_8639.txt b/tools/test/h5diff/expected/h5diff_8639.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_8639.txt rename to tools/test/h5diff/expected/h5diff_8639.txt diff --git a/tools/test/h5diff/testfiles/h5diff_90.txt b/tools/test/h5diff/expected/h5diff_90.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_90.txt rename to tools/test/h5diff/expected/h5diff_90.txt diff --git a/tools/test/h5diff/testfiles/h5diff_900.txt b/tools/test/h5diff/expected/h5diff_900.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_900.txt rename to tools/test/h5diff/expected/h5diff_900.txt diff --git a/tools/test/h5diff/testfiles/h5diff_901.txt b/tools/test/h5diff/expected/h5diff_901.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_901.txt rename to tools/test/h5diff/expected/h5diff_901.txt diff --git a/tools/test/h5diff/testfiles/h5diff_902.txt b/tools/test/h5diff/expected/h5diff_902.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_902.txt rename to tools/test/h5diff/expected/h5diff_902.txt diff --git a/tools/test/h5diff/testfiles/h5diff_eps.txt b/tools/test/h5diff/expected/h5diff_eps.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_eps.txt rename to tools/test/h5diff/expected/h5diff_eps.txt diff --git a/tools/test/h5diff/testfiles/h5diff_reg.txt b/tools/test/h5diff/expected/h5diff_reg.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_reg.txt rename to tools/test/h5diff/expected/h5diff_reg.txt diff --git a/tools/test/h5diff/testfiles/h5diff_ud.txt b/tools/test/h5diff/expected/h5diff_ud.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_ud.txt rename to tools/test/h5diff/expected/h5diff_ud.txt diff --git a/tools/test/h5diff/testfiles/h5diff_udfail.err b/tools/test/h5diff/expected/h5diff_udfail.err similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_udfail.err rename to tools/test/h5diff/expected/h5diff_udfail.err diff --git a/tools/test/h5diff/testfiles/h5diff_udfail.txt b/tools/test/h5diff/expected/h5diff_udfail.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_udfail.txt rename to tools/test/h5diff/expected/h5diff_udfail.txt diff --git a/tools/test/h5diff/testfiles/h5diff_v1.txt b/tools/test/h5diff/expected/h5diff_v1.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_v1.txt rename to tools/test/h5diff/expected/h5diff_v1.txt diff --git a/tools/test/h5diff/testfiles/h5diff_v2.txt b/tools/test/h5diff/expected/h5diff_v2.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_v2.txt rename to tools/test/h5diff/expected/h5diff_v2.txt diff --git a/tools/test/h5diff/testfiles/h5diff_v3.txt b/tools/test/h5diff/expected/h5diff_v3.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_v3.txt rename to tools/test/h5diff/expected/h5diff_v3.txt diff --git a/tools/test/h5diff/testfiles/h5diff_vlstr.txt b/tools/test/h5diff/expected/h5diff_vlstr.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_vlstr.txt rename to tools/test/h5diff/expected/h5diff_vlstr.txt diff --git a/tools/test/h5diff/h5diff_plugin.sh.in b/tools/test/h5diff/h5diff_plugin.sh.in index e3f0f01314b..525503d68eb 100644 --- a/tools/test/h5diff/h5diff_plugin.sh.in +++ b/tools/test/h5diff/h5diff_plugin.sh.in @@ -45,6 +45,7 @@ SRC_TOOLS="$srcdir/../.." # testfiles source dirs for tools SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" +SRC_H5DIFF_OUTFILES="$SRC_TOOLS/test/h5diff/expected" TESTDIR=./testplug test -d $TESTDIR || mkdir $TESTDIR @@ -61,9 +62,9 @@ test -d $TESTDIR || mkdir $TESTDIR LIST_HDF5_TEST_FILES=" $SRC_H5DIFF_TESTFILES/tudfilter.h5 $SRC_H5DIFF_TESTFILES/tudfilter2.h5 -$SRC_H5DIFF_TESTFILES/h5diff_ud.txt -$SRC_H5DIFF_TESTFILES/h5diff_udfail.err -$SRC_H5DIFF_TESTFILES/h5diff_udfail.txt +$SRC_H5DIFF_OUTFILES/h5diff_ud.txt +$SRC_H5DIFF_OUTFILES/h5diff_udfail.err +$SRC_H5DIFF_OUTFILES/h5diff_udfail.txt " # Main Body diff --git a/tools/test/h5diff/testh5diff.sh.in b/tools/test/h5diff/testh5diff.sh.in index 7cc82a1a08c..efaac2e4082 100644 --- a/tools/test/h5diff/testh5diff.sh.in +++ b/tools/test/h5diff/testh5diff.sh.in @@ -38,16 +38,16 @@ mydomainname=`domainname 2>/dev/null` # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" +SRC_H5DIFF_OUTFILES="$SRC_TOOLS/test/h5diff/expected" TESTDIR=./testfiles test -d $TESTDIR || mkdir $TESTDIR @@ -116,249 +116,249 @@ $SRC_H5DIFF_TESTFILES/h5diff_onion_dset_ext.h5 $SRC_H5DIFF_TESTFILES/h5diff_onion_dset_ext.h5.onion $SRC_H5DIFF_TESTFILES/h5diff_onion_dset_1d.h5 $SRC_H5DIFF_TESTFILES/h5diff_onion_dset_1d.h5.onion -$SRC_TOOLS_TESTFILES/tvlstr.h5 " LIST_HDF5_VDS_TEST_FILES=" -$SRC_TOOLS_TESTFILES/vds/1_a.h5 -$SRC_TOOLS_TESTFILES/vds/1_b.h5 -$SRC_TOOLS_TESTFILES/vds/1_c.h5 -$SRC_TOOLS_TESTFILES/vds/1_d.h5 -$SRC_TOOLS_TESTFILES/vds/1_e.h5 -$SRC_TOOLS_TESTFILES/vds/1_f.h5 -$SRC_TOOLS_TESTFILES/vds/1_vds.h5 -$SRC_TOOLS_TESTFILES/vds/2_a.h5 -$SRC_TOOLS_TESTFILES/vds/2_b.h5 -$SRC_TOOLS_TESTFILES/vds/2_c.h5 -$SRC_TOOLS_TESTFILES/vds/2_d.h5 -$SRC_TOOLS_TESTFILES/vds/2_e.h5 -$SRC_TOOLS_TESTFILES/vds/2_vds.h5 -$SRC_TOOLS_TESTFILES/vds/3_1_vds.h5 -$SRC_TOOLS_TESTFILES/vds/3_2_vds.h5 -$SRC_TOOLS_TESTFILES/vds/4_0.h5 -$SRC_TOOLS_TESTFILES/vds/4_1.h5 -$SRC_TOOLS_TESTFILES/vds/4_2.h5 -$SRC_TOOLS_TESTFILES/vds/4_vds.h5 -$SRC_TOOLS_TESTFILES/vds/5_a.h5 -$SRC_TOOLS_TESTFILES/vds/5_b.h5 -$SRC_TOOLS_TESTFILES/vds/5_c.h5 -$SRC_TOOLS_TESTFILES/vds/5_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/1_a.h5 +$SRC_H5DUMP_TESTFILES/vds/1_b.h5 +$SRC_H5DUMP_TESTFILES/vds/1_c.h5 +$SRC_H5DUMP_TESTFILES/vds/1_d.h5 +$SRC_H5DUMP_TESTFILES/vds/1_e.h5 +$SRC_H5DUMP_TESTFILES/vds/1_f.h5 +$SRC_H5DUMP_TESTFILES/vds/1_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/2_a.h5 +$SRC_H5DUMP_TESTFILES/vds/2_b.h5 +$SRC_H5DUMP_TESTFILES/vds/2_c.h5 +$SRC_H5DUMP_TESTFILES/vds/2_d.h5 +$SRC_H5DUMP_TESTFILES/vds/2_e.h5 +$SRC_H5DUMP_TESTFILES/vds/2_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/3_1_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/3_2_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/4_0.h5 +$SRC_H5DUMP_TESTFILES/vds/4_1.h5 +$SRC_H5DUMP_TESTFILES/vds/4_2.h5 +$SRC_H5DUMP_TESTFILES/vds/4_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/5_a.h5 +$SRC_H5DUMP_TESTFILES/vds/5_b.h5 +$SRC_H5DUMP_TESTFILES/vds/5_c.h5 +$SRC_H5DUMP_TESTFILES/vds/5_vds.h5 " LIST_HDF5_STD_REF_OBJ_TEST_FILES=" -$SRC_TOOLS_TESTFILES/trefer_attr.h5 -$SRC_TOOLS_TESTFILES/trefer_compat.h5 -$SRC_TOOLS_TESTFILES/trefer_ext1.h5 -$SRC_TOOLS_TESTFILES/trefer_ext2.h5 -$SRC_TOOLS_TESTFILES/trefer_grp.h5 -$SRC_TOOLS_TESTFILES/trefer_obj_del.h5 -$SRC_TOOLS_TESTFILES/trefer_obj.h5 -$SRC_TOOLS_TESTFILES/trefer_param.h5 -$SRC_TOOLS_TESTFILES/trefer_reg_1d.h5 -$SRC_TOOLS_TESTFILES/trefer_reg.h5 +$SRC_H5DUMP_TESTFILES/tvlstr.h5 +$SRC_H5DUMP_TESTFILES/trefer_attr.h5 +$SRC_H5DUMP_TESTFILES/trefer_compat.h5 +$SRC_H5DUMP_TESTFILES/trefer_ext1.h5 +$SRC_H5DUMP_TESTFILES/trefer_ext2.h5 +$SRC_H5DUMP_TESTFILES/trefer_grp.h5 +$SRC_H5DUMP_TESTFILES/trefer_obj_del.h5 +$SRC_H5DUMP_TESTFILES/trefer_obj.h5 +$SRC_H5DUMP_TESTFILES/trefer_param.h5 +$SRC_H5DUMP_TESTFILES/trefer_reg_1d.h5 +$SRC_H5DUMP_TESTFILES/trefer_reg.h5 " LIST_OTHER_TEST_FILES=" -$SRC_H5DIFF_TESTFILES/h5diff_10.txt -$SRC_H5DIFF_TESTFILES/h5diff_100.txt -$SRC_H5DIFF_TESTFILES/h5diff_101.txt -$SRC_H5DIFF_TESTFILES/h5diff_102.txt -$SRC_H5DIFF_TESTFILES/h5diff_103.txt -$SRC_H5DIFF_TESTFILES/h5diff_104.txt -$SRC_H5DIFF_TESTFILES/h5diff_11.txt -$SRC_H5DIFF_TESTFILES/h5diff_12.txt -$SRC_H5DIFF_TESTFILES/h5diff_13.txt -$SRC_H5DIFF_TESTFILES/h5diff_14.txt -$SRC_H5DIFF_TESTFILES/h5diff_15.txt -$SRC_H5DIFF_TESTFILES/h5diff_16_1.txt -$SRC_H5DIFF_TESTFILES/h5diff_16_2.txt -$SRC_H5DIFF_TESTFILES/h5diff_16_3.txt -$SRC_H5DIFF_TESTFILES/h5diff_17.txt -$SRC_H5DIFF_TESTFILES/h5diff_171.txt -$SRC_H5DIFF_TESTFILES/h5diff_172.txt -$SRC_H5DIFF_TESTFILES/h5diff_18_1.txt -$SRC_H5DIFF_TESTFILES/h5diff_18.txt -$SRC_H5DIFF_TESTFILES/h5diff_20.txt -$SRC_H5DIFF_TESTFILES/h5diff_200.txt -$SRC_H5DIFF_TESTFILES/h5diff_201.txt -$SRC_H5DIFF_TESTFILES/h5diff_202.txt -$SRC_H5DIFF_TESTFILES/h5diff_203.txt -$SRC_H5DIFF_TESTFILES/h5diff_204.txt -$SRC_H5DIFF_TESTFILES/h5diff_205.txt -$SRC_H5DIFF_TESTFILES/h5diff_206.txt -$SRC_H5DIFF_TESTFILES/h5diff_207.txt -$SRC_H5DIFF_TESTFILES/h5diff_208.txt -$SRC_H5DIFF_TESTFILES/h5diff_220.txt -$SRC_H5DIFF_TESTFILES/h5diff_221.txt -$SRC_H5DIFF_TESTFILES/h5diff_222.txt -$SRC_H5DIFF_TESTFILES/h5diff_223.txt -$SRC_H5DIFF_TESTFILES/h5diff_224.txt -$SRC_H5DIFF_TESTFILES/h5diff_21.txt -$SRC_H5DIFF_TESTFILES/h5diff_22.txt -$SRC_H5DIFF_TESTFILES/h5diff_23.txt -$SRC_H5DIFF_TESTFILES/h5diff_24.txt -$SRC_H5DIFF_TESTFILES/h5diff_25.txt -$SRC_H5DIFF_TESTFILES/h5diff_26.txt -$SRC_H5DIFF_TESTFILES/h5diff_27.txt -$SRC_H5DIFF_TESTFILES/h5diff_28.txt -$SRC_H5DIFF_TESTFILES/h5diff_30.txt -$SRC_H5DIFF_TESTFILES/h5diff_300.txt -$SRC_H5DIFF_TESTFILES/h5diff_400.txt -$SRC_H5DIFF_TESTFILES/h5diff_401.txt -$SRC_H5DIFF_TESTFILES/h5diff_402.txt -$SRC_H5DIFF_TESTFILES/h5diff_403.txt -$SRC_H5DIFF_TESTFILES/h5diff_404.txt -$SRC_H5DIFF_TESTFILES/h5diff_405.txt -$SRC_H5DIFF_TESTFILES/h5diff_406.txt -$SRC_H5DIFF_TESTFILES/h5diff_407.txt -$SRC_H5DIFF_TESTFILES/h5diff_408.txt -$SRC_H5DIFF_TESTFILES/h5diff_409.txt -$SRC_H5DIFF_TESTFILES/h5diff_410.txt -$SRC_H5DIFF_TESTFILES/h5diff_411.txt -$SRC_H5DIFF_TESTFILES/h5diff_412.txt -$SRC_H5DIFF_TESTFILES/h5diff_413.txt -$SRC_H5DIFF_TESTFILES/h5diff_414.txt -$SRC_H5DIFF_TESTFILES/h5diff_415.txt -$SRC_H5DIFF_TESTFILES/h5diff_416.txt -$SRC_H5DIFF_TESTFILES/h5diff_417.txt -$SRC_H5DIFF_TESTFILES/h5diff_418.txt -$SRC_H5DIFF_TESTFILES/h5diff_419.txt -$SRC_H5DIFF_TESTFILES/h5diff_420.txt -$SRC_H5DIFF_TESTFILES/h5diff_421.txt -$SRC_H5DIFF_TESTFILES/h5diff_422.txt -$SRC_H5DIFF_TESTFILES/h5diff_423.txt -$SRC_H5DIFF_TESTFILES/h5diff_424.txt -$SRC_H5DIFF_TESTFILES/h5diff_425.txt -$SRC_H5DIFF_TESTFILES/h5diff_450.txt -$SRC_H5DIFF_TESTFILES/h5diff_451.txt -$SRC_H5DIFF_TESTFILES/h5diff_452.txt -$SRC_H5DIFF_TESTFILES/h5diff_453.txt -$SRC_H5DIFF_TESTFILES/h5diff_454.txt -$SRC_H5DIFF_TESTFILES/dangling_link.err -$SRC_H5DIFF_TESTFILES/h5diff_455.txt -$SRC_H5DIFF_TESTFILES/h5diff_456.txt -$SRC_H5DIFF_TESTFILES/h5diff_457.txt -$SRC_H5DIFF_TESTFILES/h5diff_458.txt -$SRC_H5DIFF_TESTFILES/h5diff_459.txt -$SRC_H5DIFF_TESTFILES/h5diff_465.txt -$SRC_H5DIFF_TESTFILES/h5diff_466.txt -$SRC_H5DIFF_TESTFILES/h5diff_467.txt -$SRC_H5DIFF_TESTFILES/h5diff_468.txt -$SRC_H5DIFF_TESTFILES/h5diff_469.txt -$SRC_H5DIFF_TESTFILES/h5diff_471.txt -$SRC_H5DIFF_TESTFILES/h5diff_472.txt -$SRC_H5DIFF_TESTFILES/h5diff_473.txt -$SRC_H5DIFF_TESTFILES/h5diff_474.txt -$SRC_H5DIFF_TESTFILES/h5diff_475.txt -$SRC_H5DIFF_TESTFILES/h5diff_480.txt -$SRC_H5DIFF_TESTFILES/h5diff_481.txt -$SRC_H5DIFF_TESTFILES/h5diff_482.txt -$SRC_H5DIFF_TESTFILES/h5diff_483.txt -$SRC_H5DIFF_TESTFILES/h5diff_484.txt -$SRC_H5DIFF_TESTFILES/h5diff_485.txt -$SRC_H5DIFF_TESTFILES/h5diff_486.txt -$SRC_H5DIFF_TESTFILES/h5diff_487.txt -$SRC_H5DIFF_TESTFILES/h5diff_50.txt -$SRC_H5DIFF_TESTFILES/h5diff_51.txt -$SRC_H5DIFF_TESTFILES/h5diff_52.txt -$SRC_H5DIFF_TESTFILES/h5diff_53.txt -$SRC_H5DIFF_TESTFILES/h5diff_54.txt -$SRC_H5DIFF_TESTFILES/h5diff_55.txt -$SRC_H5DIFF_TESTFILES/h5diff_56.txt -$SRC_H5DIFF_TESTFILES/h5diff_57.txt -$SRC_H5DIFF_TESTFILES/h5diff_58.txt -$SRC_H5DIFF_TESTFILES/h5diff_58_ref.txt -$SRC_H5DIFF_TESTFILES/h5diff_59.txt -$SRC_H5DIFF_TESTFILES/h5diff_500.txt -$SRC_H5DIFF_TESTFILES/h5diff_501.txt -$SRC_H5DIFF_TESTFILES/h5diff_502.txt -$SRC_H5DIFF_TESTFILES/h5diff_503.txt -$SRC_H5DIFF_TESTFILES/h5diff_504.txt -$SRC_H5DIFF_TESTFILES/h5diff_505.txt -$SRC_H5DIFF_TESTFILES/h5diff_506.txt -$SRC_H5DIFF_TESTFILES/h5diff_507.txt -$SRC_H5DIFF_TESTFILES/h5diff_508.txt -$SRC_H5DIFF_TESTFILES/h5diff_509.txt -$SRC_H5DIFF_TESTFILES/h5diff_510.txt -$SRC_H5DIFF_TESTFILES/h5diff_511.txt -$SRC_H5DIFF_TESTFILES/h5diff_512.txt -$SRC_H5DIFF_TESTFILES/h5diff_513.txt -$SRC_H5DIFF_TESTFILES/h5diff_514.txt -$SRC_H5DIFF_TESTFILES/h5diff_515.txt -$SRC_H5DIFF_TESTFILES/h5diff_516.txt -$SRC_H5DIFF_TESTFILES/h5diff_517.txt -$SRC_H5DIFF_TESTFILES/h5diff_518.txt -$SRC_H5DIFF_TESTFILES/h5diff_530.txt -$SRC_H5DIFF_TESTFILES/h5diff_540.txt -$SRC_H5DIFF_TESTFILES/h5diff_60.txt -$SRC_H5DIFF_TESTFILES/h5diff_61.txt -$SRC_H5DIFF_TESTFILES/h5diff_62.txt -$SRC_H5DIFF_TESTFILES/h5diff_63.txt -$SRC_H5DIFF_TESTFILES/h5diff_600.txt -$SRC_H5DIFF_TESTFILES/h5diff_601.txt -$SRC_H5DIFF_TESTFILES/h5diff_601_ERR.err -$SRC_H5DIFF_TESTFILES/h5diff_603.txt -$SRC_H5DIFF_TESTFILES/h5diff_604.txt -$SRC_H5DIFF_TESTFILES/h5diff_605.txt -$SRC_H5DIFF_TESTFILES/h5diff_606.txt -$SRC_H5DIFF_TESTFILES/h5diff_607.txt -$SRC_H5DIFF_TESTFILES/h5diff_608.txt -$SRC_H5DIFF_TESTFILES/h5diff_609.txt -$SRC_H5DIFF_TESTFILES/h5diff_610.txt -$SRC_H5DIFF_TESTFILES/h5diff_612.txt -$SRC_H5DIFF_TESTFILES/h5diff_613.txt -$SRC_H5DIFF_TESTFILES/h5diff_614.txt -$SRC_H5DIFF_TESTFILES/h5diff_615.txt -$SRC_H5DIFF_TESTFILES/h5diff_616.txt -$SRC_H5DIFF_TESTFILES/h5diff_617.txt -$SRC_H5DIFF_TESTFILES/h5diff_618.txt -$SRC_H5DIFF_TESTFILES/h5diff_619.txt -$SRC_H5DIFF_TESTFILES/h5diff_621.txt -$SRC_H5DIFF_TESTFILES/h5diff_622.txt -$SRC_H5DIFF_TESTFILES/h5diff_623.txt -$SRC_H5DIFF_TESTFILES/h5diff_624.txt -$SRC_H5DIFF_TESTFILES/h5diff_625.txt -$SRC_H5DIFF_TESTFILES/h5diff_626.txt -$SRC_H5DIFF_TESTFILES/h5diff_627.txt -$SRC_H5DIFF_TESTFILES/h5diff_628.txt -$SRC_H5DIFF_TESTFILES/h5diff_629.txt -$SRC_H5DIFF_TESTFILES/h5diff_630.txt -$SRC_H5DIFF_TESTFILES/h5diff_631.txt -$SRC_H5DIFF_TESTFILES/h5diff_640.txt -$SRC_H5DIFF_TESTFILES/h5diff_641.txt -$SRC_H5DIFF_TESTFILES/h5diff_642.txt -$SRC_H5DIFF_TESTFILES/h5diff_643.txt -$SRC_H5DIFF_TESTFILES/h5diff_644.txt -$SRC_H5DIFF_TESTFILES/h5diff_645.txt -$SRC_H5DIFF_TESTFILES/h5diff_646.txt -$SRC_H5DIFF_TESTFILES/h5diff_70.txt -$SRC_H5DIFF_TESTFILES/h5diff_700.txt -$SRC_H5DIFF_TESTFILES/h5diff_701.txt -$SRC_H5DIFF_TESTFILES/h5diff_702.txt -$SRC_H5DIFF_TESTFILES/h5diff_703.txt -$SRC_H5DIFF_TESTFILES/h5diff_704.txt -$SRC_H5DIFF_TESTFILES/h5diff_705.txt -$SRC_H5DIFF_TESTFILES/h5diff_706.txt -$SRC_H5DIFF_TESTFILES/h5diff_707.txt -$SRC_H5DIFF_TESTFILES/h5diff_708.txt -$SRC_H5DIFF_TESTFILES/h5diff_709.txt -$SRC_H5DIFF_TESTFILES/h5diff_710.txt -$SRC_H5DIFF_TESTFILES/h5diff_80.txt -$SRC_H5DIFF_TESTFILES/h5diff_800.txt -$SRC_H5DIFF_TESTFILES/h5diff_801.txt -$SRC_H5DIFF_TESTFILES/h5diff_830.txt -$SRC_H5DIFF_TESTFILES/h5diff_90.txt -$SRC_H5DIFF_TESTFILES/h5diff_900.txt -$SRC_H5DIFF_TESTFILES/h5diff_901.txt -$SRC_H5DIFF_TESTFILES/h5diff_902.txt -$SRC_H5DIFF_TESTFILES/h5diff_8625.txt -$SRC_H5DIFF_TESTFILES/h5diff_8639.txt -$SRC_H5DIFF_TESTFILES/h5diff_reg.txt -$SRC_H5DIFF_TESTFILES/h5diff_v1.txt -$SRC_H5DIFF_TESTFILES/h5diff_v2.txt -$SRC_H5DIFF_TESTFILES/h5diff_v3.txt -$SRC_H5DIFF_TESTFILES/h5diff_vlstr.txt -$SRC_H5DIFF_TESTFILES/h5diff_eps.txt +$SRC_H5DIFF_OUTFILES/h5diff_10.txt +$SRC_H5DIFF_OUTFILES/h5diff_100.txt +$SRC_H5DIFF_OUTFILES/h5diff_101.txt +$SRC_H5DIFF_OUTFILES/h5diff_102.txt +$SRC_H5DIFF_OUTFILES/h5diff_103.txt +$SRC_H5DIFF_OUTFILES/h5diff_104.txt +$SRC_H5DIFF_OUTFILES/h5diff_11.txt +$SRC_H5DIFF_OUTFILES/h5diff_12.txt +$SRC_H5DIFF_OUTFILES/h5diff_13.txt +$SRC_H5DIFF_OUTFILES/h5diff_14.txt +$SRC_H5DIFF_OUTFILES/h5diff_15.txt +$SRC_H5DIFF_OUTFILES/h5diff_16_1.txt +$SRC_H5DIFF_OUTFILES/h5diff_16_2.txt +$SRC_H5DIFF_OUTFILES/h5diff_16_3.txt +$SRC_H5DIFF_OUTFILES/h5diff_17.txt +$SRC_H5DIFF_OUTFILES/h5diff_171.txt +$SRC_H5DIFF_OUTFILES/h5diff_172.txt +$SRC_H5DIFF_OUTFILES/h5diff_18_1.txt +$SRC_H5DIFF_OUTFILES/h5diff_18.txt +$SRC_H5DIFF_OUTFILES/h5diff_20.txt +$SRC_H5DIFF_OUTFILES/h5diff_200.txt +$SRC_H5DIFF_OUTFILES/h5diff_201.txt +$SRC_H5DIFF_OUTFILES/h5diff_202.txt +$SRC_H5DIFF_OUTFILES/h5diff_203.txt +$SRC_H5DIFF_OUTFILES/h5diff_204.txt +$SRC_H5DIFF_OUTFILES/h5diff_205.txt +$SRC_H5DIFF_OUTFILES/h5diff_206.txt +$SRC_H5DIFF_OUTFILES/h5diff_207.txt +$SRC_H5DIFF_OUTFILES/h5diff_208.txt +$SRC_H5DIFF_OUTFILES/h5diff_220.txt +$SRC_H5DIFF_OUTFILES/h5diff_221.txt +$SRC_H5DIFF_OUTFILES/h5diff_222.txt +$SRC_H5DIFF_OUTFILES/h5diff_223.txt +$SRC_H5DIFF_OUTFILES/h5diff_224.txt +$SRC_H5DIFF_OUTFILES/h5diff_21.txt +$SRC_H5DIFF_OUTFILES/h5diff_22.txt +$SRC_H5DIFF_OUTFILES/h5diff_23.txt +$SRC_H5DIFF_OUTFILES/h5diff_24.txt +$SRC_H5DIFF_OUTFILES/h5diff_25.txt +$SRC_H5DIFF_OUTFILES/h5diff_26.txt +$SRC_H5DIFF_OUTFILES/h5diff_27.txt +$SRC_H5DIFF_OUTFILES/h5diff_28.txt +$SRC_H5DIFF_OUTFILES/h5diff_30.txt +$SRC_H5DIFF_OUTFILES/h5diff_300.txt +$SRC_H5DIFF_OUTFILES/h5diff_400.txt +$SRC_H5DIFF_OUTFILES/h5diff_401.txt +$SRC_H5DIFF_OUTFILES/h5diff_402.txt +$SRC_H5DIFF_OUTFILES/h5diff_403.txt +$SRC_H5DIFF_OUTFILES/h5diff_404.txt +$SRC_H5DIFF_OUTFILES/h5diff_405.txt +$SRC_H5DIFF_OUTFILES/h5diff_406.txt +$SRC_H5DIFF_OUTFILES/h5diff_407.txt +$SRC_H5DIFF_OUTFILES/h5diff_408.txt +$SRC_H5DIFF_OUTFILES/h5diff_409.txt +$SRC_H5DIFF_OUTFILES/h5diff_410.txt +$SRC_H5DIFF_OUTFILES/h5diff_411.txt +$SRC_H5DIFF_OUTFILES/h5diff_412.txt +$SRC_H5DIFF_OUTFILES/h5diff_413.txt +$SRC_H5DIFF_OUTFILES/h5diff_414.txt +$SRC_H5DIFF_OUTFILES/h5diff_415.txt +$SRC_H5DIFF_OUTFILES/h5diff_416.txt +$SRC_H5DIFF_OUTFILES/h5diff_417.txt +$SRC_H5DIFF_OUTFILES/h5diff_418.txt +$SRC_H5DIFF_OUTFILES/h5diff_419.txt +$SRC_H5DIFF_OUTFILES/h5diff_420.txt +$SRC_H5DIFF_OUTFILES/h5diff_421.txt +$SRC_H5DIFF_OUTFILES/h5diff_422.txt +$SRC_H5DIFF_OUTFILES/h5diff_423.txt +$SRC_H5DIFF_OUTFILES/h5diff_424.txt +$SRC_H5DIFF_OUTFILES/h5diff_425.txt +$SRC_H5DIFF_OUTFILES/h5diff_450.txt +$SRC_H5DIFF_OUTFILES/h5diff_451.txt +$SRC_H5DIFF_OUTFILES/h5diff_452.txt +$SRC_H5DIFF_OUTFILES/h5diff_453.txt +$SRC_H5DIFF_OUTFILES/h5diff_454.txt +$SRC_H5DIFF_OUTFILES/dangling_link.err +$SRC_H5DIFF_OUTFILES/h5diff_455.txt +$SRC_H5DIFF_OUTFILES/h5diff_456.txt +$SRC_H5DIFF_OUTFILES/h5diff_457.txt +$SRC_H5DIFF_OUTFILES/h5diff_458.txt +$SRC_H5DIFF_OUTFILES/h5diff_459.txt +$SRC_H5DIFF_OUTFILES/h5diff_465.txt +$SRC_H5DIFF_OUTFILES/h5diff_466.txt +$SRC_H5DIFF_OUTFILES/h5diff_467.txt +$SRC_H5DIFF_OUTFILES/h5diff_468.txt +$SRC_H5DIFF_OUTFILES/h5diff_469.txt +$SRC_H5DIFF_OUTFILES/h5diff_471.txt +$SRC_H5DIFF_OUTFILES/h5diff_472.txt +$SRC_H5DIFF_OUTFILES/h5diff_473.txt +$SRC_H5DIFF_OUTFILES/h5diff_474.txt +$SRC_H5DIFF_OUTFILES/h5diff_475.txt +$SRC_H5DIFF_OUTFILES/h5diff_480.txt +$SRC_H5DIFF_OUTFILES/h5diff_481.txt +$SRC_H5DIFF_OUTFILES/h5diff_482.txt +$SRC_H5DIFF_OUTFILES/h5diff_483.txt +$SRC_H5DIFF_OUTFILES/h5diff_484.txt +$SRC_H5DIFF_OUTFILES/h5diff_485.txt +$SRC_H5DIFF_OUTFILES/h5diff_486.txt +$SRC_H5DIFF_OUTFILES/h5diff_487.txt +$SRC_H5DIFF_OUTFILES/h5diff_50.txt +$SRC_H5DIFF_OUTFILES/h5diff_51.txt +$SRC_H5DIFF_OUTFILES/h5diff_52.txt +$SRC_H5DIFF_OUTFILES/h5diff_53.txt +$SRC_H5DIFF_OUTFILES/h5diff_54.txt +$SRC_H5DIFF_OUTFILES/h5diff_55.txt +$SRC_H5DIFF_OUTFILES/h5diff_56.txt +$SRC_H5DIFF_OUTFILES/h5diff_57.txt +$SRC_H5DIFF_OUTFILES/h5diff_58.txt +$SRC_H5DIFF_OUTFILES/h5diff_58_ref.txt +$SRC_H5DIFF_OUTFILES/h5diff_59.txt +$SRC_H5DIFF_OUTFILES/h5diff_500.txt +$SRC_H5DIFF_OUTFILES/h5diff_501.txt +$SRC_H5DIFF_OUTFILES/h5diff_502.txt +$SRC_H5DIFF_OUTFILES/h5diff_503.txt +$SRC_H5DIFF_OUTFILES/h5diff_504.txt +$SRC_H5DIFF_OUTFILES/h5diff_505.txt +$SRC_H5DIFF_OUTFILES/h5diff_506.txt +$SRC_H5DIFF_OUTFILES/h5diff_507.txt +$SRC_H5DIFF_OUTFILES/h5diff_508.txt +$SRC_H5DIFF_OUTFILES/h5diff_509.txt +$SRC_H5DIFF_OUTFILES/h5diff_510.txt +$SRC_H5DIFF_OUTFILES/h5diff_511.txt +$SRC_H5DIFF_OUTFILES/h5diff_512.txt +$SRC_H5DIFF_OUTFILES/h5diff_513.txt +$SRC_H5DIFF_OUTFILES/h5diff_514.txt +$SRC_H5DIFF_OUTFILES/h5diff_515.txt +$SRC_H5DIFF_OUTFILES/h5diff_516.txt +$SRC_H5DIFF_OUTFILES/h5diff_517.txt +$SRC_H5DIFF_OUTFILES/h5diff_518.txt +$SRC_H5DIFF_OUTFILES/h5diff_530.txt +$SRC_H5DIFF_OUTFILES/h5diff_540.txt +$SRC_H5DIFF_OUTFILES/h5diff_60.txt +$SRC_H5DIFF_OUTFILES/h5diff_61.txt +$SRC_H5DIFF_OUTFILES/h5diff_62.txt +$SRC_H5DIFF_OUTFILES/h5diff_63.txt +$SRC_H5DIFF_OUTFILES/h5diff_600.txt +$SRC_H5DIFF_OUTFILES/h5diff_601.txt +$SRC_H5DIFF_OUTFILES/h5diff_601_ERR.err +$SRC_H5DIFF_OUTFILES/h5diff_603.txt +$SRC_H5DIFF_OUTFILES/h5diff_604.txt +$SRC_H5DIFF_OUTFILES/h5diff_605.txt +$SRC_H5DIFF_OUTFILES/h5diff_606.txt +$SRC_H5DIFF_OUTFILES/h5diff_607.txt +$SRC_H5DIFF_OUTFILES/h5diff_608.txt +$SRC_H5DIFF_OUTFILES/h5diff_609.txt +$SRC_H5DIFF_OUTFILES/h5diff_610.txt +$SRC_H5DIFF_OUTFILES/h5diff_612.txt +$SRC_H5DIFF_OUTFILES/h5diff_613.txt +$SRC_H5DIFF_OUTFILES/h5diff_614.txt +$SRC_H5DIFF_OUTFILES/h5diff_615.txt +$SRC_H5DIFF_OUTFILES/h5diff_616.txt +$SRC_H5DIFF_OUTFILES/h5diff_617.txt +$SRC_H5DIFF_OUTFILES/h5diff_618.txt +$SRC_H5DIFF_OUTFILES/h5diff_619.txt +$SRC_H5DIFF_OUTFILES/h5diff_621.txt +$SRC_H5DIFF_OUTFILES/h5diff_622.txt +$SRC_H5DIFF_OUTFILES/h5diff_623.txt +$SRC_H5DIFF_OUTFILES/h5diff_624.txt +$SRC_H5DIFF_OUTFILES/h5diff_625.txt +$SRC_H5DIFF_OUTFILES/h5diff_626.txt +$SRC_H5DIFF_OUTFILES/h5diff_627.txt +$SRC_H5DIFF_OUTFILES/h5diff_628.txt +$SRC_H5DIFF_OUTFILES/h5diff_629.txt +$SRC_H5DIFF_OUTFILES/h5diff_630.txt +$SRC_H5DIFF_OUTFILES/h5diff_631.txt +$SRC_H5DIFF_OUTFILES/h5diff_640.txt +$SRC_H5DIFF_OUTFILES/h5diff_641.txt +$SRC_H5DIFF_OUTFILES/h5diff_642.txt +$SRC_H5DIFF_OUTFILES/h5diff_643.txt +$SRC_H5DIFF_OUTFILES/h5diff_644.txt +$SRC_H5DIFF_OUTFILES/h5diff_645.txt +$SRC_H5DIFF_OUTFILES/h5diff_646.txt +$SRC_H5DIFF_OUTFILES/h5diff_70.txt +$SRC_H5DIFF_OUTFILES/h5diff_700.txt +$SRC_H5DIFF_OUTFILES/h5diff_701.txt +$SRC_H5DIFF_OUTFILES/h5diff_702.txt +$SRC_H5DIFF_OUTFILES/h5diff_703.txt +$SRC_H5DIFF_OUTFILES/h5diff_704.txt +$SRC_H5DIFF_OUTFILES/h5diff_705.txt +$SRC_H5DIFF_OUTFILES/h5diff_706.txt +$SRC_H5DIFF_OUTFILES/h5diff_707.txt +$SRC_H5DIFF_OUTFILES/h5diff_708.txt +$SRC_H5DIFF_OUTFILES/h5diff_709.txt +$SRC_H5DIFF_OUTFILES/h5diff_710.txt +$SRC_H5DIFF_OUTFILES/h5diff_80.txt +$SRC_H5DIFF_OUTFILES/h5diff_800.txt +$SRC_H5DIFF_OUTFILES/h5diff_801.txt +$SRC_H5DIFF_OUTFILES/h5diff_830.txt +$SRC_H5DIFF_OUTFILES/h5diff_90.txt +$SRC_H5DIFF_OUTFILES/h5diff_900.txt +$SRC_H5DIFF_OUTFILES/h5diff_901.txt +$SRC_H5DIFF_OUTFILES/h5diff_902.txt +$SRC_H5DIFF_OUTFILES/h5diff_8625.txt +$SRC_H5DIFF_OUTFILES/h5diff_8639.txt +$SRC_H5DIFF_OUTFILES/h5diff_reg.txt +$SRC_H5DIFF_OUTFILES/h5diff_v1.txt +$SRC_H5DIFF_OUTFILES/h5diff_v2.txt +$SRC_H5DIFF_OUTFILES/h5diff_v3.txt +$SRC_H5DIFF_OUTFILES/h5diff_vlstr.txt +$SRC_H5DIFF_OUTFILES/h5diff_eps.txt " # @@ -588,7 +588,7 @@ SKIP() { # prepare for test COPY_TESTFILES_TO_TESTDIR # second copy of tvlstr.h5 -$CP -f $SRC_TOOLS_TESTFILES/tvlstr.h5 $TESTDIR/tvlstr2.h5 +$CP -f $SRC_H5DUMP_TESTFILES/tvlstr.h5 $TESTDIR/tvlstr2.h5 # ############################################################################ # # Common usage diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake index c328ef129e2..7ed021fce1c 100644 --- a/tools/test/h5dump/CMakeTests.cmake +++ b/tools/test/h5dump/CMakeTests.cmake @@ -20,210 +20,210 @@ # Copy all the HDF5 files from the test directory into the source directory # -------------------------------------------------------------------- set (HDF5_REFERENCE_FILES - ${HDF5_TOOLS_DIR}/testfiles/charsets.ddl - ${HDF5_TOOLS_DIR}/testfiles/err_attr_dspace.ddl - ${HDF5_TOOLS_DIR}/testfiles/file_space.ddl - ${HDF5_TOOLS_DIR}/testfiles/filter_fail.ddl - ${HDF5_TOOLS_DIR}/testfiles/non_existing.ddl - ${HDF5_TOOLS_DIR}/testfiles/packedbits.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-2A.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-2A0.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-2B.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-3.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-4s.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-5s.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-6.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-7.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-7N.ddl - ${HDF5_TOOLS_DIR}/testfiles/tallfilters.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray1_big.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray3.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray4.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray5.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray6.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray7.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray8.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattr-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattr-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattr-3.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattr-4_be.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattrcontents1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattrcontents2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattrintsize.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattrreg.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattrregR.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbin2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbin3.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbin4.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbinregR.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbigdims.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque_be.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque_le.ddl - ${HDF5_TOOLS_DIR}/testfiles/tboot1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tboot2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tboot2A.ddl - ${HDF5_TOOLS_DIR}/testfiles/tboot2B.ddl - ${HDF5_TOOLS_DIR}/testfiles/tchar1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tchunked.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcmpdattrintsize.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcmpdintarray.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcmpdints.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcmpdintsize.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcomp-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcomp-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcomp-3.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcomp-4.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcompact.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcontents.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcontiguos.ddl - ${HDF5_TOOLS_DIR}/testfiles/tdatareg.ddl - ${HDF5_TOOLS_DIR}/testfiles/tdataregR.ddl - ${HDF5_TOOLS_DIR}/testfiles/tdeflate.ddl - ${HDF5_TOOLS_DIR}/testfiles/tdset-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tdset-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tdset-3s.ddl - ${HDF5_TOOLS_DIR}/testfiles/tempty.ddl - ${HDF5_TOOLS_DIR}/testfiles/texceedsubstart.ddl - ${HDF5_TOOLS_DIR}/testfiles/texceedsubcount.ddl - ${HDF5_TOOLS_DIR}/testfiles/texceedsubstride.ddl - ${HDF5_TOOLS_DIR}/testfiles/texceedsubblock.ddl - ${HDF5_TOOLS_DIR}/testfiles/texternal.ddl - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.ddl - ${HDF5_TOOLS_DIR}/testfiles/textlinkfar.ddl - ${HDF5_TOOLS_DIR}/testfiles/textlink.ddl - ${HDF5_TOOLS_DIR}/testfiles/tfamily.ddl - ${HDF5_TOOLS_DIR}/testfiles/tfill.ddl - ${HDF5_TOOLS_DIR}/testfiles/tfletcher32.ddl - #${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.ddl #native - #${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.wddl #special for windows - ${HDF5_TOOLS_DIR}/testfiles/tfpformat.ddl - ${HDF5_TOOLS_DIR}/testfiles/tgroup-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tgroup-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.ddl - ${HDF5_TOOLS_DIR}/testfiles/tgrpnullspace.ddl - ${HDF5_TOOLS_DIR}/testfiles/thlink-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/thlink-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/thlink-3.ddl - ${HDF5_TOOLS_DIR}/testfiles/thlink-4.ddl - ${HDF5_TOOLS_DIR}/testfiles/thlink-5.ddl - ${HDF5_TOOLS_DIR}/testfiles/thyperslab.ddl - ${HDF5_TOOLS_DIR}/testfiles/tindicesno.ddl - ${HDF5_TOOLS_DIR}/testfiles/tindicessub1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tindicessub2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tindicessub3.ddl - ${HDF5_TOOLS_DIR}/testfiles/tindicessub4.ddl - ${HDF5_TOOLS_DIR}/testfiles/tindicesyes.ddl - ${HDF5_TOOLS_DIR}/testfiles/tints4dims.ddl - ${HDF5_TOOLS_DIR}/testfiles/tints4dimsBlock2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tints4dimsBlockEq.ddl - ${HDF5_TOOLS_DIR}/testfiles/tints4dimsCount2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tints4dimsCountEq.ddl - ${HDF5_TOOLS_DIR}/testfiles/tints4dimsStride2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tintsattrs.ddl - ${HDF5_TOOLS_DIR}/testfiles/tintsnodata.ddl - ${HDF5_TOOLS_DIR}/testfiles/tlarge_objname.ddl - ${HDF5_TOOLS_DIR}/testfiles/tldouble.ddl - ${HDF5_TOOLS_DIR}/testfiles/tldouble_scalar.ddl - ${HDF5_TOOLS_DIR}/testfiles/tlonglinks.ddl - ${HDF5_TOOLS_DIR}/testfiles/tloop-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tmulti.ddl - ${HDF5_TOOLS_DIR}/testfiles/tmultifile.ddl - #${HDF5_TOOLS_DIR}/testfiles/tqmarkfile.ddl - #${HDF5_TOOLS_DIR}/testfiles/tstarfile.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnestedcmpddt.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnbit.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnoattrdata.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnoattrddl.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnodata.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnoddl.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnoddlfile.ddl - ${HDF5_TOOLS_DIR}/testfiles/tno-subset.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnullspace.ddl - ${HDF5_TOOLS_DIR}/testfiles/tordergr1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tordergr2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tordergr3.ddl - ${HDF5_TOOLS_DIR}/testfiles/tordergr4.ddl - ${HDF5_TOOLS_DIR}/testfiles/tordergr5.ddl - ${HDF5_TOOLS_DIR}/testfiles/torderattr1.ddl - ${HDF5_TOOLS_DIR}/testfiles/torderattr2.ddl - ${HDF5_TOOLS_DIR}/testfiles/torderattr3.ddl - ${HDF5_TOOLS_DIR}/testfiles/torderattr4.ddl - ${HDF5_TOOLS_DIR}/testfiles/tordercontents1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tordercontents2.ddl - ${HDF5_TOOLS_DIR}/testfiles/torderlinks1.ddl - ${HDF5_TOOLS_DIR}/testfiles/torderlinks2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tperror.ddl - ${HDF5_TOOLS_DIR}/testfiles/trawdatafile.ddl - ${HDF5_TOOLS_DIR}/testfiles/trawssetfile.ddl - ${HDF5_TOOLS_DIR}/testfiles/treadfilter.ddl - ${HDF5_TOOLS_DIR}/testfiles/treadintfilter.ddl - ${HDF5_TOOLS_DIR}/testfiles/treference.ddl - ${HDF5_TOOLS_DIR}/testfiles/tsaf.ddl - ${HDF5_TOOLS_DIR}/testfiles/tscalarattrintsize.ddl - ${HDF5_TOOLS_DIR}/testfiles/tscalarintattrsize.ddl - ${HDF5_TOOLS_DIR}/testfiles/tscalarintsize.ddl - ${HDF5_TOOLS_DIR}/testfiles/tscalarstring.ddl - ${HDF5_TOOLS_DIR}/testfiles/tscaleoffset.ddl - ${HDF5_TOOLS_DIR}/testfiles/tshuffle.ddl - ${HDF5_TOOLS_DIR}/testfiles/tslink-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tslink-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tslink-D.ddl - ${HDF5_TOOLS_DIR}/testfiles/tsplit_file.ddl - ${HDF5_TOOLS_DIR}/testfiles/tstr-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tstr-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tstring.ddl - ${HDF5_TOOLS_DIR}/testfiles/tstring2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tstringe.ddl - ${HDF5_TOOLS_DIR}/testfiles/tszip.ddl - ${HDF5_TOOLS_DIR}/testfiles/tudfilter.ddl - ${HDF5_TOOLS_DIR}/testfiles/tudlink-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tudlink-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tuserfilter.ddl - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.ddl - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.ddl - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.ddl - ${HDF5_TOOLS_DIR}/testfiles/tvlenstr_array.ddl - ${HDF5_TOOLS_DIR}/testfiles/tvlstr.ddl - ${HDF5_TOOLS_DIR}/testfiles/tvms.ddl - ${HDF5_TOOLS_DIR}/testfiles/twidedisplay.ddl - ${HDF5_TOOLS_DIR}/testfiles/twithddlfile.ddl - ${HDF5_TOOLS_DIR}/testfiles/h5dump-help.txt - ${HDF5_TOOLS_DIR}/testfiles/out3.h5import - ${HDF5_TOOLS_DIR}/testfiles/zerodim.ddl + charsets.ddl + err_attr_dspace.ddl + file_space.ddl + filter_fail.ddl + non_existing.ddl + packedbits.ddl + tall-1.ddl + tall-2.ddl + tall-2A.ddl + tall-2A0.ddl + tall-2B.ddl + tall-3.ddl + tall-4s.ddl + tall-5s.ddl + tall-6.ddl + tall-7.ddl + tall-7N.ddl + tallfilters.ddl + tarray1.ddl + tarray1_big.ddl + tarray2.ddl + tarray3.ddl + tarray4.ddl + tarray5.ddl + tarray6.ddl + tarray7.ddl + tarray8.ddl + tattr-1.ddl + tattr-2.ddl + tattr-3.ddl + tattr-4_be.ddl + tattrcontents1.ddl + tattrcontents2.ddl + tattrintsize.ddl + tattrreg.ddl + tattrregR.ddl + tbin1.ddl + tbin1.ddl + tbin2.ddl + tbin3.ddl + tbin4.ddl + tbinregR.ddl + tbigdims.ddl + tbitnopaque_be.ddl + tbitnopaque_le.ddl + tboot1.ddl + tboot2.ddl + tboot2A.ddl + tboot2B.ddl + tchar1.ddl + tchunked.ddl + tcmpdattrintsize.ddl + tcmpdintarray.ddl + tcmpdints.ddl + tcmpdintsize.ddl + tcompound_complex2.ddl + tcomp-1.ddl + tcomp-2.ddl + tcomp-3.ddl + tcomp-4.ddl + tcompact.ddl + tcontents.ddl + tcontiguos.ddl + tdatareg.ddl + tdataregR.ddl + tdeflate.ddl + tdset-1.ddl + tdset-2.ddl + tdset-3s.ddl + tempty.ddl + texceedsubstart.ddl + texceedsubcount.ddl + texceedsubstride.ddl + texceedsubblock.ddl + texternal.ddl + textlinksrc.ddl + textlinkfar.ddl + textlink.ddl + tfamily.ddl + tfill.ddl + tfletcher32.ddl + #tfloatsattrs.ddl #native + #tfloatsattrs.wddl #special for windows + tfpformat.ddl + tgroup-1.ddl + tgroup-2.ddl + tgrp_comments.ddl + tgrpnullspace.ddl + thlink-1.ddl + thlink-2.ddl + thlink-3.ddl + thlink-4.ddl + thlink-5.ddl + thyperslab.ddl + tindicesno.ddl + tindicessub1.ddl + tindicessub2.ddl + tindicessub3.ddl + tindicessub4.ddl + tindicesyes.ddl + tints4dims.ddl + tints4dimsBlock2.ddl + tints4dimsBlockEq.ddl + tints4dimsCount2.ddl + tints4dimsCountEq.ddl + tints4dimsStride2.ddl + tintsattrs.ddl + tintsnodata.ddl + tlarge_objname.ddl + tldouble.ddl + tldouble_scalar.ddl + tlonglinks.ddl + tloop-1.ddl + tmulti.ddl + tmultifile.ddl + #tqmarkfile.ddl + #tstarfile.ddl + tnamed_dtype_attr.ddl + tnestcomp-1.ddl + tnestedcmpddt.ddl + tnbit.ddl + tnoattrdata.ddl + tnoattrddl.ddl + tnodata.ddl + tnoddl.ddl + tnoddlfile.ddl + tno-subset.ddl + tnullspace.ddl + tordergr1.ddl + tordergr2.ddl + tordergr3.ddl + tordergr4.ddl + tordergr5.ddl + torderattr1.ddl + torderattr2.ddl + torderattr3.ddl + torderattr4.ddl + tordercontents1.ddl + tordercontents2.ddl + torderlinks1.ddl + torderlinks2.ddl + tperror.ddl + trawdatafile.ddl + trawssetfile.ddl + treadfilter.ddl + treadintfilter.ddl + treference.ddl + tsaf.ddl + tscalarattrintsize.ddl + tscalarintattrsize.ddl + tscalarintsize.ddl + tscalarstring.ddl + tscaleoffset.ddl + tshuffle.ddl + tslink-1.ddl + tslink-2.ddl + tslink-D.ddl + tsplit_file.ddl + tstr-1.ddl + tstr-2.ddl + tstring.ddl + tstring2.ddl + tstringe.ddl + tszip.ddl + tudfilter.ddl + tudlink-1.ddl + tudlink-2.ddl + tuserfilter.ddl + tvldtypes1.ddl + tvldtypes2.ddl + tvldtypes3.ddl + tvldtypes4.ddl + tvldtypes5.ddl + tvlenstr_array.ddl + tvlstr.ddl + tvms.ddl + twidedisplay.ddl + twithddlfile.ddl + h5dump-help.txt + out3.h5import + zerodim.ddl #STD_REF_OBJ files - ${HDF5_TOOLS_DIR}/testfiles/trefer_attrR.ddl - ${HDF5_TOOLS_DIR}/testfiles/trefer_compatR.ddl - ${HDF5_TOOLS_DIR}/testfiles/trefer_extR.ddl - ${HDF5_TOOLS_DIR}/testfiles/trefer_grpR.ddl - ${HDF5_TOOLS_DIR}/testfiles/trefer_obj_delR.ddl - ${HDF5_TOOLS_DIR}/testfiles/trefer_objR.ddl - ${HDF5_TOOLS_DIR}/testfiles/trefer_paramR.ddl - ${HDF5_TOOLS_DIR}/testfiles/trefer_reg_1dR.ddl - ${HDF5_TOOLS_DIR}/testfiles/trefer_regR.ddl + trefer_attrR.ddl + trefer_compatR.ddl + trefer_extR.ddl + trefer_grpR.ddl + trefer_obj_delR.ddl + trefer_objR.ddl + trefer_paramR.ddl + trefer_reg_1dR.ddl + trefer_regR.ddl # Onion VFD files - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.ddl - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.ddl - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.ddl - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_revision_count.ddl + tst_onion_objs.ddl + tst_onion_dset_ext.ddl + tst_onion_dset_1d.ddl + tst_onion_revision_count.ddl ) set (HDF5_N_REFERENCE_FILES - tall-3 - tattr-2 - tcomp-2 - thlink-4 - thlink-5 - tslink-2 + tall-3.ddl + tattr-2.ddl + tcomp-2.ddl + thlink-4.ddl + thlink-5.ddl + tslink-2.ddl ) set (HDF5_REFERENCE_EXP_FILES tall-6.exp @@ -236,159 +236,159 @@ twithddlfile.exp ) set (HDF5_REFERENCE_TEST_FILES - ${HDF5_TOOLS_DIR}/testfiles/charsets.h5 - ${HDF5_TOOLS_DIR}/testfiles/err_attr_dspace.h5 - ${HDF5_TOOLS_DIR}/testfiles/file_space.h5 - ${HDF5_TOOLS_DIR}/testfiles/filter_fail.h5 - ${HDF5_TOOLS_DIR}/testfiles/packedbits.h5 - ${HDF5_TOOLS_DIR}/testfiles/taindices.h5 - ${HDF5_TOOLS_DIR}/testfiles/tall.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray1_big.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray4.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray5.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray8.h5 - ${HDF5_TOOLS_DIR}/testfiles/tattr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tattr2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tattr4_be.h5 - ${HDF5_TOOLS_DIR}/testfiles/tattrintsize.h5 - ${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5 - ${HDF5_TOOLS_DIR}/testfiles/tbigdims.h5 - ${HDF5_TOOLS_DIR}/testfiles/tbinary.h5 - ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque.h5 - ${HDF5_TOOLS_DIR}/testfiles/tchar.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcmpdattrintsize.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcmpdintarray.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcmpdints.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcmpdintsize.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdset.h5 - ${HDF5_TOOLS_DIR}/testfiles/tempty.h5 - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlinkfar.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlinktar.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00000.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00001.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00002.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00003.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00004.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00005.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00006.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00007.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00008.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00009.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00010.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfcontents1.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfcontents2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfilters.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfvalues.h5 - ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5 - ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.h5 - ${HDF5_TOOLS_DIR}/testfiles/tgrpnullspace.h5 - ${HDF5_TOOLS_DIR}/testfiles/thlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/thyperslab.h5 - ${HDF5_TOOLS_DIR}/testfiles/tints4dims.h5 - ${HDF5_TOOLS_DIR}/testfiles/tintsattrs.h5 - ${HDF5_TOOLS_DIR}/testfiles/tintsnodata.h5 - ${HDF5_TOOLS_DIR}/testfiles/tlarge_objname.h5 - ${HDF5_TOOLS_DIR}/testfiles/tldouble.h5 - ${HDF5_TOOLS_DIR}/testfiles/tldouble_scalar.h5 - ${HDF5_TOOLS_DIR}/testfiles/tlonglinks.h5 - ${HDF5_TOOLS_DIR}/testfiles/tloop.h5 - ${HDF5_TOOLS_DIR}/testfiles/tmulti-b.h5 - ${HDF5_TOOLS_DIR}/testfiles/tmulti-g.h5 - ${HDF5_TOOLS_DIR}/testfiles/tmulti-l.h5 - ${HDF5_TOOLS_DIR}/testfiles/tmulti-o.h5 - ${HDF5_TOOLS_DIR}/testfiles/tmulti-r.h5 - ${HDF5_TOOLS_DIR}/testfiles/tmulti-s.h5 - ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5 - ${HDF5_TOOLS_DIR}/testfiles/tnestedcmpddt.h5 - ${HDF5_TOOLS_DIR}/testfiles/tno-subset.h5 - ${HDF5_TOOLS_DIR}/testfiles/tnullspace.h5 - ${HDF5_TOOLS_DIR}/testfiles/torderattr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tordergr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5 - ${HDF5_TOOLS_DIR}/testfiles/tscalarattrintsize.h5 - ${HDF5_TOOLS_DIR}/testfiles/tscalarintattrsize.h5 - ${HDF5_TOOLS_DIR}/testfiles/tscalarintsize.h5 - ${HDF5_TOOLS_DIR}/testfiles/tscalarstring.h5 - ${HDF5_TOOLS_DIR}/testfiles/tslink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tsplit_file-m.h5 - ${HDF5_TOOLS_DIR}/testfiles/tsplit_file-r.h5 - ${HDF5_TOOLS_DIR}/testfiles/tstr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tstr3.h5 - ${HDF5_TOOLS_DIR}/testfiles/tudfilter.h5 - ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvlenstr_array.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvms.h5 - ${HDF5_TOOLS_DIR}/testfiles/t128bit_float.h5 - ${HDF5_TOOLS_DIR}/testfiles/tCVE_2018_11206_fill_old.h5 - ${HDF5_TOOLS_DIR}/testfiles/tCVE_2018_11206_fill_new.h5 - ${HDF5_TOOLS_DIR}/testfiles/zerodim.h5 - ${HDF5_TOOLS_DIR}/testfiles/tCVE-2021-37501_attr_decode.h5 + charsets.h5 + err_attr_dspace.h5 + file_space.h5 + filter_fail.h5 + packedbits.h5 + taindices.h5 + tall.h5 + tarray1.h5 + tarray1_big.h5 + tarray2.h5 + tarray3.h5 + tarray4.h5 + tarray5.h5 + tarray6.h5 + tarray7.h5 + tarray8.h5 + tattr.h5 + tattr2.h5 + tattr4_be.h5 + tattrintsize.h5 + tattrreg.h5 + tbigdims.h5 + tbinary.h5 + tbitnopaque.h5 + tchar.h5 + tcmpdattrintsize.h5 + tcmpdintarray.h5 + tcmpdints.h5 + tcmpdintsize.h5 + tcompound.h5 + tcompound_complex.h5 + tcompound_complex2.h5 + tdatareg.h5 + tdset.h5 + tempty.h5 + tsoftlinks.h5 + textlinkfar.h5 + textlinksrc.h5 + textlinktar.h5 + textlink.h5 + tfamily00000.h5 + tfamily00001.h5 + tfamily00002.h5 + tfamily00003.h5 + tfamily00004.h5 + tfamily00005.h5 + tfamily00006.h5 + tfamily00007.h5 + tfamily00008.h5 + tfamily00009.h5 + tfamily00010.h5 + tfcontents1.h5 + tfcontents2.h5 + tfilters.h5 + tfloatsattrs.h5 + tfpformat.h5 + tfvalues.h5 + tgroup.h5 + tgrp_comments.h5 + tgrpnullspace.h5 + thlink.h5 + thyperslab.h5 + tints4dims.h5 + tintsattrs.h5 + tintsnodata.h5 + tlarge_objname.h5 + tldouble.h5 + tldouble_scalar.h5 + tlonglinks.h5 + tloop.h5 + tmulti-b.h5 + tmulti-g.h5 + tmulti-l.h5 + tmulti-o.h5 + tmulti-r.h5 + tmulti-s.h5 + tnamed_dtype_attr.h5 + tnestedcomp.h5 + tnestedcmpddt.h5 + tno-subset.h5 + tnullspace.h5 + torderattr.h5 + tordergr.h5 + tsaf.h5 + tscalarattrintsize.h5 + tscalarintattrsize.h5 + tscalarintsize.h5 + tscalarstring.h5 + tslink.h5 + tsplit_file-m.h5 + tsplit_file-r.h5 + tstr.h5 + tstr2.h5 + tstr3.h5 + tudfilter.h5 + tudlink.h5 + tvldtypes1.h5 + tvldtypes2.h5 + tvldtypes3.h5 + tvldtypes4.h5 + tvldtypes5.h5 + tvlenstr_array.h5 + tvlstr.h5 + tvms.h5 + t128bit_float.h5 + tCVE_2018_11206_fill_old.h5 + tCVE_2018_11206_fill_new.h5 + zerodim.h5 + tCVE-2021-37501_attr_decode.h5 #STD_REF_OBJ files - ${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_compat.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_ext1.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_ext2.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_grp.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_obj_del.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_obj.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_param.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_reg_1d.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5 + trefer_attr.h5 + trefer_compat.h5 + trefer_ext1.h5 + trefer_ext2.h5 + trefer_grp.h5 + trefer_obj_del.h5 + trefer_obj.h5 + trefer_param.h5 + trefer_reg_1d.h5 + trefer_reg.h5 # Onion VFD files - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5 - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5.onion - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5 - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5.onion - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5 - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5.onion + tst_onion_objs.h5 + tst_onion_objs.h5.onion + tst_onion_dset_ext.h5 + tst_onion_dset_ext.h5.onion + tst_onion_dset_1d.h5 + tst_onion_dset_1d.h5.onion ) set (HDF5_ERROR_REFERENCE_TEST_FILES - ${PROJECT_SOURCE_DIR}/errfiles/filter_fail.err - ${PROJECT_SOURCE_DIR}/errfiles/non_existing.err - ${PROJECT_SOURCE_DIR}/errfiles/tall-1.err - ${PROJECT_SOURCE_DIR}/errfiles/tall-2A.err - ${PROJECT_SOURCE_DIR}/errfiles/tall-2A0.err - ${PROJECT_SOURCE_DIR}/errfiles/tall-2B.err - ${PROJECT_SOURCE_DIR}/errfiles/tarray1_big.err - ${PROJECT_SOURCE_DIR}/errfiles/tattrregR.err - ${PROJECT_SOURCE_DIR}/errfiles/tattr-3.err - ${PROJECT_SOURCE_DIR}/errfiles/tcomp-3.err - ${PROJECT_SOURCE_DIR}/errfiles/tdataregR.err - ${PROJECT_SOURCE_DIR}/errfiles/tdset-2.err - ${PROJECT_SOURCE_DIR}/errfiles/texceedsubblock.err - ${PROJECT_SOURCE_DIR}/errfiles/texceedsubcount.err - ${PROJECT_SOURCE_DIR}/errfiles/texceedsubstart.err - ${PROJECT_SOURCE_DIR}/errfiles/texceedsubstride.err - ${PROJECT_SOURCE_DIR}/errfiles/textlink.err - ${PROJECT_SOURCE_DIR}/errfiles/textlinkfar.err - ${PROJECT_SOURCE_DIR}/errfiles/textlinksrc.err - ${PROJECT_SOURCE_DIR}/errfiles/torderlinks1.err - ${PROJECT_SOURCE_DIR}/errfiles/torderlinks2.err - ${PROJECT_SOURCE_DIR}/errfiles/tgroup-2.err - ${PROJECT_SOURCE_DIR}/errfiles/tperror.err - ${PROJECT_SOURCE_DIR}/errfiles/tslink-D.err + filter_fail.err + non_existing.err + tall-1.err + tall-2A.err + tall-2A0.err + tall-2B.err + tarray1_big.err + tattrregR.err + tattr-3.err + tcomp-3.err + tdataregR.err + tdset-2.err + texceedsubblock.err + texceedsubcount.err + texceedsubstart.err + texceedsubstride.err + textlink.err + textlinkfar.err + textlinksrc.err + torderlinks1.err + torderlinks2.err + tgroup-2.err + tperror.err + tslink-D.err ) # make test dir @@ -398,40 +398,38 @@ # copy test files from source dir to test dir # foreach (tst_h5_file ${HDF5_REFERENCE_TEST_FILES}) - get_filename_component (fname "${tst_h5_file}" NAME) - HDFTEST_COPY_FILE("${tst_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${fname}" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${tst_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_h5_file}" "h5dump_std_files") endforeach () foreach (tst_exp_file ${HDF5_REFERENCE_EXP_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${tst_exp_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_exp_file}" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/exportfiles/${tst_exp_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_exp_file}" "h5dump_std_files") endforeach () foreach (tst_other_file ${HDF5_REFERENCE_FILES}) - get_filename_component (fname "${tst_other_file}" NAME) - HDFTEST_COPY_FILE("${tst_other_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${fname}" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${tst_other_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_other_file}" "h5dump_std_files") endforeach () + foreach (tst_h5N_file ${HDF5_N_REFERENCE_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${tst_h5N_file}.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_h5N_file}-N.ddl" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${tst_h5N_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_h5N_file}-N" "h5dump_std_files") endforeach () foreach (tst_error_file ${HDF5_ERROR_REFERENCE_TEST_FILES}) - get_filename_component (fname "${tst_error_file}" NAME) - HDFTEST_COPY_FILE("${tst_error_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${fname}" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${tst_error_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_error_file}" "h5dump_std_files") endforeach () # -------------------------------------------------------------------- # Special file handling # -------------------------------------------------------------------- - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tbin1LE.ddl" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/tbin1.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tbin1LE.ddl" "h5dump_std_files") if (WIN32 AND CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION VERSION_LESS 10.0.18362.0) - configure_file(${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp NEWLINE_STYLE CRLF) - #file (READ ${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp TEST_STREAM) + configure_file(${PROJECT_SOURCE_DIR}/exportfiles/tbinregR.exp ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp NEWLINE_STYLE CRLF) + #file (READ ${PROJECT_SOURCE_DIR}/exportfiles/tbinregR.exp TEST_STREAM) #file (WRITE ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp "${TEST_STREAM}") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.wddl" "${PROJECT_BINARY_DIR}/testfiles/std/tfloatsattrs.ddl" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/tfloatsattrs.wddl" "${PROJECT_BINARY_DIR}/testfiles/std/tfloatsattrs.ddl" "h5dump_std_files") else () - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp" "${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp" "h5dump_std_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tfloatsattrs.ddl" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/exportfiles/tbinregR.exp" "${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/tfloatsattrs.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tfloatsattrs.ddl" "h5dump_std_files") endif () add_custom_target(h5dump_std_files ALL COMMENT "Copying files needed by h5dump_std tests" DEPENDS ${h5dump_std_files_list}) diff --git a/tools/test/h5dump/CMakeTestsPBITS.cmake b/tools/test/h5dump/CMakeTestsPBITS.cmake index caca4b7acbc..118b314f60c 100644 --- a/tools/test/h5dump/CMakeTestsPBITS.cmake +++ b/tools/test/h5dump/CMakeTestsPBITS.cmake @@ -76,9 +76,9 @@ tpbitsUnsignedLongLong16.ddl ) set (HDF5_REFERENCE_TEST_PBITS - ${HDF5_TOOLS_DIR}/testfiles/packedbits.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5 + packedbits.h5 + tarray1.h5 + tcompound.h5 ) set (HDF5_ERROR_REFERENCE_PBITS tnofilename-with-packed-bits.err @@ -97,19 +97,15 @@ ) foreach (pbits_h5_file ${HDF5_REFERENCE_TEST_PBITS}) - get_filename_component(fname "${pbits_h5_file}" NAME) - HDFTEST_COPY_FILE("${pbits_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${fname}" "h5dump_pbits_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${pbits_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${pbits_h5_file}" "h5dump_pbits_files") endforeach () - foreach (ddl_pbits ${HDF5_REFERENCE_PBITS}) - get_filename_component(fname "${ddl_pbits}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/pbits/${ddl_pbits}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${fname}" "h5dump_pbits_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/pbits/${ddl_pbits}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${ddl_pbits}" "h5dump_pbits_files") endforeach () - foreach (ddl_pbits ${HDF5_ERROR_REFERENCE_PBITS}) - get_filename_component(fname "${ddl_pbits}" NAME) - HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${ddl_pbits}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${fname}" "h5dump_pbits_files") + foreach (ddl_err_pbits ${HDF5_ERROR_REFERENCE_PBITS}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/pbits/${ddl_err_pbits}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${ddl_err_pbits}" "h5dump_pbits_files") endforeach () add_custom_target(h5dump_pbits_files ALL COMMENT "Copying files needed by h5dump_pbits tests" DEPENDS ${h5dump_pbits_files_list}) diff --git a/tools/test/h5dump/CMakeTestsVDS.cmake b/tools/test/h5dump/CMakeTestsVDS.cmake index 42f08c9a67b..c910acd5e67 100644 --- a/tools/test/h5dump/CMakeTestsVDS.cmake +++ b/tools/test/h5dump/CMakeTestsVDS.cmake @@ -84,28 +84,19 @@ ) foreach (vds_h5_file ${HDF5_REFERENCE_TEST_VDS}) - get_filename_component(fname "${vds_h5_file}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}" "h5dump_vds_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/${vds_h5_file}" "h5dump_vds_files") endforeach () foreach (vds_h5_file ${HDF5_REFERENCE_PREFIX_VDS}) - get_filename_component(fname "${vds_h5_file}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${fname}" "h5dump_vds_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${vds_h5_file}" "h5dump_vds_files") endforeach () foreach (ddl_vds ${HDF5_REFERENCE_VDS}) - get_filename_component(fname "${ddl_vds}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}" "h5dump_vds_files") - endforeach () - - foreach (ddl_vds ${HDF5_REFERENCE_VDS}) - get_filename_component(fname "${ddl_vds}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${fname}" "h5dump_vds_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/vds/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${ddl_vds}" "h5dump_vds_files") endforeach () foreach (ddl_vds ${HDF5_ERROR_REFERENCE_VDS}) - get_filename_component(fname "${ddl_vds}" NAME) - HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}" "h5dump_vds_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/${ddl_vds}" "h5dump_vds_files") endforeach () add_custom_target(h5dump_vds_files ALL COMMENT "Copying files needed by h5dump_vds tests" DEPENDS ${h5dump_vds_files_list}) diff --git a/tools/test/h5dump/CMakeTestsXML.cmake b/tools/test/h5dump/CMakeTestsXML.cmake index 833a616443e..d78e73830ba 100644 --- a/tools/test/h5dump/CMakeTestsXML.cmake +++ b/tools/test/h5dump/CMakeTestsXML.cmake @@ -19,138 +19,143 @@ # # copy XML test files from source dir to test dir # + set (HDF5_XML_REFERENCE_ONLY_FILES + tbitfields.h5 + tcompound2.h5 + tdset2.h5 + tenum.h5 + test35.nc + tloop2.h5 + tmany.h5 + tname-amp.h5 + tname-apos.h5 + tname-gt.h5 + tname-lt.h5 + tname-quot.h5 + tname-sp.h5 + tnodata.h5 + tobjref.h5 + topaque.h5 + tref.h5 + tref-escapes.h5 + tref-escapes-at.h5 + tstring.h5 + tstring-at.h5 + ) + set (HDF5_XML_REFERENCE_TEST_FILES - ${HDF5_TOOLS_DIR}/testfiles/tall.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5 - ${HDF5_TOOLS_DIR}/testfiles/tattr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tbitfields.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcompound2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdset.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdset2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tempty.h5 - ${HDF5_TOOLS_DIR}/testfiles/tenum.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5 - ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5 - ${HDF5_TOOLS_DIR}/testfiles/thlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tloop.h5 - ${HDF5_TOOLS_DIR}/testfiles/tloop2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tmany.h5 - ${HDF5_TOOLS_DIR}/testfiles/tname-amp.h5 - ${HDF5_TOOLS_DIR}/testfiles/tname-apos.h5 - ${HDF5_TOOLS_DIR}/testfiles/tname-gt.h5 - ${HDF5_TOOLS_DIR}/testfiles/tname-lt.h5 - ${HDF5_TOOLS_DIR}/testfiles/tname-quot.h5 - ${HDF5_TOOLS_DIR}/testfiles/tname-sp.h5 - ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5 - ${HDF5_TOOLS_DIR}/testfiles/test35.nc - ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5 - ${HDF5_TOOLS_DIR}/testfiles/tnodata.h5 - ${HDF5_TOOLS_DIR}/testfiles/tnullspace.h5 - ${HDF5_TOOLS_DIR}/testfiles/tobjref.h5 - ${HDF5_TOOLS_DIR}/testfiles/topaque.h5 - ${HDF5_TOOLS_DIR}/testfiles/torderattr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tref.h5 - ${HDF5_TOOLS_DIR}/testfiles/tref-escapes.h5 - ${HDF5_TOOLS_DIR}/testfiles/tref-escapes-at.h5 - ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5 - ${HDF5_TOOLS_DIR}/testfiles/tslink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tstring.h5 - ${HDF5_TOOLS_DIR}/testfiles/tstring-at.h5 - ${HDF5_TOOLS_DIR}/testfiles/tstr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5 + tall.h5 + tarray1.h5 + tarray2.h5 + tarray3.h5 + tarray6.h5 + tarray7.h5 + tattr.h5 + tcompound.h5 + tcompound_complex.h5 + tdatareg.h5 + tdset.h5 + tempty.h5 + textlink.h5 + tfpformat.h5 + tgroup.h5 + thlink.h5 + tloop.h5 + tnamed_dtype_attr.h5 + tnestedcomp.h5 + tnullspace.h5 + torderattr.h5 + tsaf.h5 + tslink.h5 + tstr.h5 + tstr2.h5 + tudlink.h5 + tvldtypes1.h5 + tvldtypes2.h5 + tvldtypes3.h5 + tvldtypes4.h5 + tvldtypes5.h5 + tvlstr.h5 ) set (HDF5_XML_REFERENCE_FILES - ${HDF5_TOOLS_DIR}/testfiles/tall.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tall-2A.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tattr.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tbitfields_be.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tbitfields_le.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tcompound2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tdset.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tdset2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd-2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd-uri.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty-nons.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty-nons-2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty-nons-uri.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty-ns.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty-ns-2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tenum.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/test35.nc.xml - ${HDF5_TOOLS_DIR}/testfiles/textlink.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/thlink.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tloop.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tloop2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tmany.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tname-amp.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tname-apos.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tname-gt.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tname-lt.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tname-quot.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tname-sp.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tnodata.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tnullspace.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tobjref.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/topaque.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/torderattr1.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/torderattr2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/torderattr3.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/torderattr4.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tref.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tref-escapes.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tref-escapes-at.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tslink.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tstr.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tstring.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tstring-at.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5.xml + tall.h5.xml + tall-2A.h5.xml + tarray1.h5.xml + tarray2.h5.xml + tarray3.h5.xml + tarray6.h5.xml + tarray7.h5.xml + tattr.h5.xml + tbitfields_be.h5.xml + tbitfields_le.h5.xml + tcompound_complex.h5.xml + tcompound.h5.xml + tcompound2.h5.xml + tdatareg.h5.xml + tdset.h5.xml + tdset2.h5.xml + tempty.h5.xml + tempty-dtd.h5.xml + tempty-dtd-2.h5.xml + tempty-dtd-uri.h5.xml + tempty-nons.h5.xml + tempty-nons-2.h5.xml + tempty-nons-uri.h5.xml + tempty-ns.h5.xml + tempty-ns-2.h5.xml + tenum.h5.xml + test35.nc.xml + textlink.h5.xml + tfpformat.h5.xml + tgroup.h5.xml + thlink.h5.xml + tloop.h5.xml + tloop2.h5.xml + tmany.h5.xml + tname-amp.h5.xml + tname-apos.h5.xml + tnamed_dtype_attr.h5.xml + tname-gt.h5.xml + tname-lt.h5.xml + tname-quot.h5.xml + tname-sp.h5.xml + tnestedcomp.h5.xml + tnodata.h5.xml + tnullspace.h5.xml + tobjref.h5.xml + topaque.h5.xml + torderattr1.h5.xml + torderattr2.h5.xml + torderattr3.h5.xml + torderattr4.h5.xml + tref.h5.xml + tref-escapes.h5.xml + tref-escapes-at.h5.xml + tsaf.h5.xml + tslink.h5.xml + tstr.h5.xml + tstr2.h5.xml + tstring.h5.xml + tstring-at.h5.xml + tudlink.h5.xml + tvldtypes1.h5.xml + tvldtypes2.h5.xml + tvldtypes3.h5.xml + tvldtypes4.h5.xml + tvldtypes5.h5.xml + tvlstr.h5.xml ) foreach (tst_xml_h5_file ${HDF5_XML_REFERENCE_TEST_FILES}) - get_filename_component(fname "${tst_xml_h5_file}" NAME) - HDFTEST_COPY_FILE("${tst_xml_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${fname}" "h5dump_xml_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${tst_xml_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${tst_xml_h5_file}" "h5dump_xml_files") + endforeach () + + foreach (tst_xmlonly_h5_file ${HDF5_XML_REFERENCE_ONLY_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/xml/${tst_xmlonly_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${tst_xmlonly_h5_file}" "h5dump_xml_files") endforeach () foreach (tst_xml_other_file ${HDF5_XML_REFERENCE_FILES}) - get_filename_component(fname "${tst_xml_other_file}" NAME) - HDFTEST_COPY_FILE("${tst_xml_other_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${fname}" "h5dump_xml_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/xml/${tst_xml_other_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${tst_xml_other_file}" "h5dump_xml_files") endforeach () add_custom_target(h5dump_xml_files ALL COMMENT "Copying files needed by h5dump_xml tests" DEPENDS ${h5dump_xml_files_list}) diff --git a/tools/test/h5dump/CMakeVFDTests.cmake b/tools/test/h5dump/CMakeVFDTests.cmake index 7ab8c1ffa40..b303032c9ee 100644 --- a/tools/test/h5dump/CMakeVFDTests.cmake +++ b/tools/test/h5dump/CMakeVFDTests.cmake @@ -26,8 +26,8 @@ set (HDF5_VFD_H5DUMP_FILES foreach (vfdtest ${VFD_LIST}) foreach (h5_tfile ${HDF5_VFD_H5DUMP_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}.h5" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.h5" "HDF5_VFD_H5DUMP_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}.ddl" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.ddl" "HDF5_VFD_H5DUMP_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tfile}.h5" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.h5" "HDF5_VFD_H5DUMP_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tfile}.ddl" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.ddl" "HDF5_VFD_H5DUMP_files") endforeach () endforeach () diff --git a/tools/test/h5dump/errfiles/tnofilename-with-packed-bits.err b/tools/test/h5dump/errfiles/pbits/tnofilename-with-packed-bits.err similarity index 100% rename from tools/test/h5dump/errfiles/tnofilename-with-packed-bits.err rename to tools/test/h5dump/errfiles/pbits/tnofilename-with-packed-bits.err diff --git a/tools/test/h5dump/errfiles/tpbitsCharLengthExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsCharLengthExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsCharLengthExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsCharLengthExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsCharOffsetExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsCharOffsetExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsCharOffsetExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsCharOffsetExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsIncomplete.err b/tools/test/h5dump/errfiles/pbits/tpbitsIncomplete.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsIncomplete.err rename to tools/test/h5dump/errfiles/pbits/tpbitsIncomplete.err diff --git a/tools/test/h5dump/errfiles/tpbitsIntLengthExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsIntLengthExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsIntLengthExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsIntLengthExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsIntOffsetExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsIntOffsetExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsIntOffsetExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsIntOffsetExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsLengthExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsLengthExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsLengthExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsLengthExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsLengthPositive.err b/tools/test/h5dump/errfiles/pbits/tpbitsLengthPositive.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsLengthPositive.err rename to tools/test/h5dump/errfiles/pbits/tpbitsLengthPositive.err diff --git a/tools/test/h5dump/errfiles/tpbitsLongLengthExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsLongLengthExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsLongLengthExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsLongLengthExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsLongOffsetExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsLongOffsetExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsLongOffsetExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsLongOffsetExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsMaxExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsMaxExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsMaxExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsMaxExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsOffsetExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsOffsetExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsOffsetExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsOffsetExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsOffsetNegative.err b/tools/test/h5dump/errfiles/pbits/tpbitsOffsetNegative.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsOffsetNegative.err rename to tools/test/h5dump/errfiles/pbits/tpbitsOffsetNegative.err diff --git a/tools/testfiles/charsets.ddl b/tools/test/h5dump/expected/charsets.ddl similarity index 100% rename from tools/testfiles/charsets.ddl rename to tools/test/h5dump/expected/charsets.ddl diff --git a/tools/testfiles/err_attr_dspace.ddl b/tools/test/h5dump/expected/err_attr_dspace.ddl similarity index 100% rename from tools/testfiles/err_attr_dspace.ddl rename to tools/test/h5dump/expected/err_attr_dspace.ddl diff --git a/tools/testfiles/file_space.ddl b/tools/test/h5dump/expected/file_space.ddl similarity index 100% rename from tools/testfiles/file_space.ddl rename to tools/test/h5dump/expected/file_space.ddl diff --git a/tools/testfiles/filter_fail.ddl b/tools/test/h5dump/expected/filter_fail.ddl similarity index 100% rename from tools/testfiles/filter_fail.ddl rename to tools/test/h5dump/expected/filter_fail.ddl diff --git a/tools/testfiles/h5dump-help.txt b/tools/test/h5dump/expected/h5dump-help.txt similarity index 100% rename from tools/testfiles/h5dump-help.txt rename to tools/test/h5dump/expected/h5dump-help.txt diff --git a/tools/testfiles/non_existing.ddl b/tools/test/h5dump/expected/non_existing.ddl similarity index 100% rename from tools/testfiles/non_existing.ddl rename to tools/test/h5dump/expected/non_existing.ddl diff --git a/tools/testfiles/out3.h5import b/tools/test/h5dump/expected/out3.h5import similarity index 100% rename from tools/testfiles/out3.h5import rename to tools/test/h5dump/expected/out3.h5import diff --git a/tools/testfiles/packedbits.ddl b/tools/test/h5dump/expected/packedbits.ddl similarity index 100% rename from tools/testfiles/packedbits.ddl rename to tools/test/h5dump/expected/packedbits.ddl diff --git a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl b/tools/test/h5dump/expected/pbits/tnofilename-with-packed-bits.ddl similarity index 100% rename from tools/testfiles/pbits/tnofilename-with-packed-bits.ddl rename to tools/test/h5dump/expected/pbits/tnofilename-with-packed-bits.ddl diff --git a/tools/testfiles/pbits/tpbitsArray.ddl b/tools/test/h5dump/expected/pbits/tpbitsArray.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsArray.ddl rename to tools/test/h5dump/expected/pbits/tpbitsArray.ddl diff --git a/tools/testfiles/pbits/tpbitsCharLengthExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsCharLengthExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsCharLengthExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsCharLengthExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsCharOffsetExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsCharOffsetExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsCharOffsetExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsCharOffsetExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsCompound.ddl b/tools/test/h5dump/expected/pbits/tpbitsCompound.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsCompound.ddl rename to tools/test/h5dump/expected/pbits/tpbitsCompound.ddl diff --git a/tools/testfiles/pbits/tpbitsIncomplete.ddl b/tools/test/h5dump/expected/pbits/tpbitsIncomplete.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsIncomplete.ddl rename to tools/test/h5dump/expected/pbits/tpbitsIncomplete.ddl diff --git a/tools/testfiles/pbits/tpbitsIntLengthExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsIntLengthExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsIntLengthExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsIntLengthExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsIntOffsetExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsIntOffsetExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsIntOffsetExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsIntOffsetExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsLengthExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsLengthExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsLengthExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsLengthPositive.ddl b/tools/test/h5dump/expected/pbits/tpbitsLengthPositive.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsLengthPositive.ddl rename to tools/test/h5dump/expected/pbits/tpbitsLengthPositive.ddl diff --git a/tools/testfiles/pbits/tpbitsLongLengthExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsLongLengthExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsLongLengthExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsLongLengthExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsLongOffsetExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsLongOffsetExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsLongOffsetExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsLongOffsetExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsMax.ddl b/tools/test/h5dump/expected/pbits/tpbitsMax.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsMax.ddl rename to tools/test/h5dump/expected/pbits/tpbitsMax.ddl diff --git a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsMaxExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsMaxExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsMaxExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsOffsetExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsOffsetExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsOffsetExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl b/tools/test/h5dump/expected/pbits/tpbitsOffsetNegative.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsOffsetNegative.ddl rename to tools/test/h5dump/expected/pbits/tpbitsOffsetNegative.ddl diff --git a/tools/testfiles/pbits/tpbitsOverlapped.ddl b/tools/test/h5dump/expected/pbits/tpbitsOverlapped.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsOverlapped.ddl rename to tools/test/h5dump/expected/pbits/tpbitsOverlapped.ddl diff --git a/tools/testfiles/pbits/tpbitsSigned.ddl b/tools/test/h5dump/expected/pbits/tpbitsSigned.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSigned.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSigned.ddl diff --git a/tools/testfiles/pbits/tpbitsSigned2.ddl b/tools/test/h5dump/expected/pbits/tpbitsSigned2.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSigned2.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSigned2.ddl diff --git a/tools/testfiles/pbits/tpbitsSigned4.ddl b/tools/test/h5dump/expected/pbits/tpbitsSigned4.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSigned4.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSigned4.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedInt.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedInt.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedInt.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedInt.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedInt4.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedInt4.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedInt4.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedInt4.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedInt8.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedInt8.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedInt8.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedInt8.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedIntWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedIntWhole.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedIntWhole.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedIntWhole.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLong.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLong.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLong.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLong.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLong16.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLong16.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLong16.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLong16.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLong8.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLong8.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLong8.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLong8.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLongLong.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLongLong.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLongLong.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLongLong16.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong16.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLongLong16.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLongLong16.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLongLong32.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong32.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLongLong32.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLongLong32.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLongLongWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLongLongWhole.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLongLongWhole1.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole1.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLongLongWhole1.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole1.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLongLongWhole63.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole63.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLongLongWhole63.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole63.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLongWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongWhole.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLongWhole.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLongWhole.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedWhole.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedWhole.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedWhole.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsigned.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsigned.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsigned.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsigned.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsigned2.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsigned2.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsigned2.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsigned2.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsigned4.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsigned4.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsigned4.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsigned4.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedInt.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedInt.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedInt.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedInt4.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt4.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedInt4.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedInt4.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedInt8.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt8.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedInt8.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedInt8.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedIntWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedIntWhole.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedIntWhole.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedIntWhole.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLong.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLong.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLong.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLong16.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong16.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLong16.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLong16.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLong8.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong8.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLong8.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLong8.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLong.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLongLong.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLong16.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong16.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLongLong16.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong16.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLong32.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong32.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLongLong32.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong32.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLongLongWhole.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole1.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole1.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLongLongWhole1.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole1.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole63.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole63.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLongLongWhole63.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole63.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongWhole.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLongWhole.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLongWhole.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedWhole.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedWhole.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedWhole.ddl diff --git a/tools/testfiles/tall-1.ddl b/tools/test/h5dump/expected/tall-1.ddl similarity index 100% rename from tools/testfiles/tall-1.ddl rename to tools/test/h5dump/expected/tall-1.ddl diff --git a/tools/testfiles/tall-2.ddl b/tools/test/h5dump/expected/tall-2.ddl similarity index 100% rename from tools/testfiles/tall-2.ddl rename to tools/test/h5dump/expected/tall-2.ddl diff --git a/tools/testfiles/tall-2A.ddl b/tools/test/h5dump/expected/tall-2A.ddl similarity index 100% rename from tools/testfiles/tall-2A.ddl rename to tools/test/h5dump/expected/tall-2A.ddl diff --git a/tools/testfiles/tall-2A0.ddl b/tools/test/h5dump/expected/tall-2A0.ddl similarity index 100% rename from tools/testfiles/tall-2A0.ddl rename to tools/test/h5dump/expected/tall-2A0.ddl diff --git a/tools/testfiles/tall-2B.ddl b/tools/test/h5dump/expected/tall-2B.ddl similarity index 100% rename from tools/testfiles/tall-2B.ddl rename to tools/test/h5dump/expected/tall-2B.ddl diff --git a/tools/testfiles/tall-3.ddl b/tools/test/h5dump/expected/tall-3.ddl similarity index 100% rename from tools/testfiles/tall-3.ddl rename to tools/test/h5dump/expected/tall-3.ddl diff --git a/tools/testfiles/tall-4s.ddl b/tools/test/h5dump/expected/tall-4s.ddl similarity index 100% rename from tools/testfiles/tall-4s.ddl rename to tools/test/h5dump/expected/tall-4s.ddl diff --git a/tools/testfiles/tall-5s.ddl b/tools/test/h5dump/expected/tall-5s.ddl similarity index 100% rename from tools/testfiles/tall-5s.ddl rename to tools/test/h5dump/expected/tall-5s.ddl diff --git a/tools/testfiles/tall-6.ddl b/tools/test/h5dump/expected/tall-6.ddl similarity index 100% rename from tools/testfiles/tall-6.ddl rename to tools/test/h5dump/expected/tall-6.ddl diff --git a/tools/testfiles/tall-7.ddl b/tools/test/h5dump/expected/tall-7.ddl similarity index 100% rename from tools/testfiles/tall-7.ddl rename to tools/test/h5dump/expected/tall-7.ddl diff --git a/tools/testfiles/tall-7N.ddl b/tools/test/h5dump/expected/tall-7N.ddl similarity index 100% rename from tools/testfiles/tall-7N.ddl rename to tools/test/h5dump/expected/tall-7N.ddl diff --git a/tools/testfiles/tallfilters.ddl b/tools/test/h5dump/expected/tallfilters.ddl similarity index 100% rename from tools/testfiles/tallfilters.ddl rename to tools/test/h5dump/expected/tallfilters.ddl diff --git a/tools/testfiles/tarray1.ddl b/tools/test/h5dump/expected/tarray1.ddl similarity index 100% rename from tools/testfiles/tarray1.ddl rename to tools/test/h5dump/expected/tarray1.ddl diff --git a/tools/testfiles/tarray1_big.ddl b/tools/test/h5dump/expected/tarray1_big.ddl similarity index 100% rename from tools/testfiles/tarray1_big.ddl rename to tools/test/h5dump/expected/tarray1_big.ddl diff --git a/tools/testfiles/tarray2.ddl b/tools/test/h5dump/expected/tarray2.ddl similarity index 100% rename from tools/testfiles/tarray2.ddl rename to tools/test/h5dump/expected/tarray2.ddl diff --git a/tools/testfiles/tarray3.ddl b/tools/test/h5dump/expected/tarray3.ddl similarity index 100% rename from tools/testfiles/tarray3.ddl rename to tools/test/h5dump/expected/tarray3.ddl diff --git a/tools/testfiles/tarray4.ddl b/tools/test/h5dump/expected/tarray4.ddl similarity index 100% rename from tools/testfiles/tarray4.ddl rename to tools/test/h5dump/expected/tarray4.ddl diff --git a/tools/testfiles/tarray5.ddl b/tools/test/h5dump/expected/tarray5.ddl similarity index 100% rename from tools/testfiles/tarray5.ddl rename to tools/test/h5dump/expected/tarray5.ddl diff --git a/tools/testfiles/tarray6.ddl b/tools/test/h5dump/expected/tarray6.ddl similarity index 100% rename from tools/testfiles/tarray6.ddl rename to tools/test/h5dump/expected/tarray6.ddl diff --git a/tools/testfiles/tarray7.ddl b/tools/test/h5dump/expected/tarray7.ddl similarity index 100% rename from tools/testfiles/tarray7.ddl rename to tools/test/h5dump/expected/tarray7.ddl diff --git a/tools/testfiles/tarray8.ddl b/tools/test/h5dump/expected/tarray8.ddl similarity index 100% rename from tools/testfiles/tarray8.ddl rename to tools/test/h5dump/expected/tarray8.ddl diff --git a/tools/testfiles/tattr-1.ddl b/tools/test/h5dump/expected/tattr-1.ddl similarity index 100% rename from tools/testfiles/tattr-1.ddl rename to tools/test/h5dump/expected/tattr-1.ddl diff --git a/tools/testfiles/tattr-2.ddl b/tools/test/h5dump/expected/tattr-2.ddl similarity index 100% rename from tools/testfiles/tattr-2.ddl rename to tools/test/h5dump/expected/tattr-2.ddl diff --git a/tools/testfiles/tattr-3.ddl b/tools/test/h5dump/expected/tattr-3.ddl similarity index 100% rename from tools/testfiles/tattr-3.ddl rename to tools/test/h5dump/expected/tattr-3.ddl diff --git a/tools/testfiles/tattr-4_be.ddl b/tools/test/h5dump/expected/tattr-4_be.ddl similarity index 100% rename from tools/testfiles/tattr-4_be.ddl rename to tools/test/h5dump/expected/tattr-4_be.ddl diff --git a/tools/testfiles/tattrcontents1.ddl b/tools/test/h5dump/expected/tattrcontents1.ddl similarity index 100% rename from tools/testfiles/tattrcontents1.ddl rename to tools/test/h5dump/expected/tattrcontents1.ddl diff --git a/tools/testfiles/tattrcontents2.ddl b/tools/test/h5dump/expected/tattrcontents2.ddl similarity index 100% rename from tools/testfiles/tattrcontents2.ddl rename to tools/test/h5dump/expected/tattrcontents2.ddl diff --git a/tools/testfiles/tattrintsize.ddl b/tools/test/h5dump/expected/tattrintsize.ddl similarity index 100% rename from tools/testfiles/tattrintsize.ddl rename to tools/test/h5dump/expected/tattrintsize.ddl diff --git a/tools/testfiles/tattrreg.ddl b/tools/test/h5dump/expected/tattrreg.ddl similarity index 100% rename from tools/testfiles/tattrreg.ddl rename to tools/test/h5dump/expected/tattrreg.ddl diff --git a/tools/testfiles/tattrregR.ddl b/tools/test/h5dump/expected/tattrregR.ddl similarity index 100% rename from tools/testfiles/tattrregR.ddl rename to tools/test/h5dump/expected/tattrregR.ddl diff --git a/tools/testfiles/tbigdims.ddl b/tools/test/h5dump/expected/tbigdims.ddl similarity index 100% rename from tools/testfiles/tbigdims.ddl rename to tools/test/h5dump/expected/tbigdims.ddl diff --git a/tools/testfiles/tbin1.ddl b/tools/test/h5dump/expected/tbin1.ddl similarity index 100% rename from tools/testfiles/tbin1.ddl rename to tools/test/h5dump/expected/tbin1.ddl diff --git a/tools/testfiles/tbin2.ddl b/tools/test/h5dump/expected/tbin2.ddl similarity index 100% rename from tools/testfiles/tbin2.ddl rename to tools/test/h5dump/expected/tbin2.ddl diff --git a/tools/testfiles/tbin3.ddl b/tools/test/h5dump/expected/tbin3.ddl similarity index 100% rename from tools/testfiles/tbin3.ddl rename to tools/test/h5dump/expected/tbin3.ddl diff --git a/tools/testfiles/tbin4.ddl b/tools/test/h5dump/expected/tbin4.ddl similarity index 100% rename from tools/testfiles/tbin4.ddl rename to tools/test/h5dump/expected/tbin4.ddl diff --git a/tools/testfiles/tbinregR.ddl b/tools/test/h5dump/expected/tbinregR.ddl similarity index 100% rename from tools/testfiles/tbinregR.ddl rename to tools/test/h5dump/expected/tbinregR.ddl diff --git a/tools/testfiles/tbitnopaque_be.ddl b/tools/test/h5dump/expected/tbitnopaque_be.ddl similarity index 100% rename from tools/testfiles/tbitnopaque_be.ddl rename to tools/test/h5dump/expected/tbitnopaque_be.ddl diff --git a/tools/testfiles/tbitnopaque_le.ddl b/tools/test/h5dump/expected/tbitnopaque_le.ddl similarity index 100% rename from tools/testfiles/tbitnopaque_le.ddl rename to tools/test/h5dump/expected/tbitnopaque_le.ddl diff --git a/tools/testfiles/tboot1.ddl b/tools/test/h5dump/expected/tboot1.ddl similarity index 100% rename from tools/testfiles/tboot1.ddl rename to tools/test/h5dump/expected/tboot1.ddl diff --git a/tools/testfiles/tboot2.ddl b/tools/test/h5dump/expected/tboot2.ddl similarity index 100% rename from tools/testfiles/tboot2.ddl rename to tools/test/h5dump/expected/tboot2.ddl diff --git a/tools/testfiles/tboot2A.ddl b/tools/test/h5dump/expected/tboot2A.ddl similarity index 100% rename from tools/testfiles/tboot2A.ddl rename to tools/test/h5dump/expected/tboot2A.ddl diff --git a/tools/testfiles/tboot2B.ddl b/tools/test/h5dump/expected/tboot2B.ddl similarity index 100% rename from tools/testfiles/tboot2B.ddl rename to tools/test/h5dump/expected/tboot2B.ddl diff --git a/tools/testfiles/tchar1.ddl b/tools/test/h5dump/expected/tchar1.ddl similarity index 100% rename from tools/testfiles/tchar1.ddl rename to tools/test/h5dump/expected/tchar1.ddl diff --git a/tools/testfiles/tchunked.ddl b/tools/test/h5dump/expected/tchunked.ddl similarity index 100% rename from tools/testfiles/tchunked.ddl rename to tools/test/h5dump/expected/tchunked.ddl diff --git a/tools/testfiles/tcmpdattrintsize.ddl b/tools/test/h5dump/expected/tcmpdattrintsize.ddl similarity index 100% rename from tools/testfiles/tcmpdattrintsize.ddl rename to tools/test/h5dump/expected/tcmpdattrintsize.ddl diff --git a/tools/testfiles/tcmpdintarray.ddl b/tools/test/h5dump/expected/tcmpdintarray.ddl similarity index 100% rename from tools/testfiles/tcmpdintarray.ddl rename to tools/test/h5dump/expected/tcmpdintarray.ddl diff --git a/tools/testfiles/tcmpdints.ddl b/tools/test/h5dump/expected/tcmpdints.ddl similarity index 100% rename from tools/testfiles/tcmpdints.ddl rename to tools/test/h5dump/expected/tcmpdints.ddl diff --git a/tools/testfiles/tcmpdintsize.ddl b/tools/test/h5dump/expected/tcmpdintsize.ddl similarity index 100% rename from tools/testfiles/tcmpdintsize.ddl rename to tools/test/h5dump/expected/tcmpdintsize.ddl diff --git a/tools/testfiles/tcomp-1.ddl b/tools/test/h5dump/expected/tcomp-1.ddl similarity index 100% rename from tools/testfiles/tcomp-1.ddl rename to tools/test/h5dump/expected/tcomp-1.ddl diff --git a/tools/testfiles/tcomp-2.ddl b/tools/test/h5dump/expected/tcomp-2.ddl similarity index 100% rename from tools/testfiles/tcomp-2.ddl rename to tools/test/h5dump/expected/tcomp-2.ddl diff --git a/tools/testfiles/tcomp-3.ddl b/tools/test/h5dump/expected/tcomp-3.ddl similarity index 100% rename from tools/testfiles/tcomp-3.ddl rename to tools/test/h5dump/expected/tcomp-3.ddl diff --git a/tools/testfiles/tcomp-4.ddl b/tools/test/h5dump/expected/tcomp-4.ddl similarity index 100% rename from tools/testfiles/tcomp-4.ddl rename to tools/test/h5dump/expected/tcomp-4.ddl diff --git a/tools/testfiles/tcompact.ddl b/tools/test/h5dump/expected/tcompact.ddl similarity index 100% rename from tools/testfiles/tcompact.ddl rename to tools/test/h5dump/expected/tcompact.ddl diff --git a/tools/testfiles/tcompound_complex2.ddl b/tools/test/h5dump/expected/tcompound_complex2.ddl similarity index 100% rename from tools/testfiles/tcompound_complex2.ddl rename to tools/test/h5dump/expected/tcompound_complex2.ddl diff --git a/tools/testfiles/tcontents.ddl b/tools/test/h5dump/expected/tcontents.ddl similarity index 100% rename from tools/testfiles/tcontents.ddl rename to tools/test/h5dump/expected/tcontents.ddl diff --git a/tools/testfiles/tcontiguos.ddl b/tools/test/h5dump/expected/tcontiguos.ddl similarity index 100% rename from tools/testfiles/tcontiguos.ddl rename to tools/test/h5dump/expected/tcontiguos.ddl diff --git a/tools/testfiles/tdatareg.ddl b/tools/test/h5dump/expected/tdatareg.ddl similarity index 100% rename from tools/testfiles/tdatareg.ddl rename to tools/test/h5dump/expected/tdatareg.ddl diff --git a/tools/testfiles/tdataregR.ddl b/tools/test/h5dump/expected/tdataregR.ddl similarity index 100% rename from tools/testfiles/tdataregR.ddl rename to tools/test/h5dump/expected/tdataregR.ddl diff --git a/tools/testfiles/tdeflate.ddl b/tools/test/h5dump/expected/tdeflate.ddl similarity index 100% rename from tools/testfiles/tdeflate.ddl rename to tools/test/h5dump/expected/tdeflate.ddl diff --git a/tools/testfiles/tdset-1.ddl b/tools/test/h5dump/expected/tdset-1.ddl similarity index 100% rename from tools/testfiles/tdset-1.ddl rename to tools/test/h5dump/expected/tdset-1.ddl diff --git a/tools/testfiles/tdset-2.ddl b/tools/test/h5dump/expected/tdset-2.ddl similarity index 100% rename from tools/testfiles/tdset-2.ddl rename to tools/test/h5dump/expected/tdset-2.ddl diff --git a/tools/testfiles/tdset-3s.ddl b/tools/test/h5dump/expected/tdset-3s.ddl similarity index 100% rename from tools/testfiles/tdset-3s.ddl rename to tools/test/h5dump/expected/tdset-3s.ddl diff --git a/tools/testfiles/tempty.ddl b/tools/test/h5dump/expected/tempty.ddl similarity index 100% rename from tools/testfiles/tempty.ddl rename to tools/test/h5dump/expected/tempty.ddl diff --git a/tools/testfiles/texceedsubblock.ddl b/tools/test/h5dump/expected/texceedsubblock.ddl similarity index 100% rename from tools/testfiles/texceedsubblock.ddl rename to tools/test/h5dump/expected/texceedsubblock.ddl diff --git a/tools/testfiles/texceedsubcount.ddl b/tools/test/h5dump/expected/texceedsubcount.ddl similarity index 100% rename from tools/testfiles/texceedsubcount.ddl rename to tools/test/h5dump/expected/texceedsubcount.ddl diff --git a/tools/testfiles/texceedsubstart.ddl b/tools/test/h5dump/expected/texceedsubstart.ddl similarity index 100% rename from tools/testfiles/texceedsubstart.ddl rename to tools/test/h5dump/expected/texceedsubstart.ddl diff --git a/tools/testfiles/texceedsubstride.ddl b/tools/test/h5dump/expected/texceedsubstride.ddl similarity index 100% rename from tools/testfiles/texceedsubstride.ddl rename to tools/test/h5dump/expected/texceedsubstride.ddl diff --git a/tools/testfiles/texternal.ddl b/tools/test/h5dump/expected/texternal.ddl similarity index 100% rename from tools/testfiles/texternal.ddl rename to tools/test/h5dump/expected/texternal.ddl diff --git a/tools/testfiles/textlink.ddl b/tools/test/h5dump/expected/textlink.ddl similarity index 100% rename from tools/testfiles/textlink.ddl rename to tools/test/h5dump/expected/textlink.ddl diff --git a/tools/testfiles/textlinkfar.ddl b/tools/test/h5dump/expected/textlinkfar.ddl similarity index 100% rename from tools/testfiles/textlinkfar.ddl rename to tools/test/h5dump/expected/textlinkfar.ddl diff --git a/tools/testfiles/textlinksrc.ddl b/tools/test/h5dump/expected/textlinksrc.ddl similarity index 100% rename from tools/testfiles/textlinksrc.ddl rename to tools/test/h5dump/expected/textlinksrc.ddl diff --git a/tools/testfiles/tfamily.ddl b/tools/test/h5dump/expected/tfamily.ddl similarity index 100% rename from tools/testfiles/tfamily.ddl rename to tools/test/h5dump/expected/tfamily.ddl diff --git a/tools/testfiles/tfill.ddl b/tools/test/h5dump/expected/tfill.ddl similarity index 100% rename from tools/testfiles/tfill.ddl rename to tools/test/h5dump/expected/tfill.ddl diff --git a/tools/testfiles/tfletcher32.ddl b/tools/test/h5dump/expected/tfletcher32.ddl similarity index 100% rename from tools/testfiles/tfletcher32.ddl rename to tools/test/h5dump/expected/tfletcher32.ddl diff --git a/tools/testfiles/tfloatsattrs.ddl b/tools/test/h5dump/expected/tfloatsattrs.ddl similarity index 100% rename from tools/testfiles/tfloatsattrs.ddl rename to tools/test/h5dump/expected/tfloatsattrs.ddl diff --git a/tools/testfiles/tfloatsattrs.wddl b/tools/test/h5dump/expected/tfloatsattrs.wddl similarity index 100% rename from tools/testfiles/tfloatsattrs.wddl rename to tools/test/h5dump/expected/tfloatsattrs.wddl diff --git a/tools/testfiles/tfpformat.ddl b/tools/test/h5dump/expected/tfpformat.ddl similarity index 100% rename from tools/testfiles/tfpformat.ddl rename to tools/test/h5dump/expected/tfpformat.ddl diff --git a/tools/testfiles/tgroup-1.ddl b/tools/test/h5dump/expected/tgroup-1.ddl similarity index 100% rename from tools/testfiles/tgroup-1.ddl rename to tools/test/h5dump/expected/tgroup-1.ddl diff --git a/tools/testfiles/tgroup-2.ddl b/tools/test/h5dump/expected/tgroup-2.ddl similarity index 100% rename from tools/testfiles/tgroup-2.ddl rename to tools/test/h5dump/expected/tgroup-2.ddl diff --git a/tools/testfiles/tgrp_comments.ddl b/tools/test/h5dump/expected/tgrp_comments.ddl similarity index 100% rename from tools/testfiles/tgrp_comments.ddl rename to tools/test/h5dump/expected/tgrp_comments.ddl diff --git a/tools/testfiles/tgrpnullspace.ddl b/tools/test/h5dump/expected/tgrpnullspace.ddl similarity index 100% rename from tools/testfiles/tgrpnullspace.ddl rename to tools/test/h5dump/expected/tgrpnullspace.ddl diff --git a/tools/testfiles/thlink-1.ddl b/tools/test/h5dump/expected/thlink-1.ddl similarity index 100% rename from tools/testfiles/thlink-1.ddl rename to tools/test/h5dump/expected/thlink-1.ddl diff --git a/tools/testfiles/thlink-2.ddl b/tools/test/h5dump/expected/thlink-2.ddl similarity index 100% rename from tools/testfiles/thlink-2.ddl rename to tools/test/h5dump/expected/thlink-2.ddl diff --git a/tools/testfiles/thlink-3.ddl b/tools/test/h5dump/expected/thlink-3.ddl similarity index 100% rename from tools/testfiles/thlink-3.ddl rename to tools/test/h5dump/expected/thlink-3.ddl diff --git a/tools/testfiles/thlink-4.ddl b/tools/test/h5dump/expected/thlink-4.ddl similarity index 100% rename from tools/testfiles/thlink-4.ddl rename to tools/test/h5dump/expected/thlink-4.ddl diff --git a/tools/testfiles/thlink-5.ddl b/tools/test/h5dump/expected/thlink-5.ddl similarity index 100% rename from tools/testfiles/thlink-5.ddl rename to tools/test/h5dump/expected/thlink-5.ddl diff --git a/tools/testfiles/thyperslab.ddl b/tools/test/h5dump/expected/thyperslab.ddl similarity index 100% rename from tools/testfiles/thyperslab.ddl rename to tools/test/h5dump/expected/thyperslab.ddl diff --git a/tools/testfiles/tindicesno.ddl b/tools/test/h5dump/expected/tindicesno.ddl similarity index 100% rename from tools/testfiles/tindicesno.ddl rename to tools/test/h5dump/expected/tindicesno.ddl diff --git a/tools/testfiles/tindicessub1.ddl b/tools/test/h5dump/expected/tindicessub1.ddl similarity index 100% rename from tools/testfiles/tindicessub1.ddl rename to tools/test/h5dump/expected/tindicessub1.ddl diff --git a/tools/testfiles/tindicessub2.ddl b/tools/test/h5dump/expected/tindicessub2.ddl similarity index 100% rename from tools/testfiles/tindicessub2.ddl rename to tools/test/h5dump/expected/tindicessub2.ddl diff --git a/tools/testfiles/tindicessub3.ddl b/tools/test/h5dump/expected/tindicessub3.ddl similarity index 100% rename from tools/testfiles/tindicessub3.ddl rename to tools/test/h5dump/expected/tindicessub3.ddl diff --git a/tools/testfiles/tindicessub4.ddl b/tools/test/h5dump/expected/tindicessub4.ddl similarity index 100% rename from tools/testfiles/tindicessub4.ddl rename to tools/test/h5dump/expected/tindicessub4.ddl diff --git a/tools/testfiles/tindicesyes.ddl b/tools/test/h5dump/expected/tindicesyes.ddl similarity index 100% rename from tools/testfiles/tindicesyes.ddl rename to tools/test/h5dump/expected/tindicesyes.ddl diff --git a/tools/testfiles/tints4dims.ddl b/tools/test/h5dump/expected/tints4dims.ddl similarity index 100% rename from tools/testfiles/tints4dims.ddl rename to tools/test/h5dump/expected/tints4dims.ddl diff --git a/tools/testfiles/tints4dimsBlock2.ddl b/tools/test/h5dump/expected/tints4dimsBlock2.ddl similarity index 100% rename from tools/testfiles/tints4dimsBlock2.ddl rename to tools/test/h5dump/expected/tints4dimsBlock2.ddl diff --git a/tools/testfiles/tints4dimsBlockEq.ddl b/tools/test/h5dump/expected/tints4dimsBlockEq.ddl similarity index 100% rename from tools/testfiles/tints4dimsBlockEq.ddl rename to tools/test/h5dump/expected/tints4dimsBlockEq.ddl diff --git a/tools/testfiles/tints4dimsCount2.ddl b/tools/test/h5dump/expected/tints4dimsCount2.ddl similarity index 100% rename from tools/testfiles/tints4dimsCount2.ddl rename to tools/test/h5dump/expected/tints4dimsCount2.ddl diff --git a/tools/testfiles/tints4dimsCountEq.ddl b/tools/test/h5dump/expected/tints4dimsCountEq.ddl similarity index 100% rename from tools/testfiles/tints4dimsCountEq.ddl rename to tools/test/h5dump/expected/tints4dimsCountEq.ddl diff --git a/tools/testfiles/tints4dimsStride2.ddl b/tools/test/h5dump/expected/tints4dimsStride2.ddl similarity index 100% rename from tools/testfiles/tints4dimsStride2.ddl rename to tools/test/h5dump/expected/tints4dimsStride2.ddl diff --git a/tools/testfiles/tintsattrs.ddl b/tools/test/h5dump/expected/tintsattrs.ddl similarity index 100% rename from tools/testfiles/tintsattrs.ddl rename to tools/test/h5dump/expected/tintsattrs.ddl diff --git a/tools/testfiles/tintsnodata.ddl b/tools/test/h5dump/expected/tintsnodata.ddl similarity index 100% rename from tools/testfiles/tintsnodata.ddl rename to tools/test/h5dump/expected/tintsnodata.ddl diff --git a/tools/testfiles/tlarge_objname.ddl b/tools/test/h5dump/expected/tlarge_objname.ddl similarity index 100% rename from tools/testfiles/tlarge_objname.ddl rename to tools/test/h5dump/expected/tlarge_objname.ddl diff --git a/tools/testfiles/tldouble.ddl b/tools/test/h5dump/expected/tldouble.ddl similarity index 100% rename from tools/testfiles/tldouble.ddl rename to tools/test/h5dump/expected/tldouble.ddl diff --git a/tools/testfiles/tldouble_scalar.ddl b/tools/test/h5dump/expected/tldouble_scalar.ddl similarity index 100% rename from tools/testfiles/tldouble_scalar.ddl rename to tools/test/h5dump/expected/tldouble_scalar.ddl diff --git a/tools/testfiles/tlonglinks.ddl b/tools/test/h5dump/expected/tlonglinks.ddl similarity index 100% rename from tools/testfiles/tlonglinks.ddl rename to tools/test/h5dump/expected/tlonglinks.ddl diff --git a/tools/testfiles/tloop-1.ddl b/tools/test/h5dump/expected/tloop-1.ddl similarity index 100% rename from tools/testfiles/tloop-1.ddl rename to tools/test/h5dump/expected/tloop-1.ddl diff --git a/tools/testfiles/tmulti.ddl b/tools/test/h5dump/expected/tmulti.ddl similarity index 100% rename from tools/testfiles/tmulti.ddl rename to tools/test/h5dump/expected/tmulti.ddl diff --git a/tools/testfiles/tmultifile.ddl b/tools/test/h5dump/expected/tmultifile.ddl similarity index 100% rename from tools/testfiles/tmultifile.ddl rename to tools/test/h5dump/expected/tmultifile.ddl diff --git a/tools/testfiles/tnamed_dtype_attr.ddl b/tools/test/h5dump/expected/tnamed_dtype_attr.ddl similarity index 100% rename from tools/testfiles/tnamed_dtype_attr.ddl rename to tools/test/h5dump/expected/tnamed_dtype_attr.ddl diff --git a/tools/testfiles/tnbit.ddl b/tools/test/h5dump/expected/tnbit.ddl similarity index 100% rename from tools/testfiles/tnbit.ddl rename to tools/test/h5dump/expected/tnbit.ddl diff --git a/tools/testfiles/tnestcomp-1.ddl b/tools/test/h5dump/expected/tnestcomp-1.ddl similarity index 100% rename from tools/testfiles/tnestcomp-1.ddl rename to tools/test/h5dump/expected/tnestcomp-1.ddl diff --git a/tools/testfiles/tnestedcmpddt.ddl b/tools/test/h5dump/expected/tnestedcmpddt.ddl similarity index 100% rename from tools/testfiles/tnestedcmpddt.ddl rename to tools/test/h5dump/expected/tnestedcmpddt.ddl diff --git a/tools/testfiles/tno-subset.ddl b/tools/test/h5dump/expected/tno-subset.ddl similarity index 100% rename from tools/testfiles/tno-subset.ddl rename to tools/test/h5dump/expected/tno-subset.ddl diff --git a/tools/testfiles/tnoattrdata.ddl b/tools/test/h5dump/expected/tnoattrdata.ddl similarity index 100% rename from tools/testfiles/tnoattrdata.ddl rename to tools/test/h5dump/expected/tnoattrdata.ddl diff --git a/tools/testfiles/tnoattrddl.ddl b/tools/test/h5dump/expected/tnoattrddl.ddl similarity index 100% rename from tools/testfiles/tnoattrddl.ddl rename to tools/test/h5dump/expected/tnoattrddl.ddl diff --git a/tools/testfiles/tnodata.ddl b/tools/test/h5dump/expected/tnodata.ddl similarity index 100% rename from tools/testfiles/tnodata.ddl rename to tools/test/h5dump/expected/tnodata.ddl diff --git a/tools/testfiles/tnoddl.ddl b/tools/test/h5dump/expected/tnoddl.ddl similarity index 100% rename from tools/testfiles/tnoddl.ddl rename to tools/test/h5dump/expected/tnoddl.ddl diff --git a/tools/testfiles/tnoddlfile.ddl b/tools/test/h5dump/expected/tnoddlfile.ddl similarity index 100% rename from tools/testfiles/tnoddlfile.ddl rename to tools/test/h5dump/expected/tnoddlfile.ddl diff --git a/tools/testfiles/tnullspace.ddl b/tools/test/h5dump/expected/tnullspace.ddl similarity index 100% rename from tools/testfiles/tnullspace.ddl rename to tools/test/h5dump/expected/tnullspace.ddl diff --git a/tools/testfiles/torderattr1.ddl b/tools/test/h5dump/expected/torderattr1.ddl similarity index 100% rename from tools/testfiles/torderattr1.ddl rename to tools/test/h5dump/expected/torderattr1.ddl diff --git a/tools/testfiles/torderattr2.ddl b/tools/test/h5dump/expected/torderattr2.ddl similarity index 100% rename from tools/testfiles/torderattr2.ddl rename to tools/test/h5dump/expected/torderattr2.ddl diff --git a/tools/testfiles/torderattr3.ddl b/tools/test/h5dump/expected/torderattr3.ddl similarity index 100% rename from tools/testfiles/torderattr3.ddl rename to tools/test/h5dump/expected/torderattr3.ddl diff --git a/tools/testfiles/torderattr4.ddl b/tools/test/h5dump/expected/torderattr4.ddl similarity index 100% rename from tools/testfiles/torderattr4.ddl rename to tools/test/h5dump/expected/torderattr4.ddl diff --git a/tools/testfiles/tordercontents1.ddl b/tools/test/h5dump/expected/tordercontents1.ddl similarity index 100% rename from tools/testfiles/tordercontents1.ddl rename to tools/test/h5dump/expected/tordercontents1.ddl diff --git a/tools/testfiles/tordercontents2.ddl b/tools/test/h5dump/expected/tordercontents2.ddl similarity index 100% rename from tools/testfiles/tordercontents2.ddl rename to tools/test/h5dump/expected/tordercontents2.ddl diff --git a/tools/testfiles/tordergr1.ddl b/tools/test/h5dump/expected/tordergr1.ddl similarity index 100% rename from tools/testfiles/tordergr1.ddl rename to tools/test/h5dump/expected/tordergr1.ddl diff --git a/tools/testfiles/tordergr2.ddl b/tools/test/h5dump/expected/tordergr2.ddl similarity index 100% rename from tools/testfiles/tordergr2.ddl rename to tools/test/h5dump/expected/tordergr2.ddl diff --git a/tools/testfiles/tordergr3.ddl b/tools/test/h5dump/expected/tordergr3.ddl similarity index 100% rename from tools/testfiles/tordergr3.ddl rename to tools/test/h5dump/expected/tordergr3.ddl diff --git a/tools/testfiles/tordergr4.ddl b/tools/test/h5dump/expected/tordergr4.ddl similarity index 100% rename from tools/testfiles/tordergr4.ddl rename to tools/test/h5dump/expected/tordergr4.ddl diff --git a/tools/testfiles/tordergr5.ddl b/tools/test/h5dump/expected/tordergr5.ddl similarity index 100% rename from tools/testfiles/tordergr5.ddl rename to tools/test/h5dump/expected/tordergr5.ddl diff --git a/tools/testfiles/torderlinks1.ddl b/tools/test/h5dump/expected/torderlinks1.ddl similarity index 100% rename from tools/testfiles/torderlinks1.ddl rename to tools/test/h5dump/expected/torderlinks1.ddl diff --git a/tools/testfiles/torderlinks2.ddl b/tools/test/h5dump/expected/torderlinks2.ddl similarity index 100% rename from tools/testfiles/torderlinks2.ddl rename to tools/test/h5dump/expected/torderlinks2.ddl diff --git a/tools/testfiles/tperror.ddl b/tools/test/h5dump/expected/tperror.ddl similarity index 100% rename from tools/testfiles/tperror.ddl rename to tools/test/h5dump/expected/tperror.ddl diff --git a/tools/testfiles/tqmarkfile.ddl b/tools/test/h5dump/expected/tqmarkfile.ddl similarity index 100% rename from tools/testfiles/tqmarkfile.ddl rename to tools/test/h5dump/expected/tqmarkfile.ddl diff --git a/tools/testfiles/trawdatafile.ddl b/tools/test/h5dump/expected/trawdatafile.ddl similarity index 100% rename from tools/testfiles/trawdatafile.ddl rename to tools/test/h5dump/expected/trawdatafile.ddl diff --git a/tools/testfiles/trawssetfile.ddl b/tools/test/h5dump/expected/trawssetfile.ddl similarity index 100% rename from tools/testfiles/trawssetfile.ddl rename to tools/test/h5dump/expected/trawssetfile.ddl diff --git a/tools/testfiles/treadfilter.ddl b/tools/test/h5dump/expected/treadfilter.ddl similarity index 100% rename from tools/testfiles/treadfilter.ddl rename to tools/test/h5dump/expected/treadfilter.ddl diff --git a/tools/testfiles/treadintfilter.ddl b/tools/test/h5dump/expected/treadintfilter.ddl similarity index 100% rename from tools/testfiles/treadintfilter.ddl rename to tools/test/h5dump/expected/treadintfilter.ddl diff --git a/tools/testfiles/trefer_attrR.ddl b/tools/test/h5dump/expected/trefer_attrR.ddl similarity index 100% rename from tools/testfiles/trefer_attrR.ddl rename to tools/test/h5dump/expected/trefer_attrR.ddl diff --git a/tools/testfiles/trefer_compatR.ddl b/tools/test/h5dump/expected/trefer_compatR.ddl similarity index 100% rename from tools/testfiles/trefer_compatR.ddl rename to tools/test/h5dump/expected/trefer_compatR.ddl diff --git a/tools/testfiles/trefer_extR.ddl b/tools/test/h5dump/expected/trefer_extR.ddl similarity index 100% rename from tools/testfiles/trefer_extR.ddl rename to tools/test/h5dump/expected/trefer_extR.ddl diff --git a/tools/testfiles/trefer_grpR.ddl b/tools/test/h5dump/expected/trefer_grpR.ddl similarity index 100% rename from tools/testfiles/trefer_grpR.ddl rename to tools/test/h5dump/expected/trefer_grpR.ddl diff --git a/tools/testfiles/trefer_objR.ddl b/tools/test/h5dump/expected/trefer_objR.ddl similarity index 100% rename from tools/testfiles/trefer_objR.ddl rename to tools/test/h5dump/expected/trefer_objR.ddl diff --git a/tools/testfiles/trefer_obj_delR.ddl b/tools/test/h5dump/expected/trefer_obj_delR.ddl similarity index 100% rename from tools/testfiles/trefer_obj_delR.ddl rename to tools/test/h5dump/expected/trefer_obj_delR.ddl diff --git a/tools/testfiles/trefer_paramR.ddl b/tools/test/h5dump/expected/trefer_paramR.ddl similarity index 100% rename from tools/testfiles/trefer_paramR.ddl rename to tools/test/h5dump/expected/trefer_paramR.ddl diff --git a/tools/testfiles/trefer_regR.ddl b/tools/test/h5dump/expected/trefer_regR.ddl similarity index 100% rename from tools/testfiles/trefer_regR.ddl rename to tools/test/h5dump/expected/trefer_regR.ddl diff --git a/tools/testfiles/trefer_reg_1dR.ddl b/tools/test/h5dump/expected/trefer_reg_1dR.ddl similarity index 100% rename from tools/testfiles/trefer_reg_1dR.ddl rename to tools/test/h5dump/expected/trefer_reg_1dR.ddl diff --git a/tools/testfiles/treference.ddl b/tools/test/h5dump/expected/treference.ddl similarity index 100% rename from tools/testfiles/treference.ddl rename to tools/test/h5dump/expected/treference.ddl diff --git a/tools/testfiles/tsaf.ddl b/tools/test/h5dump/expected/tsaf.ddl similarity index 100% rename from tools/testfiles/tsaf.ddl rename to tools/test/h5dump/expected/tsaf.ddl diff --git a/tools/testfiles/tscalarattrintsize.ddl b/tools/test/h5dump/expected/tscalarattrintsize.ddl similarity index 100% rename from tools/testfiles/tscalarattrintsize.ddl rename to tools/test/h5dump/expected/tscalarattrintsize.ddl diff --git a/tools/testfiles/tscalarintattrsize.ddl b/tools/test/h5dump/expected/tscalarintattrsize.ddl similarity index 100% rename from tools/testfiles/tscalarintattrsize.ddl rename to tools/test/h5dump/expected/tscalarintattrsize.ddl diff --git a/tools/testfiles/tscalarintsize.ddl b/tools/test/h5dump/expected/tscalarintsize.ddl similarity index 100% rename from tools/testfiles/tscalarintsize.ddl rename to tools/test/h5dump/expected/tscalarintsize.ddl diff --git a/tools/testfiles/tscalarstring.ddl b/tools/test/h5dump/expected/tscalarstring.ddl similarity index 100% rename from tools/testfiles/tscalarstring.ddl rename to tools/test/h5dump/expected/tscalarstring.ddl diff --git a/tools/testfiles/tscaleoffset.ddl b/tools/test/h5dump/expected/tscaleoffset.ddl similarity index 100% rename from tools/testfiles/tscaleoffset.ddl rename to tools/test/h5dump/expected/tscaleoffset.ddl diff --git a/tools/testfiles/tshuffle.ddl b/tools/test/h5dump/expected/tshuffle.ddl similarity index 100% rename from tools/testfiles/tshuffle.ddl rename to tools/test/h5dump/expected/tshuffle.ddl diff --git a/tools/testfiles/tslink-1.ddl b/tools/test/h5dump/expected/tslink-1.ddl similarity index 100% rename from tools/testfiles/tslink-1.ddl rename to tools/test/h5dump/expected/tslink-1.ddl diff --git a/tools/testfiles/tslink-2.ddl b/tools/test/h5dump/expected/tslink-2.ddl similarity index 100% rename from tools/testfiles/tslink-2.ddl rename to tools/test/h5dump/expected/tslink-2.ddl diff --git a/tools/testfiles/tslink-D.ddl b/tools/test/h5dump/expected/tslink-D.ddl similarity index 100% rename from tools/testfiles/tslink-D.ddl rename to tools/test/h5dump/expected/tslink-D.ddl diff --git a/tools/testfiles/tsplit_file.ddl b/tools/test/h5dump/expected/tsplit_file.ddl similarity index 100% rename from tools/testfiles/tsplit_file.ddl rename to tools/test/h5dump/expected/tsplit_file.ddl diff --git a/tools/testfiles/tst_onion_dset_1d.ddl b/tools/test/h5dump/expected/tst_onion_dset_1d.ddl similarity index 100% rename from tools/testfiles/tst_onion_dset_1d.ddl rename to tools/test/h5dump/expected/tst_onion_dset_1d.ddl diff --git a/tools/testfiles/tst_onion_dset_ext.ddl b/tools/test/h5dump/expected/tst_onion_dset_ext.ddl similarity index 100% rename from tools/testfiles/tst_onion_dset_ext.ddl rename to tools/test/h5dump/expected/tst_onion_dset_ext.ddl diff --git a/tools/testfiles/tst_onion_objs.ddl b/tools/test/h5dump/expected/tst_onion_objs.ddl similarity index 100% rename from tools/testfiles/tst_onion_objs.ddl rename to tools/test/h5dump/expected/tst_onion_objs.ddl diff --git a/tools/testfiles/tst_onion_revision_count.ddl b/tools/test/h5dump/expected/tst_onion_revision_count.ddl similarity index 100% rename from tools/testfiles/tst_onion_revision_count.ddl rename to tools/test/h5dump/expected/tst_onion_revision_count.ddl diff --git a/tools/testfiles/tstarfile.ddl b/tools/test/h5dump/expected/tstarfile.ddl similarity index 100% rename from tools/testfiles/tstarfile.ddl rename to tools/test/h5dump/expected/tstarfile.ddl diff --git a/tools/testfiles/tstr-1.ddl b/tools/test/h5dump/expected/tstr-1.ddl similarity index 100% rename from tools/testfiles/tstr-1.ddl rename to tools/test/h5dump/expected/tstr-1.ddl diff --git a/tools/testfiles/tstr-2.ddl b/tools/test/h5dump/expected/tstr-2.ddl similarity index 100% rename from tools/testfiles/tstr-2.ddl rename to tools/test/h5dump/expected/tstr-2.ddl diff --git a/tools/testfiles/tstring.ddl b/tools/test/h5dump/expected/tstring.ddl similarity index 100% rename from tools/testfiles/tstring.ddl rename to tools/test/h5dump/expected/tstring.ddl diff --git a/tools/testfiles/tstring2.ddl b/tools/test/h5dump/expected/tstring2.ddl similarity index 100% rename from tools/testfiles/tstring2.ddl rename to tools/test/h5dump/expected/tstring2.ddl diff --git a/tools/testfiles/tstringe.ddl b/tools/test/h5dump/expected/tstringe.ddl similarity index 100% rename from tools/testfiles/tstringe.ddl rename to tools/test/h5dump/expected/tstringe.ddl diff --git a/tools/testfiles/tszip.ddl b/tools/test/h5dump/expected/tszip.ddl similarity index 100% rename from tools/testfiles/tszip.ddl rename to tools/test/h5dump/expected/tszip.ddl diff --git a/tools/testfiles/tudfilter.ddl b/tools/test/h5dump/expected/tudfilter.ddl similarity index 100% rename from tools/testfiles/tudfilter.ddl rename to tools/test/h5dump/expected/tudfilter.ddl diff --git a/tools/testfiles/tudlink-1.ddl b/tools/test/h5dump/expected/tudlink-1.ddl similarity index 100% rename from tools/testfiles/tudlink-1.ddl rename to tools/test/h5dump/expected/tudlink-1.ddl diff --git a/tools/testfiles/tudlink-2.ddl b/tools/test/h5dump/expected/tudlink-2.ddl similarity index 100% rename from tools/testfiles/tudlink-2.ddl rename to tools/test/h5dump/expected/tudlink-2.ddl diff --git a/tools/testfiles/tuserfilter.ddl b/tools/test/h5dump/expected/tuserfilter.ddl similarity index 100% rename from tools/testfiles/tuserfilter.ddl rename to tools/test/h5dump/expected/tuserfilter.ddl diff --git a/tools/testfiles/tvldtypes1.ddl b/tools/test/h5dump/expected/tvldtypes1.ddl similarity index 100% rename from tools/testfiles/tvldtypes1.ddl rename to tools/test/h5dump/expected/tvldtypes1.ddl diff --git a/tools/testfiles/tvldtypes2.ddl b/tools/test/h5dump/expected/tvldtypes2.ddl similarity index 100% rename from tools/testfiles/tvldtypes2.ddl rename to tools/test/h5dump/expected/tvldtypes2.ddl diff --git a/tools/testfiles/tvldtypes3.ddl b/tools/test/h5dump/expected/tvldtypes3.ddl similarity index 100% rename from tools/testfiles/tvldtypes3.ddl rename to tools/test/h5dump/expected/tvldtypes3.ddl diff --git a/tools/testfiles/tvldtypes4.ddl b/tools/test/h5dump/expected/tvldtypes4.ddl similarity index 100% rename from tools/testfiles/tvldtypes4.ddl rename to tools/test/h5dump/expected/tvldtypes4.ddl diff --git a/tools/testfiles/tvldtypes5.ddl b/tools/test/h5dump/expected/tvldtypes5.ddl similarity index 100% rename from tools/testfiles/tvldtypes5.ddl rename to tools/test/h5dump/expected/tvldtypes5.ddl diff --git a/tools/testfiles/tvlenstr_array.ddl b/tools/test/h5dump/expected/tvlenstr_array.ddl similarity index 100% rename from tools/testfiles/tvlenstr_array.ddl rename to tools/test/h5dump/expected/tvlenstr_array.ddl diff --git a/tools/testfiles/tvlstr.ddl b/tools/test/h5dump/expected/tvlstr.ddl similarity index 100% rename from tools/testfiles/tvlstr.ddl rename to tools/test/h5dump/expected/tvlstr.ddl diff --git a/tools/testfiles/tvms.ddl b/tools/test/h5dump/expected/tvms.ddl similarity index 100% rename from tools/testfiles/tvms.ddl rename to tools/test/h5dump/expected/tvms.ddl diff --git a/tools/testfiles/twidedisplay.ddl b/tools/test/h5dump/expected/twidedisplay.ddl similarity index 100% rename from tools/testfiles/twidedisplay.ddl rename to tools/test/h5dump/expected/twidedisplay.ddl diff --git a/tools/testfiles/twithddlfile.ddl b/tools/test/h5dump/expected/twithddlfile.ddl similarity index 100% rename from tools/testfiles/twithddlfile.ddl rename to tools/test/h5dump/expected/twithddlfile.ddl diff --git a/tools/testfiles/vds/tvds-1.ddl b/tools/test/h5dump/expected/vds/tvds-1.ddl similarity index 100% rename from tools/testfiles/vds/tvds-1.ddl rename to tools/test/h5dump/expected/vds/tvds-1.ddl diff --git a/tools/testfiles/vds/tvds-2.ddl b/tools/test/h5dump/expected/vds/tvds-2.ddl similarity index 100% rename from tools/testfiles/vds/tvds-2.ddl rename to tools/test/h5dump/expected/vds/tvds-2.ddl diff --git a/tools/testfiles/vds/tvds-3_1.ddl b/tools/test/h5dump/expected/vds/tvds-3_1.ddl similarity index 100% rename from tools/testfiles/vds/tvds-3_1.ddl rename to tools/test/h5dump/expected/vds/tvds-3_1.ddl diff --git a/tools/testfiles/vds/tvds-3_2.ddl b/tools/test/h5dump/expected/vds/tvds-3_2.ddl similarity index 100% rename from tools/testfiles/vds/tvds-3_2.ddl rename to tools/test/h5dump/expected/vds/tvds-3_2.ddl diff --git a/tools/testfiles/vds/tvds-4.ddl b/tools/test/h5dump/expected/vds/tvds-4.ddl similarity index 100% rename from tools/testfiles/vds/tvds-4.ddl rename to tools/test/h5dump/expected/vds/tvds-4.ddl diff --git a/tools/testfiles/vds/tvds-5.ddl b/tools/test/h5dump/expected/vds/tvds-5.ddl similarity index 100% rename from tools/testfiles/vds/tvds-5.ddl rename to tools/test/h5dump/expected/vds/tvds-5.ddl diff --git a/tools/testfiles/vds/tvds_layout-1.ddl b/tools/test/h5dump/expected/vds/tvds_layout-1.ddl similarity index 100% rename from tools/testfiles/vds/tvds_layout-1.ddl rename to tools/test/h5dump/expected/vds/tvds_layout-1.ddl diff --git a/tools/testfiles/vds/tvds_layout-2.ddl b/tools/test/h5dump/expected/vds/tvds_layout-2.ddl similarity index 100% rename from tools/testfiles/vds/tvds_layout-2.ddl rename to tools/test/h5dump/expected/vds/tvds_layout-2.ddl diff --git a/tools/testfiles/vds/tvds_layout-3_1.ddl b/tools/test/h5dump/expected/vds/tvds_layout-3_1.ddl similarity index 100% rename from tools/testfiles/vds/tvds_layout-3_1.ddl rename to tools/test/h5dump/expected/vds/tvds_layout-3_1.ddl diff --git a/tools/testfiles/vds/tvds_layout-3_2.ddl b/tools/test/h5dump/expected/vds/tvds_layout-3_2.ddl similarity index 100% rename from tools/testfiles/vds/tvds_layout-3_2.ddl rename to tools/test/h5dump/expected/vds/tvds_layout-3_2.ddl diff --git a/tools/testfiles/vds/tvds_layout-4.ddl b/tools/test/h5dump/expected/vds/tvds_layout-4.ddl similarity index 100% rename from tools/testfiles/vds/tvds_layout-4.ddl rename to tools/test/h5dump/expected/vds/tvds_layout-4.ddl diff --git a/tools/testfiles/vds/tvds_layout-5.ddl b/tools/test/h5dump/expected/vds/tvds_layout-5.ddl similarity index 100% rename from tools/testfiles/vds/tvds_layout-5.ddl rename to tools/test/h5dump/expected/vds/tvds_layout-5.ddl diff --git a/tools/testfiles/vds/vds-first.ddl b/tools/test/h5dump/expected/vds/vds-first.ddl similarity index 100% rename from tools/testfiles/vds/vds-first.ddl rename to tools/test/h5dump/expected/vds/vds-first.ddl diff --git a/tools/testfiles/vds/vds-gap1.ddl b/tools/test/h5dump/expected/vds/vds-gap1.ddl similarity index 100% rename from tools/testfiles/vds/vds-gap1.ddl rename to tools/test/h5dump/expected/vds/vds-gap1.ddl diff --git a/tools/testfiles/vds/vds-gap2.ddl b/tools/test/h5dump/expected/vds/vds-gap2.ddl similarity index 100% rename from tools/testfiles/vds/vds-gap2.ddl rename to tools/test/h5dump/expected/vds/vds-gap2.ddl diff --git a/tools/testfiles/vds/vds_layout-eiger.ddl b/tools/test/h5dump/expected/vds/vds_layout-eiger.ddl similarity index 100% rename from tools/testfiles/vds/vds_layout-eiger.ddl rename to tools/test/h5dump/expected/vds/vds_layout-eiger.ddl diff --git a/tools/testfiles/vds/vds_layout-maxmin.ddl b/tools/test/h5dump/expected/vds/vds_layout-maxmin.ddl similarity index 100% rename from tools/testfiles/vds/vds_layout-maxmin.ddl rename to tools/test/h5dump/expected/vds/vds_layout-maxmin.ddl diff --git a/tools/testfiles/tall-2A.h5.xml b/tools/test/h5dump/expected/xml/tall-2A.h5.xml similarity index 100% rename from tools/testfiles/tall-2A.h5.xml rename to tools/test/h5dump/expected/xml/tall-2A.h5.xml diff --git a/tools/testfiles/tall.h5.xml b/tools/test/h5dump/expected/xml/tall.h5.xml similarity index 100% rename from tools/testfiles/tall.h5.xml rename to tools/test/h5dump/expected/xml/tall.h5.xml diff --git a/tools/testfiles/tarray1.h5.xml b/tools/test/h5dump/expected/xml/tarray1.h5.xml similarity index 100% rename from tools/testfiles/tarray1.h5.xml rename to tools/test/h5dump/expected/xml/tarray1.h5.xml diff --git a/tools/testfiles/tarray2.h5.xml b/tools/test/h5dump/expected/xml/tarray2.h5.xml similarity index 100% rename from tools/testfiles/tarray2.h5.xml rename to tools/test/h5dump/expected/xml/tarray2.h5.xml diff --git a/tools/testfiles/tarray3.h5.xml b/tools/test/h5dump/expected/xml/tarray3.h5.xml similarity index 100% rename from tools/testfiles/tarray3.h5.xml rename to tools/test/h5dump/expected/xml/tarray3.h5.xml diff --git a/tools/testfiles/tarray6.h5.xml b/tools/test/h5dump/expected/xml/tarray6.h5.xml similarity index 100% rename from tools/testfiles/tarray6.h5.xml rename to tools/test/h5dump/expected/xml/tarray6.h5.xml diff --git a/tools/testfiles/tarray7.h5.xml b/tools/test/h5dump/expected/xml/tarray7.h5.xml similarity index 100% rename from tools/testfiles/tarray7.h5.xml rename to tools/test/h5dump/expected/xml/tarray7.h5.xml diff --git a/tools/testfiles/tattr.h5.xml b/tools/test/h5dump/expected/xml/tattr.h5.xml similarity index 100% rename from tools/testfiles/tattr.h5.xml rename to tools/test/h5dump/expected/xml/tattr.h5.xml diff --git a/tools/testfiles/tbitfields_be.h5.xml b/tools/test/h5dump/expected/xml/tbitfields_be.h5.xml similarity index 100% rename from tools/testfiles/tbitfields_be.h5.xml rename to tools/test/h5dump/expected/xml/tbitfields_be.h5.xml diff --git a/tools/testfiles/tbitfields_le.h5.xml b/tools/test/h5dump/expected/xml/tbitfields_le.h5.xml similarity index 100% rename from tools/testfiles/tbitfields_le.h5.xml rename to tools/test/h5dump/expected/xml/tbitfields_le.h5.xml diff --git a/tools/testfiles/tcompound.h5.xml b/tools/test/h5dump/expected/xml/tcompound.h5.xml similarity index 100% rename from tools/testfiles/tcompound.h5.xml rename to tools/test/h5dump/expected/xml/tcompound.h5.xml diff --git a/tools/testfiles/tcompound2.h5.xml b/tools/test/h5dump/expected/xml/tcompound2.h5.xml similarity index 100% rename from tools/testfiles/tcompound2.h5.xml rename to tools/test/h5dump/expected/xml/tcompound2.h5.xml diff --git a/tools/testfiles/tcompound_complex.h5.xml b/tools/test/h5dump/expected/xml/tcompound_complex.h5.xml similarity index 100% rename from tools/testfiles/tcompound_complex.h5.xml rename to tools/test/h5dump/expected/xml/tcompound_complex.h5.xml diff --git a/tools/testfiles/tdatareg.h5.xml b/tools/test/h5dump/expected/xml/tdatareg.h5.xml similarity index 100% rename from tools/testfiles/tdatareg.h5.xml rename to tools/test/h5dump/expected/xml/tdatareg.h5.xml diff --git a/tools/testfiles/tdset.h5.xml b/tools/test/h5dump/expected/xml/tdset.h5.xml similarity index 100% rename from tools/testfiles/tdset.h5.xml rename to tools/test/h5dump/expected/xml/tdset.h5.xml diff --git a/tools/testfiles/tdset2.h5.xml b/tools/test/h5dump/expected/xml/tdset2.h5.xml similarity index 100% rename from tools/testfiles/tdset2.h5.xml rename to tools/test/h5dump/expected/xml/tdset2.h5.xml diff --git a/tools/testfiles/tempty-dtd-2.h5.xml b/tools/test/h5dump/expected/xml/tempty-dtd-2.h5.xml similarity index 100% rename from tools/testfiles/tempty-dtd-2.h5.xml rename to tools/test/h5dump/expected/xml/tempty-dtd-2.h5.xml diff --git a/tools/testfiles/tempty-dtd-uri.h5.xml b/tools/test/h5dump/expected/xml/tempty-dtd-uri.h5.xml similarity index 100% rename from tools/testfiles/tempty-dtd-uri.h5.xml rename to tools/test/h5dump/expected/xml/tempty-dtd-uri.h5.xml diff --git a/tools/testfiles/tempty-dtd.h5.xml b/tools/test/h5dump/expected/xml/tempty-dtd.h5.xml similarity index 100% rename from tools/testfiles/tempty-dtd.h5.xml rename to tools/test/h5dump/expected/xml/tempty-dtd.h5.xml diff --git a/tools/testfiles/tempty-nons-2.h5.xml b/tools/test/h5dump/expected/xml/tempty-nons-2.h5.xml similarity index 100% rename from tools/testfiles/tempty-nons-2.h5.xml rename to tools/test/h5dump/expected/xml/tempty-nons-2.h5.xml diff --git a/tools/testfiles/tempty-nons-uri.h5.xml b/tools/test/h5dump/expected/xml/tempty-nons-uri.h5.xml similarity index 100% rename from tools/testfiles/tempty-nons-uri.h5.xml rename to tools/test/h5dump/expected/xml/tempty-nons-uri.h5.xml diff --git a/tools/testfiles/tempty-nons.h5.xml b/tools/test/h5dump/expected/xml/tempty-nons.h5.xml similarity index 100% rename from tools/testfiles/tempty-nons.h5.xml rename to tools/test/h5dump/expected/xml/tempty-nons.h5.xml diff --git a/tools/testfiles/tempty-ns-2.h5.xml b/tools/test/h5dump/expected/xml/tempty-ns-2.h5.xml similarity index 100% rename from tools/testfiles/tempty-ns-2.h5.xml rename to tools/test/h5dump/expected/xml/tempty-ns-2.h5.xml diff --git a/tools/testfiles/tempty-ns.h5.xml b/tools/test/h5dump/expected/xml/tempty-ns.h5.xml similarity index 100% rename from tools/testfiles/tempty-ns.h5.xml rename to tools/test/h5dump/expected/xml/tempty-ns.h5.xml diff --git a/tools/testfiles/tempty.h5.xml b/tools/test/h5dump/expected/xml/tempty.h5.xml similarity index 100% rename from tools/testfiles/tempty.h5.xml rename to tools/test/h5dump/expected/xml/tempty.h5.xml diff --git a/tools/testfiles/tenum.h5.xml b/tools/test/h5dump/expected/xml/tenum.h5.xml similarity index 100% rename from tools/testfiles/tenum.h5.xml rename to tools/test/h5dump/expected/xml/tenum.h5.xml diff --git a/tools/testfiles/test35.nc.xml b/tools/test/h5dump/expected/xml/test35.nc.xml similarity index 100% rename from tools/testfiles/test35.nc.xml rename to tools/test/h5dump/expected/xml/test35.nc.xml diff --git a/tools/testfiles/textlink.h5.xml b/tools/test/h5dump/expected/xml/textlink.h5.xml similarity index 100% rename from tools/testfiles/textlink.h5.xml rename to tools/test/h5dump/expected/xml/textlink.h5.xml diff --git a/tools/testfiles/tfpformat.h5.xml b/tools/test/h5dump/expected/xml/tfpformat.h5.xml similarity index 100% rename from tools/testfiles/tfpformat.h5.xml rename to tools/test/h5dump/expected/xml/tfpformat.h5.xml diff --git a/tools/testfiles/tgroup.h5.xml b/tools/test/h5dump/expected/xml/tgroup.h5.xml similarity index 100% rename from tools/testfiles/tgroup.h5.xml rename to tools/test/h5dump/expected/xml/tgroup.h5.xml diff --git a/tools/testfiles/thlink.h5.xml b/tools/test/h5dump/expected/xml/thlink.h5.xml similarity index 100% rename from tools/testfiles/thlink.h5.xml rename to tools/test/h5dump/expected/xml/thlink.h5.xml diff --git a/tools/testfiles/tloop.h5.xml b/tools/test/h5dump/expected/xml/tloop.h5.xml similarity index 100% rename from tools/testfiles/tloop.h5.xml rename to tools/test/h5dump/expected/xml/tloop.h5.xml diff --git a/tools/testfiles/tloop2.h5.xml b/tools/test/h5dump/expected/xml/tloop2.h5.xml similarity index 100% rename from tools/testfiles/tloop2.h5.xml rename to tools/test/h5dump/expected/xml/tloop2.h5.xml diff --git a/tools/testfiles/tmany.h5.xml b/tools/test/h5dump/expected/xml/tmany.h5.xml similarity index 100% rename from tools/testfiles/tmany.h5.xml rename to tools/test/h5dump/expected/xml/tmany.h5.xml diff --git a/tools/testfiles/tname-amp.h5.xml b/tools/test/h5dump/expected/xml/tname-amp.h5.xml similarity index 100% rename from tools/testfiles/tname-amp.h5.xml rename to tools/test/h5dump/expected/xml/tname-amp.h5.xml diff --git a/tools/testfiles/tname-apos.h5.xml b/tools/test/h5dump/expected/xml/tname-apos.h5.xml similarity index 100% rename from tools/testfiles/tname-apos.h5.xml rename to tools/test/h5dump/expected/xml/tname-apos.h5.xml diff --git a/tools/testfiles/tname-gt.h5.xml b/tools/test/h5dump/expected/xml/tname-gt.h5.xml similarity index 100% rename from tools/testfiles/tname-gt.h5.xml rename to tools/test/h5dump/expected/xml/tname-gt.h5.xml diff --git a/tools/testfiles/tname-lt.h5.xml b/tools/test/h5dump/expected/xml/tname-lt.h5.xml similarity index 100% rename from tools/testfiles/tname-lt.h5.xml rename to tools/test/h5dump/expected/xml/tname-lt.h5.xml diff --git a/tools/testfiles/tname-quot.h5.xml b/tools/test/h5dump/expected/xml/tname-quot.h5.xml similarity index 100% rename from tools/testfiles/tname-quot.h5.xml rename to tools/test/h5dump/expected/xml/tname-quot.h5.xml diff --git a/tools/testfiles/tname-sp.h5.xml b/tools/test/h5dump/expected/xml/tname-sp.h5.xml similarity index 100% rename from tools/testfiles/tname-sp.h5.xml rename to tools/test/h5dump/expected/xml/tname-sp.h5.xml diff --git a/tools/testfiles/tnamed_dtype_attr.h5.xml b/tools/test/h5dump/expected/xml/tnamed_dtype_attr.h5.xml similarity index 100% rename from tools/testfiles/tnamed_dtype_attr.h5.xml rename to tools/test/h5dump/expected/xml/tnamed_dtype_attr.h5.xml diff --git a/tools/testfiles/tnestedcomp.h5.xml b/tools/test/h5dump/expected/xml/tnestedcomp.h5.xml similarity index 100% rename from tools/testfiles/tnestedcomp.h5.xml rename to tools/test/h5dump/expected/xml/tnestedcomp.h5.xml diff --git a/tools/testfiles/tnodata.h5.xml b/tools/test/h5dump/expected/xml/tnodata.h5.xml similarity index 100% rename from tools/testfiles/tnodata.h5.xml rename to tools/test/h5dump/expected/xml/tnodata.h5.xml diff --git a/tools/testfiles/tnullspace.h5.xml b/tools/test/h5dump/expected/xml/tnullspace.h5.xml similarity index 100% rename from tools/testfiles/tnullspace.h5.xml rename to tools/test/h5dump/expected/xml/tnullspace.h5.xml diff --git a/tools/testfiles/tobjref.h5.xml b/tools/test/h5dump/expected/xml/tobjref.h5.xml similarity index 100% rename from tools/testfiles/tobjref.h5.xml rename to tools/test/h5dump/expected/xml/tobjref.h5.xml diff --git a/tools/testfiles/topaque.h5.xml b/tools/test/h5dump/expected/xml/topaque.h5.xml similarity index 100% rename from tools/testfiles/topaque.h5.xml rename to tools/test/h5dump/expected/xml/topaque.h5.xml diff --git a/tools/testfiles/torderattr1.h5.xml b/tools/test/h5dump/expected/xml/torderattr1.h5.xml similarity index 100% rename from tools/testfiles/torderattr1.h5.xml rename to tools/test/h5dump/expected/xml/torderattr1.h5.xml diff --git a/tools/testfiles/torderattr2.h5.xml b/tools/test/h5dump/expected/xml/torderattr2.h5.xml similarity index 100% rename from tools/testfiles/torderattr2.h5.xml rename to tools/test/h5dump/expected/xml/torderattr2.h5.xml diff --git a/tools/testfiles/torderattr3.h5.xml b/tools/test/h5dump/expected/xml/torderattr3.h5.xml similarity index 100% rename from tools/testfiles/torderattr3.h5.xml rename to tools/test/h5dump/expected/xml/torderattr3.h5.xml diff --git a/tools/testfiles/torderattr4.h5.xml b/tools/test/h5dump/expected/xml/torderattr4.h5.xml similarity index 100% rename from tools/testfiles/torderattr4.h5.xml rename to tools/test/h5dump/expected/xml/torderattr4.h5.xml diff --git a/tools/testfiles/tref-escapes-at.h5.xml b/tools/test/h5dump/expected/xml/tref-escapes-at.h5.xml similarity index 100% rename from tools/testfiles/tref-escapes-at.h5.xml rename to tools/test/h5dump/expected/xml/tref-escapes-at.h5.xml diff --git a/tools/testfiles/tref-escapes.h5.xml b/tools/test/h5dump/expected/xml/tref-escapes.h5.xml similarity index 100% rename from tools/testfiles/tref-escapes.h5.xml rename to tools/test/h5dump/expected/xml/tref-escapes.h5.xml diff --git a/tools/testfiles/tref.h5.xml b/tools/test/h5dump/expected/xml/tref.h5.xml similarity index 100% rename from tools/testfiles/tref.h5.xml rename to tools/test/h5dump/expected/xml/tref.h5.xml diff --git a/tools/testfiles/tsaf.h5.xml b/tools/test/h5dump/expected/xml/tsaf.h5.xml similarity index 100% rename from tools/testfiles/tsaf.h5.xml rename to tools/test/h5dump/expected/xml/tsaf.h5.xml diff --git a/tools/testfiles/tslink.h5.xml b/tools/test/h5dump/expected/xml/tslink.h5.xml similarity index 100% rename from tools/testfiles/tslink.h5.xml rename to tools/test/h5dump/expected/xml/tslink.h5.xml diff --git a/tools/testfiles/tstr.h5.xml b/tools/test/h5dump/expected/xml/tstr.h5.xml similarity index 100% rename from tools/testfiles/tstr.h5.xml rename to tools/test/h5dump/expected/xml/tstr.h5.xml diff --git a/tools/testfiles/tstr2.h5.xml b/tools/test/h5dump/expected/xml/tstr2.h5.xml similarity index 100% rename from tools/testfiles/tstr2.h5.xml rename to tools/test/h5dump/expected/xml/tstr2.h5.xml diff --git a/tools/testfiles/tstring-at.h5.xml b/tools/test/h5dump/expected/xml/tstring-at.h5.xml similarity index 100% rename from tools/testfiles/tstring-at.h5.xml rename to tools/test/h5dump/expected/xml/tstring-at.h5.xml diff --git a/tools/testfiles/tstring.h5.xml b/tools/test/h5dump/expected/xml/tstring.h5.xml similarity index 100% rename from tools/testfiles/tstring.h5.xml rename to tools/test/h5dump/expected/xml/tstring.h5.xml diff --git a/tools/testfiles/tudlink.h5.xml b/tools/test/h5dump/expected/xml/tudlink.h5.xml similarity index 100% rename from tools/testfiles/tudlink.h5.xml rename to tools/test/h5dump/expected/xml/tudlink.h5.xml diff --git a/tools/testfiles/tvldtypes1.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes1.h5.xml similarity index 100% rename from tools/testfiles/tvldtypes1.h5.xml rename to tools/test/h5dump/expected/xml/tvldtypes1.h5.xml diff --git a/tools/testfiles/tvldtypes2.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes2.h5.xml similarity index 100% rename from tools/testfiles/tvldtypes2.h5.xml rename to tools/test/h5dump/expected/xml/tvldtypes2.h5.xml diff --git a/tools/testfiles/tvldtypes3.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes3.h5.xml similarity index 100% rename from tools/testfiles/tvldtypes3.h5.xml rename to tools/test/h5dump/expected/xml/tvldtypes3.h5.xml diff --git a/tools/testfiles/tvldtypes4.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes4.h5.xml similarity index 100% rename from tools/testfiles/tvldtypes4.h5.xml rename to tools/test/h5dump/expected/xml/tvldtypes4.h5.xml diff --git a/tools/testfiles/tvldtypes5.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes5.h5.xml similarity index 100% rename from tools/testfiles/tvldtypes5.h5.xml rename to tools/test/h5dump/expected/xml/tvldtypes5.h5.xml diff --git a/tools/testfiles/tvlstr.h5.xml b/tools/test/h5dump/expected/xml/tvlstr.h5.xml similarity index 100% rename from tools/testfiles/tvlstr.h5.xml rename to tools/test/h5dump/expected/xml/tvlstr.h5.xml diff --git a/tools/testfiles/zerodim.ddl b/tools/test/h5dump/expected/zerodim.ddl similarity index 100% rename from tools/testfiles/zerodim.ddl rename to tools/test/h5dump/expected/zerodim.ddl diff --git a/tools/testfiles/tall-6.exp b/tools/test/h5dump/exportfiles/tall-6.exp similarity index 100% rename from tools/testfiles/tall-6.exp rename to tools/test/h5dump/exportfiles/tall-6.exp diff --git a/tools/testfiles/tbinregR.exp b/tools/test/h5dump/exportfiles/tbinregR.exp similarity index 100% rename from tools/testfiles/tbinregR.exp rename to tools/test/h5dump/exportfiles/tbinregR.exp diff --git a/tools/testfiles/tnoddlfile.exp b/tools/test/h5dump/exportfiles/tnoddlfile.exp similarity index 100% rename from tools/testfiles/tnoddlfile.exp rename to tools/test/h5dump/exportfiles/tnoddlfile.exp diff --git a/tools/testfiles/trawdatafile.exp b/tools/test/h5dump/exportfiles/trawdatafile.exp similarity index 100% rename from tools/testfiles/trawdatafile.exp rename to tools/test/h5dump/exportfiles/trawdatafile.exp diff --git a/tools/testfiles/trawssetfile.exp b/tools/test/h5dump/exportfiles/trawssetfile.exp similarity index 100% rename from tools/testfiles/trawssetfile.exp rename to tools/test/h5dump/exportfiles/trawssetfile.exp diff --git a/tools/testfiles/tstr2bin2.exp b/tools/test/h5dump/exportfiles/tstr2bin2.exp similarity index 100% rename from tools/testfiles/tstr2bin2.exp rename to tools/test/h5dump/exportfiles/tstr2bin2.exp diff --git a/tools/testfiles/tstr2bin6.exp b/tools/test/h5dump/exportfiles/tstr2bin6.exp similarity index 100% rename from tools/testfiles/tstr2bin6.exp rename to tools/test/h5dump/exportfiles/tstr2bin6.exp diff --git a/tools/testfiles/twithddl.exp b/tools/test/h5dump/exportfiles/twithddl.exp similarity index 100% rename from tools/testfiles/twithddl.exp rename to tools/test/h5dump/exportfiles/twithddl.exp diff --git a/tools/testfiles/twithddlfile.exp b/tools/test/h5dump/exportfiles/twithddlfile.exp similarity index 100% rename from tools/testfiles/twithddlfile.exp rename to tools/test/h5dump/exportfiles/twithddlfile.exp diff --git a/tools/test/h5dump/h5dump_plugin.sh.in b/tools/test/h5dump/h5dump_plugin.sh.in index d9b77ee1017..d080c1da6a8 100644 --- a/tools/test/h5dump/h5dump_plugin.sh.in +++ b/tools/test/h5dump/h5dump_plugin.sh.in @@ -45,8 +45,8 @@ AWK='awk' SRC_TOOLS="$srcdir/../.." # testfiles source dirs for tools -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" +SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected" TESTDIR=./testplug test -d $TESTDIR || mkdir $TESTDIR @@ -62,7 +62,7 @@ test -d $TESTDIR || mkdir $TESTDIR # -------------------------------------------------------------------- LIST_HDF5_TEST_FILES=" $SRC_H5DUMP_TESTFILES/tudfilter.h5 -$SRC_H5DUMP_TESTFILES/tudfilter.ddl +$SRC_H5DUMP_OUTFILES/tudfilter.ddl " # RUNSERIAL is used. Check if it can return exit code from executable correctly. diff --git a/tools/testfiles/charsets.h5 b/tools/test/h5dump/testfiles/charsets.h5 similarity index 100% rename from tools/testfiles/charsets.h5 rename to tools/test/h5dump/testfiles/charsets.h5 diff --git a/tools/testfiles/err_attr_dspace.h5 b/tools/test/h5dump/testfiles/err_attr_dspace.h5 similarity index 100% rename from tools/testfiles/err_attr_dspace.h5 rename to tools/test/h5dump/testfiles/err_attr_dspace.h5 diff --git a/tools/testfiles/file_space.h5 b/tools/test/h5dump/testfiles/file_space.h5 similarity index 100% rename from tools/testfiles/file_space.h5 rename to tools/test/h5dump/testfiles/file_space.h5 diff --git a/tools/testfiles/filter_fail.h5 b/tools/test/h5dump/testfiles/filter_fail.h5 similarity index 100% rename from tools/testfiles/filter_fail.h5 rename to tools/test/h5dump/testfiles/filter_fail.h5 diff --git a/tools/testfiles/packedbits.h5 b/tools/test/h5dump/testfiles/packedbits.h5 similarity index 100% rename from tools/testfiles/packedbits.h5 rename to tools/test/h5dump/testfiles/packedbits.h5 diff --git a/tools/testfiles/t128bit_float.h5 b/tools/test/h5dump/testfiles/t128bit_float.h5 similarity index 100% rename from tools/testfiles/t128bit_float.h5 rename to tools/test/h5dump/testfiles/t128bit_float.h5 diff --git a/tools/testfiles/tCVE-2021-37501_attr_decode.h5 b/tools/test/h5dump/testfiles/tCVE-2021-37501_attr_decode.h5 similarity index 100% rename from tools/testfiles/tCVE-2021-37501_attr_decode.h5 rename to tools/test/h5dump/testfiles/tCVE-2021-37501_attr_decode.h5 diff --git a/tools/testfiles/tCVE_2018_11206_fill_new.h5 b/tools/test/h5dump/testfiles/tCVE_2018_11206_fill_new.h5 similarity index 100% rename from tools/testfiles/tCVE_2018_11206_fill_new.h5 rename to tools/test/h5dump/testfiles/tCVE_2018_11206_fill_new.h5 diff --git a/tools/testfiles/tCVE_2018_11206_fill_old.h5 b/tools/test/h5dump/testfiles/tCVE_2018_11206_fill_old.h5 similarity index 100% rename from tools/testfiles/tCVE_2018_11206_fill_old.h5 rename to tools/test/h5dump/testfiles/tCVE_2018_11206_fill_old.h5 diff --git a/tools/testfiles/taindices.h5 b/tools/test/h5dump/testfiles/taindices.h5 similarity index 100% rename from tools/testfiles/taindices.h5 rename to tools/test/h5dump/testfiles/taindices.h5 diff --git a/tools/testfiles/tall.h5 b/tools/test/h5dump/testfiles/tall.h5 similarity index 100% rename from tools/testfiles/tall.h5 rename to tools/test/h5dump/testfiles/tall.h5 diff --git a/tools/testfiles/tarray1.h5 b/tools/test/h5dump/testfiles/tarray1.h5 similarity index 100% rename from tools/testfiles/tarray1.h5 rename to tools/test/h5dump/testfiles/tarray1.h5 diff --git a/tools/testfiles/tarray1_big.h5 b/tools/test/h5dump/testfiles/tarray1_big.h5 similarity index 100% rename from tools/testfiles/tarray1_big.h5 rename to tools/test/h5dump/testfiles/tarray1_big.h5 diff --git a/tools/testfiles/tarray2.h5 b/tools/test/h5dump/testfiles/tarray2.h5 similarity index 100% rename from tools/testfiles/tarray2.h5 rename to tools/test/h5dump/testfiles/tarray2.h5 diff --git a/tools/testfiles/tarray3.h5 b/tools/test/h5dump/testfiles/tarray3.h5 similarity index 100% rename from tools/testfiles/tarray3.h5 rename to tools/test/h5dump/testfiles/tarray3.h5 diff --git a/tools/testfiles/tarray4.h5 b/tools/test/h5dump/testfiles/tarray4.h5 similarity index 100% rename from tools/testfiles/tarray4.h5 rename to tools/test/h5dump/testfiles/tarray4.h5 diff --git a/tools/testfiles/tarray5.h5 b/tools/test/h5dump/testfiles/tarray5.h5 similarity index 100% rename from tools/testfiles/tarray5.h5 rename to tools/test/h5dump/testfiles/tarray5.h5 diff --git a/tools/testfiles/tarray6.h5 b/tools/test/h5dump/testfiles/tarray6.h5 similarity index 100% rename from tools/testfiles/tarray6.h5 rename to tools/test/h5dump/testfiles/tarray6.h5 diff --git a/tools/testfiles/tarray7.h5 b/tools/test/h5dump/testfiles/tarray7.h5 similarity index 100% rename from tools/testfiles/tarray7.h5 rename to tools/test/h5dump/testfiles/tarray7.h5 diff --git a/tools/testfiles/tarray8.h5 b/tools/test/h5dump/testfiles/tarray8.h5 similarity index 100% rename from tools/testfiles/tarray8.h5 rename to tools/test/h5dump/testfiles/tarray8.h5 diff --git a/tools/testfiles/tattr.h5 b/tools/test/h5dump/testfiles/tattr.h5 similarity index 100% rename from tools/testfiles/tattr.h5 rename to tools/test/h5dump/testfiles/tattr.h5 diff --git a/tools/testfiles/tattr2.h5 b/tools/test/h5dump/testfiles/tattr2.h5 similarity index 100% rename from tools/testfiles/tattr2.h5 rename to tools/test/h5dump/testfiles/tattr2.h5 diff --git a/tools/testfiles/tattr4_be.h5 b/tools/test/h5dump/testfiles/tattr4_be.h5 similarity index 100% rename from tools/testfiles/tattr4_be.h5 rename to tools/test/h5dump/testfiles/tattr4_be.h5 diff --git a/tools/testfiles/tattrintsize.h5 b/tools/test/h5dump/testfiles/tattrintsize.h5 similarity index 100% rename from tools/testfiles/tattrintsize.h5 rename to tools/test/h5dump/testfiles/tattrintsize.h5 diff --git a/tools/testfiles/tattrreg.h5 b/tools/test/h5dump/testfiles/tattrreg.h5 similarity index 100% rename from tools/testfiles/tattrreg.h5 rename to tools/test/h5dump/testfiles/tattrreg.h5 diff --git a/tools/testfiles/tbigdims.h5 b/tools/test/h5dump/testfiles/tbigdims.h5 similarity index 100% rename from tools/testfiles/tbigdims.h5 rename to tools/test/h5dump/testfiles/tbigdims.h5 diff --git a/tools/testfiles/tbinary.h5 b/tools/test/h5dump/testfiles/tbinary.h5 similarity index 100% rename from tools/testfiles/tbinary.h5 rename to tools/test/h5dump/testfiles/tbinary.h5 diff --git a/tools/testfiles/tbitnopaque.h5 b/tools/test/h5dump/testfiles/tbitnopaque.h5 similarity index 100% rename from tools/testfiles/tbitnopaque.h5 rename to tools/test/h5dump/testfiles/tbitnopaque.h5 diff --git a/tools/testfiles/tchar.h5 b/tools/test/h5dump/testfiles/tchar.h5 similarity index 100% rename from tools/testfiles/tchar.h5 rename to tools/test/h5dump/testfiles/tchar.h5 diff --git a/tools/testfiles/tcmpdattrintsize.h5 b/tools/test/h5dump/testfiles/tcmpdattrintsize.h5 similarity index 100% rename from tools/testfiles/tcmpdattrintsize.h5 rename to tools/test/h5dump/testfiles/tcmpdattrintsize.h5 diff --git a/tools/testfiles/tcmpdintarray.h5 b/tools/test/h5dump/testfiles/tcmpdintarray.h5 similarity index 100% rename from tools/testfiles/tcmpdintarray.h5 rename to tools/test/h5dump/testfiles/tcmpdintarray.h5 diff --git a/tools/testfiles/tcmpdints.h5 b/tools/test/h5dump/testfiles/tcmpdints.h5 similarity index 100% rename from tools/testfiles/tcmpdints.h5 rename to tools/test/h5dump/testfiles/tcmpdints.h5 diff --git a/tools/testfiles/tcmpdintsize.h5 b/tools/test/h5dump/testfiles/tcmpdintsize.h5 similarity index 100% rename from tools/testfiles/tcmpdintsize.h5 rename to tools/test/h5dump/testfiles/tcmpdintsize.h5 diff --git a/tools/testfiles/tcompound.h5 b/tools/test/h5dump/testfiles/tcompound.h5 similarity index 100% rename from tools/testfiles/tcompound.h5 rename to tools/test/h5dump/testfiles/tcompound.h5 diff --git a/tools/testfiles/tcompound_complex.h5 b/tools/test/h5dump/testfiles/tcompound_complex.h5 similarity index 100% rename from tools/testfiles/tcompound_complex.h5 rename to tools/test/h5dump/testfiles/tcompound_complex.h5 diff --git a/tools/testfiles/tcompound_complex2.h5 b/tools/test/h5dump/testfiles/tcompound_complex2.h5 similarity index 100% rename from tools/testfiles/tcompound_complex2.h5 rename to tools/test/h5dump/testfiles/tcompound_complex2.h5 diff --git a/tools/testfiles/tdatareg.h5 b/tools/test/h5dump/testfiles/tdatareg.h5 similarity index 100% rename from tools/testfiles/tdatareg.h5 rename to tools/test/h5dump/testfiles/tdatareg.h5 diff --git a/tools/testfiles/tdset.h5 b/tools/test/h5dump/testfiles/tdset.h5 similarity index 100% rename from tools/testfiles/tdset.h5 rename to tools/test/h5dump/testfiles/tdset.h5 diff --git a/tools/testfiles/tempty.h5 b/tools/test/h5dump/testfiles/tempty.h5 similarity index 100% rename from tools/testfiles/tempty.h5 rename to tools/test/h5dump/testfiles/tempty.h5 diff --git a/tools/testfiles/textlink.h5 b/tools/test/h5dump/testfiles/textlink.h5 similarity index 100% rename from tools/testfiles/textlink.h5 rename to tools/test/h5dump/testfiles/textlink.h5 diff --git a/tools/testfiles/textlinkfar.h5 b/tools/test/h5dump/testfiles/textlinkfar.h5 similarity index 100% rename from tools/testfiles/textlinkfar.h5 rename to tools/test/h5dump/testfiles/textlinkfar.h5 diff --git a/tools/testfiles/textlinksrc.h5 b/tools/test/h5dump/testfiles/textlinksrc.h5 similarity index 100% rename from tools/testfiles/textlinksrc.h5 rename to tools/test/h5dump/testfiles/textlinksrc.h5 diff --git a/tools/testfiles/textlinktar.h5 b/tools/test/h5dump/testfiles/textlinktar.h5 similarity index 100% rename from tools/testfiles/textlinktar.h5 rename to tools/test/h5dump/testfiles/textlinktar.h5 diff --git a/tools/testfiles/tfamily00000.h5 b/tools/test/h5dump/testfiles/tfamily00000.h5 similarity index 100% rename from tools/testfiles/tfamily00000.h5 rename to tools/test/h5dump/testfiles/tfamily00000.h5 diff --git a/tools/testfiles/tfamily00001.h5 b/tools/test/h5dump/testfiles/tfamily00001.h5 similarity index 100% rename from tools/testfiles/tfamily00001.h5 rename to tools/test/h5dump/testfiles/tfamily00001.h5 diff --git a/tools/testfiles/tfamily00002.h5 b/tools/test/h5dump/testfiles/tfamily00002.h5 similarity index 100% rename from tools/testfiles/tfamily00002.h5 rename to tools/test/h5dump/testfiles/tfamily00002.h5 diff --git a/tools/testfiles/tfamily00003.h5 b/tools/test/h5dump/testfiles/tfamily00003.h5 similarity index 100% rename from tools/testfiles/tfamily00003.h5 rename to tools/test/h5dump/testfiles/tfamily00003.h5 diff --git a/tools/testfiles/tfamily00004.h5 b/tools/test/h5dump/testfiles/tfamily00004.h5 similarity index 100% rename from tools/testfiles/tfamily00004.h5 rename to tools/test/h5dump/testfiles/tfamily00004.h5 diff --git a/tools/testfiles/tfamily00005.h5 b/tools/test/h5dump/testfiles/tfamily00005.h5 similarity index 100% rename from tools/testfiles/tfamily00005.h5 rename to tools/test/h5dump/testfiles/tfamily00005.h5 diff --git a/tools/testfiles/tfamily00006.h5 b/tools/test/h5dump/testfiles/tfamily00006.h5 similarity index 100% rename from tools/testfiles/tfamily00006.h5 rename to tools/test/h5dump/testfiles/tfamily00006.h5 diff --git a/tools/testfiles/tfamily00007.h5 b/tools/test/h5dump/testfiles/tfamily00007.h5 similarity index 100% rename from tools/testfiles/tfamily00007.h5 rename to tools/test/h5dump/testfiles/tfamily00007.h5 diff --git a/tools/testfiles/tfamily00008.h5 b/tools/test/h5dump/testfiles/tfamily00008.h5 similarity index 100% rename from tools/testfiles/tfamily00008.h5 rename to tools/test/h5dump/testfiles/tfamily00008.h5 diff --git a/tools/testfiles/tfamily00009.h5 b/tools/test/h5dump/testfiles/tfamily00009.h5 similarity index 100% rename from tools/testfiles/tfamily00009.h5 rename to tools/test/h5dump/testfiles/tfamily00009.h5 diff --git a/tools/testfiles/tfamily00010.h5 b/tools/test/h5dump/testfiles/tfamily00010.h5 similarity index 100% rename from tools/testfiles/tfamily00010.h5 rename to tools/test/h5dump/testfiles/tfamily00010.h5 diff --git a/tools/testfiles/tfcontents1.h5 b/tools/test/h5dump/testfiles/tfcontents1.h5 similarity index 100% rename from tools/testfiles/tfcontents1.h5 rename to tools/test/h5dump/testfiles/tfcontents1.h5 diff --git a/tools/testfiles/tfcontents2.h5 b/tools/test/h5dump/testfiles/tfcontents2.h5 similarity index 100% rename from tools/testfiles/tfcontents2.h5 rename to tools/test/h5dump/testfiles/tfcontents2.h5 diff --git a/tools/testfiles/tfilters.h5 b/tools/test/h5dump/testfiles/tfilters.h5 similarity index 100% rename from tools/testfiles/tfilters.h5 rename to tools/test/h5dump/testfiles/tfilters.h5 diff --git a/tools/testfiles/tfloatsattrs.h5 b/tools/test/h5dump/testfiles/tfloatsattrs.h5 similarity index 100% rename from tools/testfiles/tfloatsattrs.h5 rename to tools/test/h5dump/testfiles/tfloatsattrs.h5 diff --git a/tools/testfiles/tfpformat.h5 b/tools/test/h5dump/testfiles/tfpformat.h5 similarity index 100% rename from tools/testfiles/tfpformat.h5 rename to tools/test/h5dump/testfiles/tfpformat.h5 diff --git a/tools/testfiles/tfvalues.h5 b/tools/test/h5dump/testfiles/tfvalues.h5 similarity index 100% rename from tools/testfiles/tfvalues.h5 rename to tools/test/h5dump/testfiles/tfvalues.h5 diff --git a/tools/testfiles/tgroup.h5 b/tools/test/h5dump/testfiles/tgroup.h5 similarity index 100% rename from tools/testfiles/tgroup.h5 rename to tools/test/h5dump/testfiles/tgroup.h5 diff --git a/tools/testfiles/tgrp_comments.h5 b/tools/test/h5dump/testfiles/tgrp_comments.h5 similarity index 100% rename from tools/testfiles/tgrp_comments.h5 rename to tools/test/h5dump/testfiles/tgrp_comments.h5 diff --git a/tools/testfiles/tgrpnullspace.h5 b/tools/test/h5dump/testfiles/tgrpnullspace.h5 similarity index 100% rename from tools/testfiles/tgrpnullspace.h5 rename to tools/test/h5dump/testfiles/tgrpnullspace.h5 diff --git a/tools/testfiles/thlink.h5 b/tools/test/h5dump/testfiles/thlink.h5 similarity index 100% rename from tools/testfiles/thlink.h5 rename to tools/test/h5dump/testfiles/thlink.h5 diff --git a/tools/testfiles/thyperslab.h5 b/tools/test/h5dump/testfiles/thyperslab.h5 similarity index 100% rename from tools/testfiles/thyperslab.h5 rename to tools/test/h5dump/testfiles/thyperslab.h5 diff --git a/tools/testfiles/tints4dims.h5 b/tools/test/h5dump/testfiles/tints4dims.h5 similarity index 100% rename from tools/testfiles/tints4dims.h5 rename to tools/test/h5dump/testfiles/tints4dims.h5 diff --git a/tools/testfiles/tintsattrs.h5 b/tools/test/h5dump/testfiles/tintsattrs.h5 similarity index 100% rename from tools/testfiles/tintsattrs.h5 rename to tools/test/h5dump/testfiles/tintsattrs.h5 diff --git a/tools/testfiles/tintsnodata.h5 b/tools/test/h5dump/testfiles/tintsnodata.h5 similarity index 100% rename from tools/testfiles/tintsnodata.h5 rename to tools/test/h5dump/testfiles/tintsnodata.h5 diff --git a/tools/testfiles/tlarge_objname.h5 b/tools/test/h5dump/testfiles/tlarge_objname.h5 similarity index 100% rename from tools/testfiles/tlarge_objname.h5 rename to tools/test/h5dump/testfiles/tlarge_objname.h5 diff --git a/tools/testfiles/tldouble.h5 b/tools/test/h5dump/testfiles/tldouble.h5 similarity index 100% rename from tools/testfiles/tldouble.h5 rename to tools/test/h5dump/testfiles/tldouble.h5 diff --git a/tools/testfiles/tldouble_scalar.h5 b/tools/test/h5dump/testfiles/tldouble_scalar.h5 similarity index 100% rename from tools/testfiles/tldouble_scalar.h5 rename to tools/test/h5dump/testfiles/tldouble_scalar.h5 diff --git a/tools/testfiles/tlonglinks.h5 b/tools/test/h5dump/testfiles/tlonglinks.h5 similarity index 100% rename from tools/testfiles/tlonglinks.h5 rename to tools/test/h5dump/testfiles/tlonglinks.h5 diff --git a/tools/testfiles/tloop.h5 b/tools/test/h5dump/testfiles/tloop.h5 similarity index 100% rename from tools/testfiles/tloop.h5 rename to tools/test/h5dump/testfiles/tloop.h5 diff --git a/tools/testfiles/tmulti-b.h5 b/tools/test/h5dump/testfiles/tmulti-b.h5 similarity index 100% rename from tools/testfiles/tmulti-b.h5 rename to tools/test/h5dump/testfiles/tmulti-b.h5 diff --git a/tools/testfiles/tmulti-g.h5 b/tools/test/h5dump/testfiles/tmulti-g.h5 similarity index 100% rename from tools/testfiles/tmulti-g.h5 rename to tools/test/h5dump/testfiles/tmulti-g.h5 diff --git a/tools/testfiles/tmulti-l.h5 b/tools/test/h5dump/testfiles/tmulti-l.h5 similarity index 100% rename from tools/testfiles/tmulti-l.h5 rename to tools/test/h5dump/testfiles/tmulti-l.h5 diff --git a/tools/testfiles/tmulti-o.h5 b/tools/test/h5dump/testfiles/tmulti-o.h5 similarity index 100% rename from tools/testfiles/tmulti-o.h5 rename to tools/test/h5dump/testfiles/tmulti-o.h5 diff --git a/tools/testfiles/tmulti-r.h5 b/tools/test/h5dump/testfiles/tmulti-r.h5 similarity index 100% rename from tools/testfiles/tmulti-r.h5 rename to tools/test/h5dump/testfiles/tmulti-r.h5 diff --git a/tools/testfiles/tmulti-s.h5 b/tools/test/h5dump/testfiles/tmulti-s.h5 similarity index 100% rename from tools/testfiles/tmulti-s.h5 rename to tools/test/h5dump/testfiles/tmulti-s.h5 diff --git a/tools/testfiles/tnamed_dtype_attr.h5 b/tools/test/h5dump/testfiles/tnamed_dtype_attr.h5 similarity index 100% rename from tools/testfiles/tnamed_dtype_attr.h5 rename to tools/test/h5dump/testfiles/tnamed_dtype_attr.h5 diff --git a/tools/testfiles/tnestedcmpddt.h5 b/tools/test/h5dump/testfiles/tnestedcmpddt.h5 similarity index 100% rename from tools/testfiles/tnestedcmpddt.h5 rename to tools/test/h5dump/testfiles/tnestedcmpddt.h5 diff --git a/tools/testfiles/tnestedcomp.h5 b/tools/test/h5dump/testfiles/tnestedcomp.h5 similarity index 100% rename from tools/testfiles/tnestedcomp.h5 rename to tools/test/h5dump/testfiles/tnestedcomp.h5 diff --git a/tools/testfiles/tno-subset.h5 b/tools/test/h5dump/testfiles/tno-subset.h5 similarity index 100% rename from tools/testfiles/tno-subset.h5 rename to tools/test/h5dump/testfiles/tno-subset.h5 diff --git a/tools/test/h5dump/testfiles/tnullspace.h5 b/tools/test/h5dump/testfiles/tnullspace.h5 new file mode 100644 index 0000000000000000000000000000000000000000..b5dac5dff2fde109becb4808a370b9d575c69aef GIT binary patch literal 3624 zcmeD5aB<`1lHy_j0S*oZ76t(ZW-tdr{D%S!K2$zT$pU1>FhL~R!__eW%w>cK3P9x= zpfrq1DNZc`v7yQsKENb~IUN$@>I(8TESzC9%-auGAS@23KtVi&F#*bdkqluhfbt_& zK^PmL{0Y_&h6gNQq2i;|&JzU0vc=(0S^cTCm9*oAbAKH->eKA zU_KKQ6Ig^9s2{`-;A8-r3<3&Zk`bs51em}GSQIcwfceaf=qVB`%pe3+4>HT??==So z23U%O$PX4W*w5dE5$I!B{<%P)yc#U-9&GLqgr=JYa4KS8NPs$!hd~3(Vq{=t-~onm nVo6C6NC1>dk<%9}U4a#k5~Cq78UmvsFd71*Aut*OLm~tK55+*8 literal 0 HcmV?d00001 diff --git a/tools/testfiles/torderattr.h5 b/tools/test/h5dump/testfiles/torderattr.h5 similarity index 100% rename from tools/testfiles/torderattr.h5 rename to tools/test/h5dump/testfiles/torderattr.h5 diff --git a/tools/testfiles/tordergr.h5 b/tools/test/h5dump/testfiles/tordergr.h5 similarity index 100% rename from tools/testfiles/tordergr.h5 rename to tools/test/h5dump/testfiles/tordergr.h5 diff --git a/tools/testfiles/trefer_attr.h5 b/tools/test/h5dump/testfiles/trefer_attr.h5 similarity index 100% rename from tools/testfiles/trefer_attr.h5 rename to tools/test/h5dump/testfiles/trefer_attr.h5 diff --git a/tools/testfiles/trefer_compat.h5 b/tools/test/h5dump/testfiles/trefer_compat.h5 similarity index 100% rename from tools/testfiles/trefer_compat.h5 rename to tools/test/h5dump/testfiles/trefer_compat.h5 diff --git a/tools/testfiles/trefer_ext1.h5 b/tools/test/h5dump/testfiles/trefer_ext1.h5 similarity index 100% rename from tools/testfiles/trefer_ext1.h5 rename to tools/test/h5dump/testfiles/trefer_ext1.h5 diff --git a/tools/testfiles/trefer_ext2.h5 b/tools/test/h5dump/testfiles/trefer_ext2.h5 similarity index 100% rename from tools/testfiles/trefer_ext2.h5 rename to tools/test/h5dump/testfiles/trefer_ext2.h5 diff --git a/tools/testfiles/trefer_grp.h5 b/tools/test/h5dump/testfiles/trefer_grp.h5 similarity index 100% rename from tools/testfiles/trefer_grp.h5 rename to tools/test/h5dump/testfiles/trefer_grp.h5 diff --git a/tools/testfiles/trefer_obj.h5 b/tools/test/h5dump/testfiles/trefer_obj.h5 similarity index 100% rename from tools/testfiles/trefer_obj.h5 rename to tools/test/h5dump/testfiles/trefer_obj.h5 diff --git a/tools/testfiles/trefer_obj_del.h5 b/tools/test/h5dump/testfiles/trefer_obj_del.h5 similarity index 100% rename from tools/testfiles/trefer_obj_del.h5 rename to tools/test/h5dump/testfiles/trefer_obj_del.h5 diff --git a/tools/testfiles/trefer_param.h5 b/tools/test/h5dump/testfiles/trefer_param.h5 similarity index 100% rename from tools/testfiles/trefer_param.h5 rename to tools/test/h5dump/testfiles/trefer_param.h5 diff --git a/tools/testfiles/trefer_reg.h5 b/tools/test/h5dump/testfiles/trefer_reg.h5 similarity index 100% rename from tools/testfiles/trefer_reg.h5 rename to tools/test/h5dump/testfiles/trefer_reg.h5 diff --git a/tools/testfiles/trefer_reg_1d.h5 b/tools/test/h5dump/testfiles/trefer_reg_1d.h5 similarity index 100% rename from tools/testfiles/trefer_reg_1d.h5 rename to tools/test/h5dump/testfiles/trefer_reg_1d.h5 diff --git a/tools/testfiles/tsaf.h5 b/tools/test/h5dump/testfiles/tsaf.h5 similarity index 100% rename from tools/testfiles/tsaf.h5 rename to tools/test/h5dump/testfiles/tsaf.h5 diff --git a/tools/testfiles/tscalarattrintsize.h5 b/tools/test/h5dump/testfiles/tscalarattrintsize.h5 similarity index 100% rename from tools/testfiles/tscalarattrintsize.h5 rename to tools/test/h5dump/testfiles/tscalarattrintsize.h5 diff --git a/tools/testfiles/tscalarintattrsize.h5 b/tools/test/h5dump/testfiles/tscalarintattrsize.h5 similarity index 100% rename from tools/testfiles/tscalarintattrsize.h5 rename to tools/test/h5dump/testfiles/tscalarintattrsize.h5 diff --git a/tools/testfiles/tscalarintsize.h5 b/tools/test/h5dump/testfiles/tscalarintsize.h5 similarity index 100% rename from tools/testfiles/tscalarintsize.h5 rename to tools/test/h5dump/testfiles/tscalarintsize.h5 diff --git a/tools/testfiles/tscalarstring.h5 b/tools/test/h5dump/testfiles/tscalarstring.h5 similarity index 100% rename from tools/testfiles/tscalarstring.h5 rename to tools/test/h5dump/testfiles/tscalarstring.h5 diff --git a/tools/testfiles/tslink.h5 b/tools/test/h5dump/testfiles/tslink.h5 similarity index 100% rename from tools/testfiles/tslink.h5 rename to tools/test/h5dump/testfiles/tslink.h5 diff --git a/tools/testfiles/tsoftlinks.h5 b/tools/test/h5dump/testfiles/tsoftlinks.h5 similarity index 100% rename from tools/testfiles/tsoftlinks.h5 rename to tools/test/h5dump/testfiles/tsoftlinks.h5 diff --git a/tools/testfiles/tsplit_file-m.h5 b/tools/test/h5dump/testfiles/tsplit_file-m.h5 similarity index 100% rename from tools/testfiles/tsplit_file-m.h5 rename to tools/test/h5dump/testfiles/tsplit_file-m.h5 diff --git a/tools/testfiles/tsplit_file-r.h5 b/tools/test/h5dump/testfiles/tsplit_file-r.h5 similarity index 100% rename from tools/testfiles/tsplit_file-r.h5 rename to tools/test/h5dump/testfiles/tsplit_file-r.h5 diff --git a/tools/testfiles/tst_onion_dset_1d.h5 b/tools/test/h5dump/testfiles/tst_onion_dset_1d.h5 similarity index 100% rename from tools/testfiles/tst_onion_dset_1d.h5 rename to tools/test/h5dump/testfiles/tst_onion_dset_1d.h5 diff --git a/tools/testfiles/tst_onion_dset_1d.h5.onion b/tools/test/h5dump/testfiles/tst_onion_dset_1d.h5.onion similarity index 100% rename from tools/testfiles/tst_onion_dset_1d.h5.onion rename to tools/test/h5dump/testfiles/tst_onion_dset_1d.h5.onion diff --git a/tools/testfiles/tst_onion_dset_ext.h5 b/tools/test/h5dump/testfiles/tst_onion_dset_ext.h5 similarity index 100% rename from tools/testfiles/tst_onion_dset_ext.h5 rename to tools/test/h5dump/testfiles/tst_onion_dset_ext.h5 diff --git a/tools/testfiles/tst_onion_dset_ext.h5.onion b/tools/test/h5dump/testfiles/tst_onion_dset_ext.h5.onion similarity index 100% rename from tools/testfiles/tst_onion_dset_ext.h5.onion rename to tools/test/h5dump/testfiles/tst_onion_dset_ext.h5.onion diff --git a/tools/testfiles/tst_onion_objs.h5 b/tools/test/h5dump/testfiles/tst_onion_objs.h5 similarity index 100% rename from tools/testfiles/tst_onion_objs.h5 rename to tools/test/h5dump/testfiles/tst_onion_objs.h5 diff --git a/tools/testfiles/tst_onion_objs.h5.onion b/tools/test/h5dump/testfiles/tst_onion_objs.h5.onion similarity index 100% rename from tools/testfiles/tst_onion_objs.h5.onion rename to tools/test/h5dump/testfiles/tst_onion_objs.h5.onion diff --git a/tools/testfiles/tstr.h5 b/tools/test/h5dump/testfiles/tstr.h5 similarity index 100% rename from tools/testfiles/tstr.h5 rename to tools/test/h5dump/testfiles/tstr.h5 diff --git a/tools/testfiles/tstr2.h5 b/tools/test/h5dump/testfiles/tstr2.h5 similarity index 100% rename from tools/testfiles/tstr2.h5 rename to tools/test/h5dump/testfiles/tstr2.h5 diff --git a/tools/testfiles/tstr3.h5 b/tools/test/h5dump/testfiles/tstr3.h5 similarity index 100% rename from tools/testfiles/tstr3.h5 rename to tools/test/h5dump/testfiles/tstr3.h5 diff --git a/tools/testfiles/tudfilter.h5 b/tools/test/h5dump/testfiles/tudfilter.h5 similarity index 100% rename from tools/testfiles/tudfilter.h5 rename to tools/test/h5dump/testfiles/tudfilter.h5 diff --git a/tools/testfiles/tudlink.h5 b/tools/test/h5dump/testfiles/tudlink.h5 similarity index 100% rename from tools/testfiles/tudlink.h5 rename to tools/test/h5dump/testfiles/tudlink.h5 diff --git a/tools/testfiles/tvldtypes1.h5 b/tools/test/h5dump/testfiles/tvldtypes1.h5 similarity index 100% rename from tools/testfiles/tvldtypes1.h5 rename to tools/test/h5dump/testfiles/tvldtypes1.h5 diff --git a/tools/testfiles/tvldtypes2.h5 b/tools/test/h5dump/testfiles/tvldtypes2.h5 similarity index 100% rename from tools/testfiles/tvldtypes2.h5 rename to tools/test/h5dump/testfiles/tvldtypes2.h5 diff --git a/tools/testfiles/tvldtypes3.h5 b/tools/test/h5dump/testfiles/tvldtypes3.h5 similarity index 100% rename from tools/testfiles/tvldtypes3.h5 rename to tools/test/h5dump/testfiles/tvldtypes3.h5 diff --git a/tools/testfiles/tvldtypes4.h5 b/tools/test/h5dump/testfiles/tvldtypes4.h5 similarity index 100% rename from tools/testfiles/tvldtypes4.h5 rename to tools/test/h5dump/testfiles/tvldtypes4.h5 diff --git a/tools/testfiles/tvldtypes5.h5 b/tools/test/h5dump/testfiles/tvldtypes5.h5 similarity index 100% rename from tools/testfiles/tvldtypes5.h5 rename to tools/test/h5dump/testfiles/tvldtypes5.h5 diff --git a/tools/testfiles/tvlenstr_array.h5 b/tools/test/h5dump/testfiles/tvlenstr_array.h5 similarity index 100% rename from tools/testfiles/tvlenstr_array.h5 rename to tools/test/h5dump/testfiles/tvlenstr_array.h5 diff --git a/tools/testfiles/tvlstr.h5 b/tools/test/h5dump/testfiles/tvlstr.h5 similarity index 100% rename from tools/testfiles/tvlstr.h5 rename to tools/test/h5dump/testfiles/tvlstr.h5 diff --git a/tools/testfiles/tvms.h5 b/tools/test/h5dump/testfiles/tvms.h5 similarity index 100% rename from tools/testfiles/tvms.h5 rename to tools/test/h5dump/testfiles/tvms.h5 diff --git a/tools/testfiles/vds/1_a.h5 b/tools/test/h5dump/testfiles/vds/1_a.h5 similarity index 100% rename from tools/testfiles/vds/1_a.h5 rename to tools/test/h5dump/testfiles/vds/1_a.h5 diff --git a/tools/testfiles/vds/1_b.h5 b/tools/test/h5dump/testfiles/vds/1_b.h5 similarity index 100% rename from tools/testfiles/vds/1_b.h5 rename to tools/test/h5dump/testfiles/vds/1_b.h5 diff --git a/tools/testfiles/vds/1_c.h5 b/tools/test/h5dump/testfiles/vds/1_c.h5 similarity index 100% rename from tools/testfiles/vds/1_c.h5 rename to tools/test/h5dump/testfiles/vds/1_c.h5 diff --git a/tools/testfiles/vds/1_d.h5 b/tools/test/h5dump/testfiles/vds/1_d.h5 similarity index 100% rename from tools/testfiles/vds/1_d.h5 rename to tools/test/h5dump/testfiles/vds/1_d.h5 diff --git a/tools/testfiles/vds/1_e.h5 b/tools/test/h5dump/testfiles/vds/1_e.h5 similarity index 100% rename from tools/testfiles/vds/1_e.h5 rename to tools/test/h5dump/testfiles/vds/1_e.h5 diff --git a/tools/testfiles/vds/1_f.h5 b/tools/test/h5dump/testfiles/vds/1_f.h5 similarity index 100% rename from tools/testfiles/vds/1_f.h5 rename to tools/test/h5dump/testfiles/vds/1_f.h5 diff --git a/tools/testfiles/vds/1_vds.h5 b/tools/test/h5dump/testfiles/vds/1_vds.h5 similarity index 100% rename from tools/testfiles/vds/1_vds.h5 rename to tools/test/h5dump/testfiles/vds/1_vds.h5 diff --git a/tools/testfiles/vds/2_a.h5 b/tools/test/h5dump/testfiles/vds/2_a.h5 similarity index 100% rename from tools/testfiles/vds/2_a.h5 rename to tools/test/h5dump/testfiles/vds/2_a.h5 diff --git a/tools/testfiles/vds/2_b.h5 b/tools/test/h5dump/testfiles/vds/2_b.h5 similarity index 100% rename from tools/testfiles/vds/2_b.h5 rename to tools/test/h5dump/testfiles/vds/2_b.h5 diff --git a/tools/testfiles/vds/2_c.h5 b/tools/test/h5dump/testfiles/vds/2_c.h5 similarity index 100% rename from tools/testfiles/vds/2_c.h5 rename to tools/test/h5dump/testfiles/vds/2_c.h5 diff --git a/tools/testfiles/vds/2_d.h5 b/tools/test/h5dump/testfiles/vds/2_d.h5 similarity index 100% rename from tools/testfiles/vds/2_d.h5 rename to tools/test/h5dump/testfiles/vds/2_d.h5 diff --git a/tools/testfiles/vds/2_e.h5 b/tools/test/h5dump/testfiles/vds/2_e.h5 similarity index 100% rename from tools/testfiles/vds/2_e.h5 rename to tools/test/h5dump/testfiles/vds/2_e.h5 diff --git a/tools/testfiles/vds/2_vds.h5 b/tools/test/h5dump/testfiles/vds/2_vds.h5 similarity index 100% rename from tools/testfiles/vds/2_vds.h5 rename to tools/test/h5dump/testfiles/vds/2_vds.h5 diff --git a/tools/testfiles/vds/3_1_vds.h5 b/tools/test/h5dump/testfiles/vds/3_1_vds.h5 similarity index 100% rename from tools/testfiles/vds/3_1_vds.h5 rename to tools/test/h5dump/testfiles/vds/3_1_vds.h5 diff --git a/tools/testfiles/vds/3_2_vds.h5 b/tools/test/h5dump/testfiles/vds/3_2_vds.h5 similarity index 100% rename from tools/testfiles/vds/3_2_vds.h5 rename to tools/test/h5dump/testfiles/vds/3_2_vds.h5 diff --git a/tools/testfiles/vds/4_0.h5 b/tools/test/h5dump/testfiles/vds/4_0.h5 similarity index 100% rename from tools/testfiles/vds/4_0.h5 rename to tools/test/h5dump/testfiles/vds/4_0.h5 diff --git a/tools/testfiles/vds/4_1.h5 b/tools/test/h5dump/testfiles/vds/4_1.h5 similarity index 100% rename from tools/testfiles/vds/4_1.h5 rename to tools/test/h5dump/testfiles/vds/4_1.h5 diff --git a/tools/testfiles/vds/4_2.h5 b/tools/test/h5dump/testfiles/vds/4_2.h5 similarity index 100% rename from tools/testfiles/vds/4_2.h5 rename to tools/test/h5dump/testfiles/vds/4_2.h5 diff --git a/tools/testfiles/vds/4_vds.h5 b/tools/test/h5dump/testfiles/vds/4_vds.h5 similarity index 100% rename from tools/testfiles/vds/4_vds.h5 rename to tools/test/h5dump/testfiles/vds/4_vds.h5 diff --git a/tools/testfiles/vds/5_a.h5 b/tools/test/h5dump/testfiles/vds/5_a.h5 similarity index 100% rename from tools/testfiles/vds/5_a.h5 rename to tools/test/h5dump/testfiles/vds/5_a.h5 diff --git a/tools/testfiles/vds/5_b.h5 b/tools/test/h5dump/testfiles/vds/5_b.h5 similarity index 100% rename from tools/testfiles/vds/5_b.h5 rename to tools/test/h5dump/testfiles/vds/5_b.h5 diff --git a/tools/testfiles/vds/5_c.h5 b/tools/test/h5dump/testfiles/vds/5_c.h5 similarity index 100% rename from tools/testfiles/vds/5_c.h5 rename to tools/test/h5dump/testfiles/vds/5_c.h5 diff --git a/tools/testfiles/vds/5_vds.h5 b/tools/test/h5dump/testfiles/vds/5_vds.h5 similarity index 100% rename from tools/testfiles/vds/5_vds.h5 rename to tools/test/h5dump/testfiles/vds/5_vds.h5 diff --git a/tools/testfiles/vds/a.h5 b/tools/test/h5dump/testfiles/vds/a.h5 similarity index 100% rename from tools/testfiles/vds/a.h5 rename to tools/test/h5dump/testfiles/vds/a.h5 diff --git a/tools/testfiles/vds/b.h5 b/tools/test/h5dump/testfiles/vds/b.h5 similarity index 100% rename from tools/testfiles/vds/b.h5 rename to tools/test/h5dump/testfiles/vds/b.h5 diff --git a/tools/testfiles/vds/c.h5 b/tools/test/h5dump/testfiles/vds/c.h5 similarity index 100% rename from tools/testfiles/vds/c.h5 rename to tools/test/h5dump/testfiles/vds/c.h5 diff --git a/tools/testfiles/vds/d.h5 b/tools/test/h5dump/testfiles/vds/d.h5 similarity index 100% rename from tools/testfiles/vds/d.h5 rename to tools/test/h5dump/testfiles/vds/d.h5 diff --git a/tools/testfiles/vds/f-0.h5 b/tools/test/h5dump/testfiles/vds/f-0.h5 similarity index 100% rename from tools/testfiles/vds/f-0.h5 rename to tools/test/h5dump/testfiles/vds/f-0.h5 diff --git a/tools/testfiles/vds/f-3.h5 b/tools/test/h5dump/testfiles/vds/f-3.h5 similarity index 100% rename from tools/testfiles/vds/f-3.h5 rename to tools/test/h5dump/testfiles/vds/f-3.h5 diff --git a/tools/testfiles/vds/vds-eiger.h5 b/tools/test/h5dump/testfiles/vds/vds-eiger.h5 similarity index 100% rename from tools/testfiles/vds/vds-eiger.h5 rename to tools/test/h5dump/testfiles/vds/vds-eiger.h5 diff --git a/tools/testfiles/vds/vds-percival-unlim-maxmin.h5 b/tools/test/h5dump/testfiles/vds/vds-percival-unlim-maxmin.h5 similarity index 100% rename from tools/testfiles/vds/vds-percival-unlim-maxmin.h5 rename to tools/test/h5dump/testfiles/vds/vds-percival-unlim-maxmin.h5 diff --git a/tools/testfiles/tbitfields.h5 b/tools/test/h5dump/testfiles/xml/tbitfields.h5 similarity index 100% rename from tools/testfiles/tbitfields.h5 rename to tools/test/h5dump/testfiles/xml/tbitfields.h5 diff --git a/tools/testfiles/tcompound2.h5 b/tools/test/h5dump/testfiles/xml/tcompound2.h5 similarity index 100% rename from tools/testfiles/tcompound2.h5 rename to tools/test/h5dump/testfiles/xml/tcompound2.h5 diff --git a/tools/testfiles/tdset2.h5 b/tools/test/h5dump/testfiles/xml/tdset2.h5 similarity index 100% rename from tools/testfiles/tdset2.h5 rename to tools/test/h5dump/testfiles/xml/tdset2.h5 diff --git a/tools/testfiles/tenum.h5 b/tools/test/h5dump/testfiles/xml/tenum.h5 similarity index 100% rename from tools/testfiles/tenum.h5 rename to tools/test/h5dump/testfiles/xml/tenum.h5 diff --git a/tools/testfiles/test35.nc b/tools/test/h5dump/testfiles/xml/test35.nc similarity index 100% rename from tools/testfiles/test35.nc rename to tools/test/h5dump/testfiles/xml/test35.nc diff --git a/tools/testfiles/tloop2.h5 b/tools/test/h5dump/testfiles/xml/tloop2.h5 similarity index 100% rename from tools/testfiles/tloop2.h5 rename to tools/test/h5dump/testfiles/xml/tloop2.h5 diff --git a/tools/testfiles/tmany.h5 b/tools/test/h5dump/testfiles/xml/tmany.h5 similarity index 100% rename from tools/testfiles/tmany.h5 rename to tools/test/h5dump/testfiles/xml/tmany.h5 diff --git a/tools/testfiles/tname-amp.h5 b/tools/test/h5dump/testfiles/xml/tname-amp.h5 similarity index 100% rename from tools/testfiles/tname-amp.h5 rename to tools/test/h5dump/testfiles/xml/tname-amp.h5 diff --git a/tools/testfiles/tname-apos.h5 b/tools/test/h5dump/testfiles/xml/tname-apos.h5 similarity index 100% rename from tools/testfiles/tname-apos.h5 rename to tools/test/h5dump/testfiles/xml/tname-apos.h5 diff --git a/tools/testfiles/tname-gt.h5 b/tools/test/h5dump/testfiles/xml/tname-gt.h5 similarity index 100% rename from tools/testfiles/tname-gt.h5 rename to tools/test/h5dump/testfiles/xml/tname-gt.h5 diff --git a/tools/testfiles/tname-lt.h5 b/tools/test/h5dump/testfiles/xml/tname-lt.h5 similarity index 100% rename from tools/testfiles/tname-lt.h5 rename to tools/test/h5dump/testfiles/xml/tname-lt.h5 diff --git a/tools/testfiles/tname-quot.h5 b/tools/test/h5dump/testfiles/xml/tname-quot.h5 similarity index 100% rename from tools/testfiles/tname-quot.h5 rename to tools/test/h5dump/testfiles/xml/tname-quot.h5 diff --git a/tools/testfiles/tname-sp.h5 b/tools/test/h5dump/testfiles/xml/tname-sp.h5 similarity index 100% rename from tools/testfiles/tname-sp.h5 rename to tools/test/h5dump/testfiles/xml/tname-sp.h5 diff --git a/tools/testfiles/tnodata.h5 b/tools/test/h5dump/testfiles/xml/tnodata.h5 similarity index 100% rename from tools/testfiles/tnodata.h5 rename to tools/test/h5dump/testfiles/xml/tnodata.h5 diff --git a/tools/testfiles/tobjref.h5 b/tools/test/h5dump/testfiles/xml/tobjref.h5 similarity index 100% rename from tools/testfiles/tobjref.h5 rename to tools/test/h5dump/testfiles/xml/tobjref.h5 diff --git a/tools/testfiles/topaque.h5 b/tools/test/h5dump/testfiles/xml/topaque.h5 similarity index 100% rename from tools/testfiles/topaque.h5 rename to tools/test/h5dump/testfiles/xml/topaque.h5 diff --git a/tools/testfiles/tref-escapes-at.h5 b/tools/test/h5dump/testfiles/xml/tref-escapes-at.h5 similarity index 100% rename from tools/testfiles/tref-escapes-at.h5 rename to tools/test/h5dump/testfiles/xml/tref-escapes-at.h5 diff --git a/tools/testfiles/tref-escapes.h5 b/tools/test/h5dump/testfiles/xml/tref-escapes.h5 similarity index 100% rename from tools/testfiles/tref-escapes.h5 rename to tools/test/h5dump/testfiles/xml/tref-escapes.h5 diff --git a/tools/testfiles/tref.h5 b/tools/test/h5dump/testfiles/xml/tref.h5 similarity index 100% rename from tools/testfiles/tref.h5 rename to tools/test/h5dump/testfiles/xml/tref.h5 diff --git a/tools/testfiles/tstring-at.h5 b/tools/test/h5dump/testfiles/xml/tstring-at.h5 similarity index 100% rename from tools/testfiles/tstring-at.h5 rename to tools/test/h5dump/testfiles/xml/tstring-at.h5 diff --git a/tools/testfiles/tstring.h5 b/tools/test/h5dump/testfiles/xml/tstring.h5 similarity index 100% rename from tools/testfiles/tstring.h5 rename to tools/test/h5dump/testfiles/xml/tstring.h5 diff --git a/tools/testfiles/zerodim.h5 b/tools/test/h5dump/testfiles/zerodim.h5 similarity index 100% rename from tools/testfiles/zerodim.h5 rename to tools/test/h5dump/testfiles/zerodim.h5 diff --git a/tools/test/h5dump/testh5dump.sh.in b/tools/test/h5dump/testh5dump.sh.in index 6ea410bb851..8796aa91fa7 100644 --- a/tools/test/h5dump/testh5dump.sh.in +++ b/tools/test/h5dump/testh5dump.sh.in @@ -52,11 +52,12 @@ verbose=yes # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_ERRORFILES="$srcdir/errfiles" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" +SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected" +SRC_H5DUMP_ERRORFILES="$SRC_TOOLS/test/h5dump/errfiles" +SRC_H5DUMP_EXPFILES="$SRC_TOOLS/test/h5dump/exportfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" @@ -193,195 +194,198 @@ $SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.h5.onion " LIST_OTHER_TEST_FILES=" -$SRC_H5DUMP_TESTFILES/charsets.ddl -$SRC_H5DUMP_TESTFILES/file_space.ddl -$SRC_H5DUMP_TESTFILES/filter_fail.ddl -$SRC_H5DUMP_TESTFILES/non_existing.ddl -$SRC_H5DUMP_TESTFILES/packedbits.ddl -$SRC_H5DUMP_TESTFILES/tall-1.ddl -$SRC_H5DUMP_TESTFILES/tall-2.ddl -$SRC_H5DUMP_TESTFILES/tall-2A.ddl -$SRC_H5DUMP_TESTFILES/tall-2A0.ddl -$SRC_H5DUMP_TESTFILES/tall-2B.ddl -$SRC_H5DUMP_TESTFILES/tall-3.ddl -$SRC_H5DUMP_TESTFILES/tall-4s.ddl -$SRC_H5DUMP_TESTFILES/tall-5s.ddl -$SRC_H5DUMP_TESTFILES/tall-6.ddl -$SRC_H5DUMP_TESTFILES/tall-6.exp -$SRC_H5DUMP_TESTFILES/tall-7.ddl -$SRC_H5DUMP_TESTFILES/tall-7N.ddl -$SRC_H5DUMP_TESTFILES/tallfilters.ddl -$SRC_H5DUMP_TESTFILES/tarray1.ddl -$SRC_H5DUMP_TESTFILES/tarray1_big.ddl -$SRC_H5DUMP_TESTFILES/tarray2.ddl -$SRC_H5DUMP_TESTFILES/tarray3.ddl -$SRC_H5DUMP_TESTFILES/tarray4.ddl -$SRC_H5DUMP_TESTFILES/tarray5.ddl -$SRC_H5DUMP_TESTFILES/tarray6.ddl -$SRC_H5DUMP_TESTFILES/tarray7.ddl -$SRC_H5DUMP_TESTFILES/tarray8.ddl -$SRC_H5DUMP_TESTFILES/tattr-1.ddl -$SRC_H5DUMP_TESTFILES/tattr-2.ddl -$SRC_H5DUMP_TESTFILES/tattr-3.ddl -$SRC_H5DUMP_TESTFILES/tattr-4_be.ddl -$SRC_H5DUMP_TESTFILES/tattrcontents1.ddl -$SRC_H5DUMP_TESTFILES/tattrcontents2.ddl -$SRC_H5DUMP_TESTFILES/tattrintsize.ddl -$SRC_H5DUMP_TESTFILES/tattrreg.ddl -$SRC_H5DUMP_TESTFILES/tattrregR.ddl -$SRC_H5DUMP_TESTFILES/tbin1.ddl -$SRC_H5DUMP_TESTFILES/tbin1.ddl -$SRC_H5DUMP_TESTFILES/tbin2.ddl -$SRC_H5DUMP_TESTFILES/tbin3.ddl -$SRC_H5DUMP_TESTFILES/tbin4.ddl -$SRC_H5DUMP_TESTFILES/tbinregR.ddl -$SRC_H5DUMP_TESTFILES/tbigdims.ddl -$SRC_H5DUMP_TESTFILES/tbitnopaque_be.ddl -$SRC_H5DUMP_TESTFILES/tbitnopaque_le.ddl -$SRC_H5DUMP_TESTFILES/tboot1.ddl -$SRC_H5DUMP_TESTFILES/tboot2.ddl -$SRC_H5DUMP_TESTFILES/tboot2A.ddl -$SRC_H5DUMP_TESTFILES/tboot2B.ddl -$SRC_H5DUMP_TESTFILES/tchar1.ddl -$SRC_H5DUMP_TESTFILES/tchunked.ddl -$SRC_H5DUMP_TESTFILES/tcmpdattrintsize.ddl -$SRC_H5DUMP_TESTFILES/tcmpdintsize.ddl -$SRC_H5DUMP_TESTFILES/tcomp-1.ddl -$SRC_H5DUMP_TESTFILES/tcomp-2.ddl -$SRC_H5DUMP_TESTFILES/tcomp-3.ddl -$SRC_H5DUMP_TESTFILES/tcomp-4.ddl -$SRC_H5DUMP_TESTFILES/tcompound_complex2.ddl -$SRC_H5DUMP_TESTFILES/tcompact.ddl -$SRC_H5DUMP_TESTFILES/tcontents.ddl -$SRC_H5DUMP_TESTFILES/tcontiguos.ddl -$SRC_H5DUMP_TESTFILES/tdatareg.ddl -$SRC_H5DUMP_TESTFILES/tdataregR.ddl -$SRC_H5DUMP_TESTFILES/tdeflate.ddl -$SRC_H5DUMP_TESTFILES/tdset-1.ddl -$SRC_H5DUMP_TESTFILES/tdset-2.ddl -$SRC_H5DUMP_TESTFILES/tdset-3s.ddl -$SRC_H5DUMP_TESTFILES/tempty.ddl -$SRC_H5DUMP_TESTFILES/texceedsubstart.ddl -$SRC_H5DUMP_TESTFILES/texceedsubcount.ddl -$SRC_H5DUMP_TESTFILES/texceedsubstride.ddl -$SRC_H5DUMP_TESTFILES/texceedsubblock.ddl -$SRC_H5DUMP_TESTFILES/texternal.ddl -$SRC_H5DUMP_TESTFILES/textlinksrc.ddl -$SRC_H5DUMP_TESTFILES/textlinkfar.ddl -$SRC_H5DUMP_TESTFILES/textlink.ddl -$SRC_H5DUMP_TESTFILES/tfamily.ddl -$SRC_H5DUMP_TESTFILES/tfill.ddl -$SRC_H5DUMP_TESTFILES/tfletcher32.ddl -$SRC_H5DUMP_TESTFILES/tfloatsattrs.ddl -$SRC_H5DUMP_TESTFILES/tfpformat.ddl -$SRC_H5DUMP_TESTFILES/tgroup-1.ddl -$SRC_H5DUMP_TESTFILES/tgroup-2.ddl -$SRC_H5DUMP_TESTFILES/tgrp_comments.ddl -$SRC_H5DUMP_TESTFILES/tgrpnullspace.ddl -$SRC_H5DUMP_TESTFILES/thlink-1.ddl -$SRC_H5DUMP_TESTFILES/thlink-2.ddl -$SRC_H5DUMP_TESTFILES/thlink-3.ddl -$SRC_H5DUMP_TESTFILES/thlink-4.ddl -$SRC_H5DUMP_TESTFILES/thlink-5.ddl -$SRC_H5DUMP_TESTFILES/thyperslab.ddl -$SRC_H5DUMP_TESTFILES/tindicesno.ddl -$SRC_H5DUMP_TESTFILES/tindicessub1.ddl -$SRC_H5DUMP_TESTFILES/tindicessub2.ddl -$SRC_H5DUMP_TESTFILES/tindicessub3.ddl -$SRC_H5DUMP_TESTFILES/tindicessub4.ddl -$SRC_H5DUMP_TESTFILES/tindicesyes.ddl -$SRC_H5DUMP_TESTFILES/tints4dims.ddl -$SRC_H5DUMP_TESTFILES/tints4dimsBlock2.ddl -$SRC_H5DUMP_TESTFILES/tints4dimsBlockEq.ddl -$SRC_H5DUMP_TESTFILES/tints4dimsCount2.ddl -$SRC_H5DUMP_TESTFILES/tints4dimsCountEq.ddl -$SRC_H5DUMP_TESTFILES/tints4dimsStride2.ddl -$SRC_H5DUMP_TESTFILES/tintsattrs.ddl -$SRC_H5DUMP_TESTFILES/tlarge_objname.ddl -$SRC_H5DUMP_TESTFILES/tldouble.ddl -$SRC_H5DUMP_TESTFILES/tldouble_scalar.ddl -$SRC_H5DUMP_TESTFILES/tlonglinks.ddl -$SRC_H5DUMP_TESTFILES/tloop-1.ddl -$SRC_H5DUMP_TESTFILES/tmulti.ddl -$SRC_H5DUMP_TESTFILES/tmultifile.ddl -$SRC_H5DUMP_TESTFILES/tqmarkfile.ddl -$SRC_H5DUMP_TESTFILES/tstarfile.ddl -$SRC_H5DUMP_TESTFILES/tnamed_dtype_attr.ddl -$SRC_H5DUMP_TESTFILES/tnestcomp-1.ddl -$SRC_H5DUMP_TESTFILES/tnestedcmpddt.ddl -$SRC_H5DUMP_TESTFILES/tnbit.ddl -$SRC_H5DUMP_TESTFILES/tnoattrdata.ddl -$SRC_H5DUMP_TESTFILES/tnoattrddl.ddl -$SRC_H5DUMP_TESTFILES/tnodata.ddl -$SRC_H5DUMP_TESTFILES/tnoddl.ddl -$SRC_H5DUMP_TESTFILES/tnoddlfile.ddl -$SRC_H5DUMP_TESTFILES/tnoddlfile.exp -$SRC_H5DUMP_TESTFILES/tno-subset.ddl -$SRC_H5DUMP_TESTFILES/tnullspace.ddl -$SRC_H5DUMP_TESTFILES/trawdatafile.ddl -$SRC_H5DUMP_TESTFILES/trawdatafile.exp -$SRC_H5DUMP_TESTFILES/trawssetfile.ddl -$SRC_H5DUMP_TESTFILES/trawssetfile.exp -$SRC_H5DUMP_TESTFILES/zerodim.ddl -$SRC_H5DUMP_TESTFILES/tordergr1.ddl -$SRC_H5DUMP_TESTFILES/tordergr2.ddl -$SRC_H5DUMP_TESTFILES/tordergr3.ddl -$SRC_H5DUMP_TESTFILES/tordergr4.ddl -$SRC_H5DUMP_TESTFILES/tordergr5.ddl -$SRC_H5DUMP_TESTFILES/torderattr1.ddl -$SRC_H5DUMP_TESTFILES/torderattr2.ddl -$SRC_H5DUMP_TESTFILES/torderattr3.ddl -$SRC_H5DUMP_TESTFILES/torderattr4.ddl -$SRC_H5DUMP_TESTFILES/tordercontents1.ddl -$SRC_H5DUMP_TESTFILES/tordercontents2.ddl -$SRC_H5DUMP_TESTFILES/torderlinks1.ddl -$SRC_H5DUMP_TESTFILES/torderlinks2.ddl -$SRC_H5DUMP_TESTFILES/tperror.ddl -$SRC_H5DUMP_TESTFILES/treadfilter.ddl -$SRC_H5DUMP_TESTFILES/treadintfilter.ddl -$SRC_H5DUMP_TESTFILES/treference.ddl -$SRC_H5DUMP_TESTFILES/tsaf.ddl -$SRC_H5DUMP_TESTFILES/tscalarattrintsize.ddl -$SRC_H5DUMP_TESTFILES/tscalarintattrsize.ddl -$SRC_H5DUMP_TESTFILES/tscalarintsize.ddl -$SRC_H5DUMP_TESTFILES/tscalarstring.ddl -$SRC_H5DUMP_TESTFILES/tscaleoffset.ddl -$SRC_H5DUMP_TESTFILES/tshuffle.ddl -$SRC_H5DUMP_TESTFILES/tslink-1.ddl -$SRC_H5DUMP_TESTFILES/tslink-2.ddl -$SRC_H5DUMP_TESTFILES/tslink-D.ddl -$SRC_H5DUMP_TESTFILES/tsplit_file.ddl -$SRC_H5DUMP_TESTFILES/tstr-1.ddl -$SRC_H5DUMP_TESTFILES/tstr-2.ddl -$SRC_H5DUMP_TESTFILES/tstr2bin2.exp -$SRC_H5DUMP_TESTFILES/tstr2bin6.exp -$SRC_H5DUMP_TESTFILES/tstring.ddl -$SRC_H5DUMP_TESTFILES/tstring2.ddl -$SRC_H5DUMP_TESTFILES/tstringe.ddl -$SRC_H5DUMP_TESTFILES/tszip.ddl -$SRC_H5DUMP_TESTFILES/tudlink-1.ddl -$SRC_H5DUMP_TESTFILES/tudlink-2.ddl -$SRC_H5DUMP_TESTFILES/tuserfilter.ddl -$SRC_H5DUMP_TESTFILES/tvldtypes1.ddl -$SRC_H5DUMP_TESTFILES/tvldtypes2.ddl -$SRC_H5DUMP_TESTFILES/tvldtypes3.ddl -$SRC_H5DUMP_TESTFILES/tvldtypes4.ddl -$SRC_H5DUMP_TESTFILES/tvldtypes5.ddl -$SRC_H5DUMP_TESTFILES/tvlenstr_array.ddl -$SRC_H5DUMP_TESTFILES/tvlstr.ddl -$SRC_H5DUMP_TESTFILES/tvms.ddl -$SRC_H5DUMP_TESTFILES/twidedisplay.ddl -$SRC_H5DUMP_TESTFILES/twithddl.exp -$SRC_H5DUMP_TESTFILES/twithddlfile.ddl -$SRC_H5DUMP_TESTFILES/twithddlfile.exp -$SRC_H5DUMP_TESTFILES/h5dump-help.txt -$SRC_H5DUMP_TESTFILES/out3.h5import -$SRC_H5DUMP_TESTFILES/tbinregR.exp -$SRC_H5DUMP_TESTFILES/err_attr_dspace.ddl -$SRC_H5DUMP_TESTFILES/tst_onion_objs.ddl -$SRC_H5DUMP_TESTFILES/tst_onion_dset_ext.ddl -$SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.ddl -$SRC_H5DUMP_TESTFILES/tst_onion_revision_count.ddl +$SRC_H5DUMP_OUTFILES/charsets.ddl +$SRC_H5DUMP_OUTFILES/file_space.ddl +$SRC_H5DUMP_OUTFILES/filter_fail.ddl +$SRC_H5DUMP_OUTFILES/non_existing.ddl +$SRC_H5DUMP_OUTFILES/packedbits.ddl +$SRC_H5DUMP_OUTFILES/tall-1.ddl +$SRC_H5DUMP_OUTFILES/tall-2.ddl +$SRC_H5DUMP_OUTFILES/tall-2A.ddl +$SRC_H5DUMP_OUTFILES/tall-2A0.ddl +$SRC_H5DUMP_OUTFILES/tall-2B.ddl +$SRC_H5DUMP_OUTFILES/tall-3.ddl +$SRC_H5DUMP_OUTFILES/tall-4s.ddl +$SRC_H5DUMP_OUTFILES/tall-5s.ddl +$SRC_H5DUMP_OUTFILES/tall-6.ddl +$SRC_H5DUMP_OUTFILES/tall-7.ddl +$SRC_H5DUMP_OUTFILES/tall-7N.ddl +$SRC_H5DUMP_OUTFILES/tallfilters.ddl +$SRC_H5DUMP_OUTFILES/tarray1.ddl +$SRC_H5DUMP_OUTFILES/tarray1_big.ddl +$SRC_H5DUMP_OUTFILES/tarray2.ddl +$SRC_H5DUMP_OUTFILES/tarray3.ddl +$SRC_H5DUMP_OUTFILES/tarray4.ddl +$SRC_H5DUMP_OUTFILES/tarray5.ddl +$SRC_H5DUMP_OUTFILES/tarray6.ddl +$SRC_H5DUMP_OUTFILES/tarray7.ddl +$SRC_H5DUMP_OUTFILES/tarray8.ddl +$SRC_H5DUMP_OUTFILES/tattr-1.ddl +$SRC_H5DUMP_OUTFILES/tattr-2.ddl +$SRC_H5DUMP_OUTFILES/tattr-3.ddl +$SRC_H5DUMP_OUTFILES/tattr-4_be.ddl +$SRC_H5DUMP_OUTFILES/tattrcontents1.ddl +$SRC_H5DUMP_OUTFILES/tattrcontents2.ddl +$SRC_H5DUMP_OUTFILES/tattrintsize.ddl +$SRC_H5DUMP_OUTFILES/tattrreg.ddl +$SRC_H5DUMP_OUTFILES/tattrregR.ddl +$SRC_H5DUMP_OUTFILES/tbin1.ddl +$SRC_H5DUMP_OUTFILES/tbin1.ddl +$SRC_H5DUMP_OUTFILES/tbin2.ddl +$SRC_H5DUMP_OUTFILES/tbin3.ddl +$SRC_H5DUMP_OUTFILES/tbin4.ddl +$SRC_H5DUMP_OUTFILES/tbinregR.ddl +$SRC_H5DUMP_OUTFILES/tbigdims.ddl +$SRC_H5DUMP_OUTFILES/tbitnopaque_be.ddl +$SRC_H5DUMP_OUTFILES/tbitnopaque_le.ddl +$SRC_H5DUMP_OUTFILES/tboot1.ddl +$SRC_H5DUMP_OUTFILES/tboot2.ddl +$SRC_H5DUMP_OUTFILES/tboot2A.ddl +$SRC_H5DUMP_OUTFILES/tboot2B.ddl +$SRC_H5DUMP_OUTFILES/tchar1.ddl +$SRC_H5DUMP_OUTFILES/tchunked.ddl +$SRC_H5DUMP_OUTFILES/tcmpdattrintsize.ddl +$SRC_H5DUMP_OUTFILES/tcmpdintsize.ddl +$SRC_H5DUMP_OUTFILES/tcomp-1.ddl +$SRC_H5DUMP_OUTFILES/tcomp-2.ddl +$SRC_H5DUMP_OUTFILES/tcomp-3.ddl +$SRC_H5DUMP_OUTFILES/tcomp-4.ddl +$SRC_H5DUMP_OUTFILES/tcompound_complex2.ddl +$SRC_H5DUMP_OUTFILES/tcompact.ddl +$SRC_H5DUMP_OUTFILES/tcontents.ddl +$SRC_H5DUMP_OUTFILES/tcontiguos.ddl +$SRC_H5DUMP_OUTFILES/tdatareg.ddl +$SRC_H5DUMP_OUTFILES/tdataregR.ddl +$SRC_H5DUMP_OUTFILES/tdeflate.ddl +$SRC_H5DUMP_OUTFILES/tdset-1.ddl +$SRC_H5DUMP_OUTFILES/tdset-2.ddl +$SRC_H5DUMP_OUTFILES/tdset-3s.ddl +$SRC_H5DUMP_OUTFILES/tempty.ddl +$SRC_H5DUMP_OUTFILES/texceedsubstart.ddl +$SRC_H5DUMP_OUTFILES/texceedsubcount.ddl +$SRC_H5DUMP_OUTFILES/texceedsubstride.ddl +$SRC_H5DUMP_OUTFILES/texceedsubblock.ddl +$SRC_H5DUMP_OUTFILES/texternal.ddl +$SRC_H5DUMP_OUTFILES/textlinksrc.ddl +$SRC_H5DUMP_OUTFILES/textlinkfar.ddl +$SRC_H5DUMP_OUTFILES/textlink.ddl +$SRC_H5DUMP_OUTFILES/tfamily.ddl +$SRC_H5DUMP_OUTFILES/tfill.ddl +$SRC_H5DUMP_OUTFILES/tfletcher32.ddl +$SRC_H5DUMP_OUTFILES/tfloatsattrs.ddl +$SRC_H5DUMP_OUTFILES/tfpformat.ddl +$SRC_H5DUMP_OUTFILES/tgroup-1.ddl +$SRC_H5DUMP_OUTFILES/tgroup-2.ddl +$SRC_H5DUMP_OUTFILES/tgrp_comments.ddl +$SRC_H5DUMP_OUTFILES/tgrpnullspace.ddl +$SRC_H5DUMP_OUTFILES/thlink-1.ddl +$SRC_H5DUMP_OUTFILES/thlink-2.ddl +$SRC_H5DUMP_OUTFILES/thlink-3.ddl +$SRC_H5DUMP_OUTFILES/thlink-4.ddl +$SRC_H5DUMP_OUTFILES/thlink-5.ddl +$SRC_H5DUMP_OUTFILES/thyperslab.ddl +$SRC_H5DUMP_OUTFILES/tindicesno.ddl +$SRC_H5DUMP_OUTFILES/tindicessub1.ddl +$SRC_H5DUMP_OUTFILES/tindicessub2.ddl +$SRC_H5DUMP_OUTFILES/tindicessub3.ddl +$SRC_H5DUMP_OUTFILES/tindicessub4.ddl +$SRC_H5DUMP_OUTFILES/tindicesyes.ddl +$SRC_H5DUMP_OUTFILES/tints4dims.ddl +$SRC_H5DUMP_OUTFILES/tints4dimsBlock2.ddl +$SRC_H5DUMP_OUTFILES/tints4dimsBlockEq.ddl +$SRC_H5DUMP_OUTFILES/tints4dimsCount2.ddl +$SRC_H5DUMP_OUTFILES/tints4dimsCountEq.ddl +$SRC_H5DUMP_OUTFILES/tints4dimsStride2.ddl +$SRC_H5DUMP_OUTFILES/tintsattrs.ddl +$SRC_H5DUMP_OUTFILES/tlarge_objname.ddl +$SRC_H5DUMP_OUTFILES/tldouble.ddl +$SRC_H5DUMP_OUTFILES/tldouble_scalar.ddl +$SRC_H5DUMP_OUTFILES/tlonglinks.ddl +$SRC_H5DUMP_OUTFILES/tloop-1.ddl +$SRC_H5DUMP_OUTFILES/tmulti.ddl +$SRC_H5DUMP_OUTFILES/tmultifile.ddl +$SRC_H5DUMP_OUTFILES/tqmarkfile.ddl +$SRC_H5DUMP_OUTFILES/tstarfile.ddl +$SRC_H5DUMP_OUTFILES/tnamed_dtype_attr.ddl +$SRC_H5DUMP_OUTFILES/tnestcomp-1.ddl +$SRC_H5DUMP_OUTFILES/tnestedcmpddt.ddl +$SRC_H5DUMP_OUTFILES/tnbit.ddl +$SRC_H5DUMP_OUTFILES/tnoattrdata.ddl +$SRC_H5DUMP_OUTFILES/tnoattrddl.ddl +$SRC_H5DUMP_OUTFILES/tnodata.ddl +$SRC_H5DUMP_OUTFILES/tnoddl.ddl +$SRC_H5DUMP_OUTFILES/tnoddlfile.ddl +$SRC_H5DUMP_OUTFILES/tno-subset.ddl +$SRC_H5DUMP_OUTFILES/tnullspace.ddl +$SRC_H5DUMP_OUTFILES/trawdatafile.ddl +$SRC_H5DUMP_OUTFILES/trawssetfile.ddl +$SRC_H5DUMP_OUTFILES/zerodim.ddl +$SRC_H5DUMP_OUTFILES/tordergr1.ddl +$SRC_H5DUMP_OUTFILES/tordergr2.ddl +$SRC_H5DUMP_OUTFILES/tordergr3.ddl +$SRC_H5DUMP_OUTFILES/tordergr4.ddl +$SRC_H5DUMP_OUTFILES/tordergr5.ddl +$SRC_H5DUMP_OUTFILES/torderattr1.ddl +$SRC_H5DUMP_OUTFILES/torderattr2.ddl +$SRC_H5DUMP_OUTFILES/torderattr3.ddl +$SRC_H5DUMP_OUTFILES/torderattr4.ddl +$SRC_H5DUMP_OUTFILES/tordercontents1.ddl +$SRC_H5DUMP_OUTFILES/tordercontents2.ddl +$SRC_H5DUMP_OUTFILES/torderlinks1.ddl +$SRC_H5DUMP_OUTFILES/torderlinks2.ddl +$SRC_H5DUMP_OUTFILES/tperror.ddl +$SRC_H5DUMP_OUTFILES/treadfilter.ddl +$SRC_H5DUMP_OUTFILES/treadintfilter.ddl +$SRC_H5DUMP_OUTFILES/treference.ddl +$SRC_H5DUMP_OUTFILES/tsaf.ddl +$SRC_H5DUMP_OUTFILES/tscalarattrintsize.ddl +$SRC_H5DUMP_OUTFILES/tscalarintattrsize.ddl +$SRC_H5DUMP_OUTFILES/tscalarintsize.ddl +$SRC_H5DUMP_OUTFILES/tscalarstring.ddl +$SRC_H5DUMP_OUTFILES/tscaleoffset.ddl +$SRC_H5DUMP_OUTFILES/tshuffle.ddl +$SRC_H5DUMP_OUTFILES/tslink-1.ddl +$SRC_H5DUMP_OUTFILES/tslink-2.ddl +$SRC_H5DUMP_OUTFILES/tslink-D.ddl +$SRC_H5DUMP_OUTFILES/tsplit_file.ddl +$SRC_H5DUMP_OUTFILES/tstr-1.ddl +$SRC_H5DUMP_OUTFILES/tstr-2.ddl +$SRC_H5DUMP_OUTFILES/tstring.ddl +$SRC_H5DUMP_OUTFILES/tstring2.ddl +$SRC_H5DUMP_OUTFILES/tstringe.ddl +$SRC_H5DUMP_OUTFILES/tszip.ddl +$SRC_H5DUMP_OUTFILES/tudlink-1.ddl +$SRC_H5DUMP_OUTFILES/tudlink-2.ddl +$SRC_H5DUMP_OUTFILES/tuserfilter.ddl +$SRC_H5DUMP_OUTFILES/tvldtypes1.ddl +$SRC_H5DUMP_OUTFILES/tvldtypes2.ddl +$SRC_H5DUMP_OUTFILES/tvldtypes3.ddl +$SRC_H5DUMP_OUTFILES/tvldtypes4.ddl +$SRC_H5DUMP_OUTFILES/tvldtypes5.ddl +$SRC_H5DUMP_OUTFILES/tvlenstr_array.ddl +$SRC_H5DUMP_OUTFILES/tvlstr.ddl +$SRC_H5DUMP_OUTFILES/tvms.ddl +$SRC_H5DUMP_OUTFILES/twidedisplay.ddl +$SRC_H5DUMP_OUTFILES/twithddlfile.ddl +$SRC_H5DUMP_OUTFILES/h5dump-help.txt +$SRC_H5DUMP_OUTFILES/out3.h5import +$SRC_H5DUMP_OUTFILES/err_attr_dspace.ddl +$SRC_H5DUMP_OUTFILES/tst_onion_objs.ddl +$SRC_H5DUMP_OUTFILES/tst_onion_dset_ext.ddl +$SRC_H5DUMP_OUTFILES/tst_onion_dset_1d.ddl +$SRC_H5DUMP_OUTFILES/tst_onion_revision_count.ddl +" + +LIST_EXPORT_TEST_FILES=" +$SRC_H5DUMP_EXPFILES/tall-6.exp +$SRC_H5DUMP_EXPFILES/tbinregR.exp +$SRC_H5DUMP_EXPFILES/tnoddlfile.exp +$SRC_H5DUMP_EXPFILES/trawdatafile.exp +$SRC_H5DUMP_EXPFILES/trawssetfile.exp +$SRC_H5DUMP_EXPFILES/tstr2bin2.exp +$SRC_H5DUMP_EXPFILES/tstr2bin6.exp +$SRC_H5DUMP_EXPFILES/twithddl.exp +$SRC_H5DUMP_EXPFILES/twithddlfile.exp " LIST_ERROR_TEST_FILES=" @@ -415,7 +419,7 @@ ${SRC_H5DUMP_ERRORFILES}/tslink-D.err # # copy test files and expected output files from source dirs to test dir # -COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_OTHER_TEST_FILES $LIST_ERROR_TEST_FILES" +COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_OTHER_TEST_FILES $LIST_EXPORT_TEST_FILES $LIST_ERROR_TEST_FILES" COPY_TESTFILES_TO_TESTDIR() { diff --git a/tools/test/h5dump/testh5dumppbits.sh.in b/tools/test/h5dump/testh5dumppbits.sh.in index e638bb9287b..4094bfc8da7 100644 --- a/tools/test/h5dump/testh5dumppbits.sh.in +++ b/tools/test/h5dump/testh5dumppbits.sh.in @@ -45,11 +45,11 @@ verbose=yes # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_ERRORFILES="$srcdir/errfiles" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" +SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected" +SRC_H5DUMP_ERRORFILES="$SRC_TOOLS/test/h5dump/errfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" @@ -78,75 +78,75 @@ $SRC_H5DUMP_TESTFILES/tcompound.h5 " LIST_OTHER_TEST_FILES=" -$SRC_H5DUMP_TESTFILES/pbits/tnofilename-with-packed-bits.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsArray.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsCompound.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsIncomplete.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsLengthExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsCharLengthExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsIntLengthExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsLongLengthExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsLengthPositive.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsMax.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsMaxExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsOffsetExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsCharOffsetExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsIntOffsetExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsLongOffsetExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsOffsetNegative.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsOverlapped.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSigned.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsigned.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedInt.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedInt.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLong.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLong.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLong.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLong.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedWhole.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedWhole.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedIntWhole.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedIntWhole.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongWhole.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongWhole.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLongWhole.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLongWhole.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLongWhole1.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLongWhole1.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLongWhole63.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLongWhole63.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSigned4.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsigned4.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedInt8.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedInt8.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLong16.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLong16.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLong32.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLong32.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSigned2.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsigned2.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedInt4.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedInt4.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLong8.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLong8.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLong16.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLong16.ddl +$SRC_H5DUMP_OUTFILES/pbits/tnofilename-with-packed-bits.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsArray.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsCompound.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsIncomplete.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsLengthExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsCharLengthExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsIntLengthExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsLongLengthExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsLengthPositive.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsMax.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsMaxExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsOffsetExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsCharOffsetExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsIntOffsetExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsLongOffsetExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsOffsetNegative.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsOverlapped.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSigned.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsigned.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedInt.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedInt.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLong.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLong.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLong.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLong.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedWhole.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedWhole.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedIntWhole.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedIntWhole.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongWhole.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongWhole.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLongWhole.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLongWhole.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLongWhole1.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLongWhole1.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLongWhole63.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLongWhole63.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSigned4.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsigned4.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedInt8.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedInt8.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLong16.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLong16.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLong32.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLong32.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSigned2.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsigned2.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedInt4.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedInt4.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLong8.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLong8.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLong16.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLong16.ddl " LIST_ERROR_TEST_FILES=" -${SRC_H5DUMP_ERRORFILES}/tnofilename-with-packed-bits.err -${SRC_H5DUMP_ERRORFILES}/tpbitsCharLengthExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsCharOffsetExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsIncomplete.err -${SRC_H5DUMP_ERRORFILES}/tpbitsIntLengthExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsIntOffsetExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsLengthExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsLengthPositive.err -${SRC_H5DUMP_ERRORFILES}/tpbitsLongLengthExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsLongOffsetExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsMaxExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsOffsetExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsOffsetNegative.err +${SRC_H5DUMP_ERRORFILES}/pbits/tnofilename-with-packed-bits.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsCharLengthExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsCharOffsetExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsIncomplete.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsIntLengthExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsIntOffsetExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsLengthExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsLengthPositive.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsLongLengthExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsLongOffsetExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsMaxExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsOffsetExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsOffsetNegative.err " # diff --git a/tools/test/h5dump/testh5dumpvds.sh.in b/tools/test/h5dump/testh5dumpvds.sh.in index 00e01e54532..e09e429eb39 100644 --- a/tools/test/h5dump/testh5dumpvds.sh.in +++ b/tools/test/h5dump/testh5dumpvds.sh.in @@ -45,10 +45,10 @@ verbose=yes # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" +SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected" SRC_H5DUMP_ERRORFILES="$srcdir/errfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" @@ -106,23 +106,23 @@ $SRC_H5DUMP_TESTFILES/vds/vds-eiger.h5 " LIST_OTHER_TEST_FILES=" -$SRC_H5DUMP_TESTFILES/vds/tvds-1.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds-2.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds-3_1.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds-3_2.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds-4.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds-5.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds_layout-1.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds_layout-2.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds_layout-3_1.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds_layout-3_2.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds_layout-4.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds_layout-5.ddl -$SRC_H5DUMP_TESTFILES/vds/vds-first.ddl -$SRC_H5DUMP_TESTFILES/vds/vds-gap1.ddl -$SRC_H5DUMP_TESTFILES/vds/vds-gap2.ddl -$SRC_H5DUMP_TESTFILES/vds/vds_layout-eiger.ddl -$SRC_H5DUMP_TESTFILES/vds/vds_layout-maxmin.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds-1.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds-2.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds-3_1.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds-3_2.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds-4.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds-5.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds_layout-1.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds_layout-2.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds_layout-3_1.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds_layout-3_2.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds_layout-4.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds_layout-5.ddl +$SRC_H5DUMP_OUTFILES/vds/vds-first.ddl +$SRC_H5DUMP_OUTFILES/vds/vds-gap1.ddl +$SRC_H5DUMP_OUTFILES/vds/vds-gap2.ddl +$SRC_H5DUMP_OUTFILES/vds/vds_layout-eiger.ddl +$SRC_H5DUMP_OUTFILES/vds/vds_layout-maxmin.ddl " LIST_ERROR_TEST_FILES=" diff --git a/tools/test/h5dump/testh5dumpxml.sh.in b/tools/test/h5dump/testh5dumpxml.sh.in index cebdb972069..b433fa210e3 100644 --- a/tools/test/h5dump/testh5dumpxml.sh.in +++ b/tools/test/h5dump/testh5dumpxml.sh.in @@ -37,16 +37,16 @@ verbose=yes # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" +SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected" TEST_P_DIR=./testfiles TESTDIR=./testfiles/xml @@ -63,6 +63,30 @@ test -d $TESTDIR || mkdir -p $TESTDIR # Comment '#' without space can be used. # -------------------------------------------------------------------- LIST_HDF5_TEST_FILES_XML=" +$SRC_H5DUMP_TESTFILES/xml/tbitfields.h5 +$SRC_H5DUMP_TESTFILES/xml/tcompound2.h5 +$SRC_H5DUMP_TESTFILES/xml/tdset2.h5 +$SRC_H5DUMP_TESTFILES/xml/tenum.h5 +$SRC_H5DUMP_TESTFILES/xml/test35.nc +$SRC_H5DUMP_TESTFILES/xml/tloop2.h5 +$SRC_H5DUMP_TESTFILES/xml/tmany.h5 +$SRC_H5DUMP_TESTFILES/xml/tname-amp.h5 +$SRC_H5DUMP_TESTFILES/xml/tname-apos.h5 +$SRC_H5DUMP_TESTFILES/xml/tname-gt.h5 +$SRC_H5DUMP_TESTFILES/xml/tname-lt.h5 +$SRC_H5DUMP_TESTFILES/xml/tname-quot.h5 +$SRC_H5DUMP_TESTFILES/xml/tname-sp.h5 +$SRC_H5DUMP_TESTFILES/xml/tnodata.h5 +$SRC_H5DUMP_TESTFILES/xml/tobjref.h5 +$SRC_H5DUMP_TESTFILES/xml/topaque.h5 +$SRC_H5DUMP_TESTFILES/xml/tref.h5 +$SRC_H5DUMP_TESTFILES/xml/tref-escapes.h5 +$SRC_H5DUMP_TESTFILES/xml/tref-escapes-at.h5 +$SRC_H5DUMP_TESTFILES/xml/tstring.h5 +$SRC_H5DUMP_TESTFILES/xml/tstring-at.h5 +" + +LIST_HDF5_TEST_FILES=" $SRC_H5DUMP_TESTFILES/tall.h5 $SRC_H5DUMP_TESTFILES/tarray1.h5 $SRC_H5DUMP_TESTFILES/tarray2.h5 @@ -70,43 +94,22 @@ $SRC_H5DUMP_TESTFILES/tarray3.h5 $SRC_H5DUMP_TESTFILES/tarray6.h5 $SRC_H5DUMP_TESTFILES/tarray7.h5 $SRC_H5DUMP_TESTFILES/tattr.h5 -$SRC_H5DUMP_TESTFILES/tbitfields.h5 $SRC_H5DUMP_TESTFILES/tcompound.h5 -$SRC_H5DUMP_TESTFILES/tcompound2.h5 $SRC_H5DUMP_TESTFILES/tcompound_complex.h5 $SRC_H5DUMP_TESTFILES/tdatareg.h5 $SRC_H5DUMP_TESTFILES/tdset.h5 -$SRC_H5DUMP_TESTFILES/tdset2.h5 $SRC_H5DUMP_TESTFILES/tempty.h5 -$SRC_H5DUMP_TESTFILES/tenum.h5 -$SRC_H5DUMP_TESTFILES/test35.nc $SRC_H5DUMP_TESTFILES/textlink.h5 $SRC_H5DUMP_TESTFILES/tfpformat.h5 $SRC_H5DUMP_TESTFILES/tgroup.h5 $SRC_H5DUMP_TESTFILES/thlink.h5 $SRC_H5DUMP_TESTFILES/tloop.h5 -$SRC_H5DUMP_TESTFILES/tloop2.h5 -$SRC_H5DUMP_TESTFILES/tmany.h5 -$SRC_H5DUMP_TESTFILES/tname-amp.h5 -$SRC_H5DUMP_TESTFILES/tname-apos.h5 -$SRC_H5DUMP_TESTFILES/tname-gt.h5 -$SRC_H5DUMP_TESTFILES/tname-lt.h5 -$SRC_H5DUMP_TESTFILES/tname-quot.h5 -$SRC_H5DUMP_TESTFILES/tname-sp.h5 $SRC_H5DUMP_TESTFILES/tnamed_dtype_attr.h5 $SRC_H5DUMP_TESTFILES/tnestedcomp.h5 -$SRC_H5DUMP_TESTFILES/tnodata.h5 $SRC_H5DUMP_TESTFILES/tnullspace.h5 -$SRC_H5DUMP_TESTFILES/tobjref.h5 -$SRC_H5DUMP_TESTFILES/topaque.h5 $SRC_H5DUMP_TESTFILES/torderattr.h5 -$SRC_H5DUMP_TESTFILES/tref.h5 -$SRC_H5DUMP_TESTFILES/tref-escapes.h5 -$SRC_H5DUMP_TESTFILES/tref-escapes-at.h5 $SRC_H5DUMP_TESTFILES/tsaf.h5 $SRC_H5DUMP_TESTFILES/tslink.h5 -$SRC_H5DUMP_TESTFILES/tstring.h5 -$SRC_H5DUMP_TESTFILES/tstring-at.h5 $SRC_H5DUMP_TESTFILES/tstr.h5 $SRC_H5DUMP_TESTFILES/tstr2.h5 $SRC_H5DUMP_TESTFILES/tudlink.h5 @@ -119,78 +122,78 @@ $SRC_H5DUMP_TESTFILES/tvlstr.h5 " LIST_OTHER_TEST_FILES_XML=" -$SRC_H5DUMP_TESTFILES/tall.h5.xml -$SRC_H5DUMP_TESTFILES/tall-2A.h5.xml -$SRC_H5DUMP_TESTFILES/tarray1.h5.xml -$SRC_H5DUMP_TESTFILES/tarray2.h5.xml -$SRC_H5DUMP_TESTFILES/tarray3.h5.xml -$SRC_H5DUMP_TESTFILES/tarray6.h5.xml -$SRC_H5DUMP_TESTFILES/tarray7.h5.xml -$SRC_H5DUMP_TESTFILES/tattr.h5.xml -$SRC_H5DUMP_TESTFILES/tbitfields_be.h5.xml -$SRC_H5DUMP_TESTFILES/tbitfields_le.h5.xml -$SRC_H5DUMP_TESTFILES/tcompound_complex.h5.xml -$SRC_H5DUMP_TESTFILES/tcompound.h5.xml -$SRC_H5DUMP_TESTFILES/tcompound2.h5.xml -$SRC_H5DUMP_TESTFILES/tdatareg.h5.xml -$SRC_H5DUMP_TESTFILES/tdset.h5.xml -$SRC_H5DUMP_TESTFILES/tdset2.h5.xml -$SRC_H5DUMP_TESTFILES/tempty.h5.xml -$SRC_H5DUMP_TESTFILES/tempty-dtd.h5.xml -$SRC_H5DUMP_TESTFILES/tempty-dtd-2.h5.xml -$SRC_H5DUMP_TESTFILES/tempty-dtd-uri.h5.xml -$SRC_H5DUMP_TESTFILES/tempty-nons.h5.xml -$SRC_H5DUMP_TESTFILES/tempty-nons-2.h5.xml -$SRC_H5DUMP_TESTFILES/tempty-nons-uri.h5.xml -$SRC_H5DUMP_TESTFILES/tempty-ns.h5.xml -$SRC_H5DUMP_TESTFILES/tempty-ns-2.h5.xml -$SRC_H5DUMP_TESTFILES/tenum.h5.xml -$SRC_H5DUMP_TESTFILES/test35.nc.xml -$SRC_H5DUMP_TESTFILES/textlink.h5.xml -$SRC_H5DUMP_TESTFILES/tfpformat.h5.xml -$SRC_H5DUMP_TESTFILES/tgroup.h5.xml -$SRC_H5DUMP_TESTFILES/thlink.h5.xml -$SRC_H5DUMP_TESTFILES/tloop.h5.xml -$SRC_H5DUMP_TESTFILES/tloop2.h5.xml -$SRC_H5DUMP_TESTFILES/tmany.h5.xml -$SRC_H5DUMP_TESTFILES/tname-amp.h5.xml -$SRC_H5DUMP_TESTFILES/tname-apos.h5.xml -$SRC_H5DUMP_TESTFILES/tnamed_dtype_attr.h5.xml -$SRC_H5DUMP_TESTFILES/tname-gt.h5.xml -$SRC_H5DUMP_TESTFILES/tname-lt.h5.xml -$SRC_H5DUMP_TESTFILES/tname-quot.h5.xml -$SRC_H5DUMP_TESTFILES/tname-sp.h5.xml -$SRC_H5DUMP_TESTFILES/tnestedcomp.h5.xml -$SRC_H5DUMP_TESTFILES/tnodata.h5.xml -$SRC_H5DUMP_TESTFILES/tnullspace.h5.xml -$SRC_H5DUMP_TESTFILES/tobjref.h5.xml -$SRC_H5DUMP_TESTFILES/topaque.h5.xml -$SRC_H5DUMP_TESTFILES/torderattr1.h5.xml -$SRC_H5DUMP_TESTFILES/torderattr2.h5.xml -$SRC_H5DUMP_TESTFILES/torderattr3.h5.xml -$SRC_H5DUMP_TESTFILES/torderattr4.h5.xml -$SRC_H5DUMP_TESTFILES/tref.h5.xml -$SRC_H5DUMP_TESTFILES/tref-escapes.h5.xml -$SRC_H5DUMP_TESTFILES/tref-escapes-at.h5.xml -$SRC_H5DUMP_TESTFILES/tsaf.h5.xml -$SRC_H5DUMP_TESTFILES/tslink.h5.xml -$SRC_H5DUMP_TESTFILES/tstr.h5.xml -$SRC_H5DUMP_TESTFILES/tstr2.h5.xml -$SRC_H5DUMP_TESTFILES/tstring.h5.xml -$SRC_H5DUMP_TESTFILES/tstring-at.h5.xml -$SRC_H5DUMP_TESTFILES/tudlink.h5.xml -$SRC_H5DUMP_TESTFILES/tvldtypes1.h5.xml -$SRC_H5DUMP_TESTFILES/tvldtypes2.h5.xml -$SRC_H5DUMP_TESTFILES/tvldtypes3.h5.xml -$SRC_H5DUMP_TESTFILES/tvldtypes4.h5.xml -$SRC_H5DUMP_TESTFILES/tvldtypes5.h5.xml -$SRC_H5DUMP_TESTFILES/tvlstr.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tall.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tall-2A.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tarray1.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tarray2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tarray3.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tarray6.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tarray7.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tattr.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tbitfields_be.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tbitfields_le.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tcompound_complex.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tcompound.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tcompound2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tdatareg.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tdset.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tdset2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty-dtd.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty-dtd-2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty-dtd-uri.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty-nons.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty-nons-2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty-nons-uri.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty-ns.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty-ns-2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tenum.h5.xml +$SRC_H5DUMP_OUTFILES/xml/test35.nc.xml +$SRC_H5DUMP_OUTFILES/xml/textlink.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tfpformat.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tgroup.h5.xml +$SRC_H5DUMP_OUTFILES/xml/thlink.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tloop.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tloop2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tmany.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tname-amp.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tname-apos.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tnamed_dtype_attr.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tname-gt.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tname-lt.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tname-quot.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tname-sp.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tnestedcomp.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tnodata.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tnullspace.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tobjref.h5.xml +$SRC_H5DUMP_OUTFILES/xml/topaque.h5.xml +$SRC_H5DUMP_OUTFILES/xml/torderattr1.h5.xml +$SRC_H5DUMP_OUTFILES/xml/torderattr2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/torderattr3.h5.xml +$SRC_H5DUMP_OUTFILES/xml/torderattr4.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tref.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tref-escapes.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tref-escapes-at.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tsaf.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tslink.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tstr.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tstr2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tstring.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tstring-at.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tudlink.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tvldtypes1.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tvldtypes2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tvldtypes3.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tvldtypes4.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tvldtypes5.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tvlstr.h5.xml " # # copy test files and expected output files from source dirs to test dir # -COPY_TESTFILES="$LIST_HDF5_TEST_FILES_XML $LIST_OTHER_TEST_FILES_XML" +COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_HDF5_TEST_FILES_XML $LIST_OTHER_TEST_FILES_XML" COPY_TESTFILES_TO_TESTDIR() { diff --git a/tools/test/h5format_convert/CMakeTests.cmake b/tools/test/h5format_convert/CMakeTests.cmake index 73cb2ee6f59..3046521a365 100644 --- a/tools/test/h5format_convert/CMakeTests.cmake +++ b/tools/test/h5format_convert/CMakeTests.cmake @@ -79,15 +79,15 @@ add_custom_target(h5fc-files ALL COMMENT "Copying files needed by h5fc tests") foreach (ddl_file ${HDF5_REFERENCE_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${ddl_file}" "${PROJECT_BINARY_DIR}/testfiles/${ddl_file}" "h5fc_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${ddl_file}" "${PROJECT_BINARY_DIR}/testfiles/${ddl_file}" "h5fc_files") endforeach () foreach (h5_file ${HDF5_REFERENCE_ERR_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files") endforeach () foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files") endforeach () add_custom_target(h5fc_files ALL COMMENT "Copying files needed by h5fc tests" DEPENDS ${h5fc_files_list}) diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file-d.ddl b/tools/test/h5format_convert/expected/h5fc_d_file-d.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_d_file-d.ddl rename to tools/test/h5format_convert/expected/h5fc_d_file-d.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl b/tools/test/h5format_convert/expected/h5fc_d_file.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_d_file.ddl rename to tools/test/h5format_convert/expected/h5fc_d_file.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl.err b/tools/test/h5format_convert/expected/h5fc_d_file.ddl.err similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_d_file.ddl.err rename to tools/test/h5format_convert/expected/h5fc_d_file.ddl.err diff --git a/tools/test/h5format_convert/testfiles/h5fc_dname.ddl b/tools/test/h5format_convert/expected/h5fc_dname.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_dname.ddl rename to tools/test/h5format_convert/expected/h5fc_dname.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_dname.err b/tools/test/h5format_convert/expected/h5fc_dname.err similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_dname.err rename to tools/test/h5format_convert/expected/h5fc_dname.err diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext1_f.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_f.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_ext1_f.ddl rename to tools/test/h5format_convert/expected/h5fc_ext1_f.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext1_i.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_i.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_ext1_i.ddl rename to tools/test/h5format_convert/expected/h5fc_ext1_i.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext1_s.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_s.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_ext1_s.ddl rename to tools/test/h5format_convert/expected/h5fc_ext1_s.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext2_if.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_if.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_ext2_if.ddl rename to tools/test/h5format_convert/expected/h5fc_ext2_if.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext2_is.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_is.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_ext2_is.ddl rename to tools/test/h5format_convert/expected/h5fc_ext2_is.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext2_sf.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_ext2_sf.ddl rename to tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext3_isf.ddl b/tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_ext3_isf.ddl rename to tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_help.ddl b/tools/test/h5format_convert/expected/h5fc_help.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_help.ddl rename to tools/test/h5format_convert/expected/h5fc_help.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl.err b/tools/test/h5format_convert/expected/h5fc_nonexistdset_file.ddl.err similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl.err rename to tools/test/h5format_convert/expected/h5fc_nonexistdset_file.ddl.err diff --git a/tools/test/h5format_convert/testfiles/h5fc_nonexistfile.ddl.err b/tools/test/h5format_convert/expected/h5fc_nonexistfile.ddl.err similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_nonexistfile.ddl.err rename to tools/test/h5format_convert/expected/h5fc_nonexistfile.ddl.err diff --git a/tools/test/h5format_convert/testfiles/h5fc_nooption.ddl b/tools/test/h5format_convert/expected/h5fc_nooption.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_nooption.ddl rename to tools/test/h5format_convert/expected/h5fc_nooption.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_all.ddl b/tools/test/h5format_convert/expected/h5fc_v_all.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_v_all.ddl rename to tools/test/h5format_convert/expected/h5fc_v_all.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_bt1.ddl b/tools/test/h5format_convert/expected/h5fc_v_bt1.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_v_bt1.ddl rename to tools/test/h5format_convert/expected/h5fc_v_bt1.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl b/tools/test/h5format_convert/expected/h5fc_v_err.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_v_err.ddl rename to tools/test/h5format_convert/expected/h5fc_v_err.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl.err b/tools/test/h5format_convert/expected/h5fc_v_err.ddl.err similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_v_err.ddl.err rename to tools/test/h5format_convert/expected/h5fc_v_err.ddl.err diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_n_1d.ddl b/tools/test/h5format_convert/expected/h5fc_v_n_1d.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_v_n_1d.ddl rename to tools/test/h5format_convert/expected/h5fc_v_n_1d.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_n_all.ddl b/tools/test/h5format_convert/expected/h5fc_v_n_all.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_v_n_all.ddl rename to tools/test/h5format_convert/expected/h5fc_v_n_all.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl b/tools/test/h5format_convert/expected/h5fc_v_ndata_bt1.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl rename to tools/test/h5format_convert/expected/h5fc_v_ndata_bt1.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_non_chunked.ddl b/tools/test/h5format_convert/expected/h5fc_v_non_chunked.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_v_non_chunked.ddl rename to tools/test/h5format_convert/expected/h5fc_v_non_chunked.ddl diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_f.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/old_h5fc_ext1_f.ddl rename to tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_i.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/old_h5fc_ext1_i.ddl rename to tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_s.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/old_h5fc_ext1_s.ddl rename to tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_if.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/old_h5fc_ext2_if.ddl rename to tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_is.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/old_h5fc_ext2_is.ddl rename to tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl rename to tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl rename to tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl diff --git a/tools/test/h5format_convert/testh5fc.sh.in b/tools/test/h5format_convert/testh5fc.sh.in index cd2b8014e0d..4ba46cbe88c 100644 --- a/tools/test/h5format_convert/testh5fc.sh.in +++ b/tools/test/h5format_convert/testh5fc.sh.in @@ -49,11 +49,10 @@ verbose=yes # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" @@ -61,6 +60,7 @@ SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" SRC_H5FORMCONV_TESTFILES="$SRC_TOOLS/test/h5format_convert/testfiles" +SRC_H5FORMCONV_OUTFILES="$SRC_TOOLS/test/h5format_convert/expected" TESTDIR=./testfiles test -d $TESTDIR || mkdir $TESTDIR @@ -103,39 +103,39 @@ $SRC_H5FORMCONV_TESTFILES/h5fc_err_level.h5 " LIST_ERR_TEST_FILES=" -$SRC_H5FORMCONV_TESTFILES/h5fc_d_file.ddl.err -$SRC_H5FORMCONV_TESTFILES/h5fc_dname.err -$SRC_H5FORMCONV_TESTFILES/h5fc_nonexistfile.ddl.err -$SRC_H5FORMCONV_TESTFILES/h5fc_nonexistdset_file.ddl.err +$SRC_H5FORMCONV_OUTFILES/h5fc_d_file.ddl.err +$SRC_H5FORMCONV_OUTFILES/h5fc_dname.err +$SRC_H5FORMCONV_OUTFILES/h5fc_nonexistfile.ddl.err +$SRC_H5FORMCONV_OUTFILES/h5fc_nonexistdset_file.ddl.err " LIST_OTHER_TEST_FILES=" -$SRC_H5FORMCONV_TESTFILES/h5fc_help.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_nooption.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_d_file.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_dname.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_v_non_chunked.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_v_bt1.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_v_ndata_bt1.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_v_all.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_v_n_1d.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_v_n_all.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_ext1_i.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_ext1_s.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_ext1_f.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_ext2_if.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_ext2_is.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_ext2_sf.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_ext3_isf.ddl -$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext1_i.ddl -$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext1_s.ddl -$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext1_f.ddl -$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext2_if.ddl -$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext2_is.ddl -$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext2_sf.ddl -$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext3_isf.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_v_err.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_v_err.ddl.err +$SRC_H5FORMCONV_OUTFILES/h5fc_help.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_nooption.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_d_file.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_dname.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_v_non_chunked.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_v_bt1.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_v_ndata_bt1.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_v_all.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_v_n_1d.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_v_n_all.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_ext1_i.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_ext1_s.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_ext1_f.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_ext2_if.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_ext2_is.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_ext2_sf.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_ext3_isf.ddl +$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext1_i.ddl +$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext1_s.ddl +$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext1_f.ddl +$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext2_if.ddl +$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext2_is.ddl +$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext2_sf.ddl +$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext3_isf.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_v_err.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_v_err.ddl.err " # diff --git a/tools/test/h5import/CMakeTests.cmake b/tools/test/h5import/CMakeTests.cmake index 750611698f4..c3bbd79857c 100644 --- a/tools/test/h5import/CMakeTests.cmake +++ b/tools/test/h5import/CMakeTests.cmake @@ -45,6 +45,8 @@ dbinuin16.h5.txt dbinuin32.h5.txt dtxtstr.h5.txt + ) + set (HDF5_REFERENCE_DDL_FILES tall_fp32.ddl tall_i32.ddl tintsattrs_u32.ddl @@ -74,19 +76,23 @@ file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") foreach (conf_file ${HDF5_REFERENCE_CONF_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/testfiles/${conf_file}" "${PROJECT_BINARY_DIR}/testfiles/${conf_file}" "h5import_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${conf_file}" "${PROJECT_BINARY_DIR}/testfiles/${conf_file}" "h5import_files") endforeach () foreach (txt_file ${HDF5_REFERENCE_TXT_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5import_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5import_files") + endforeach () + + foreach (txt_file ${HDF5_REFERENCE_DDL_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5import_files") endforeach () foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files") endforeach () foreach (h5_file ${HDF5_TOOLS_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files") endforeach () add_custom_target(h5import_files ALL COMMENT "Copying files needed by h5import tests" DEPENDS ${h5import_files_list}) diff --git a/tools/test/h5import/h5importtestutil.sh.in b/tools/test/h5import/h5importtestutil.sh.in index ba91ee55c0e..65b899fc9c4 100644 --- a/tools/test/h5import/h5importtestutil.sh.in +++ b/tools/test/h5import/h5importtestutil.sh.in @@ -41,11 +41,10 @@ nerrors=0 # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" @@ -82,8 +81,8 @@ $SRC_H5IMPORT_TESTFILES/txtuin16.h5 $SRC_H5IMPORT_TESTFILES/txtuin32.h5 $SRC_H5IMPORT_TESTFILES/txtstr.h5 $SRC_H5IMPORT_TESTFILES/textpfe.h5 -$SRC_TOOLS_TESTFILES/tall.h5 -$SRC_TOOLS_TESTFILES/tintsattrs.h5 +$SRC_H5DUMP_TESTFILES/tall.h5 +$SRC_H5DUMP_TESTFILES/tintsattrs.h5 " LIST_OTHER_TEST_FILES=" diff --git a/tools/test/h5jam/CMakeTests.cmake b/tools/test/h5jam/CMakeTests.cmake index e19ec867fe0..eb6070ea5bf 100644 --- a/tools/test/h5jam/CMakeTests.cmake +++ b/tools/test/h5jam/CMakeTests.cmake @@ -33,11 +33,11 @@ file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5jam_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5jam_files") endforeach () foreach (txt_file ${HDF5_REFERENCE_TXT_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5jam_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5jam_files") endforeach () add_custom_target(h5jam_files ALL COMMENT "Copying files needed by h5jam tests" DEPENDS ${h5jam_files_list}) diff --git a/tools/test/h5jam/testfiles/h5jam-help.txt b/tools/test/h5jam/expected/h5jam-help.txt similarity index 100% rename from tools/test/h5jam/testfiles/h5jam-help.txt rename to tools/test/h5jam/expected/h5jam-help.txt diff --git a/tools/test/h5jam/testfiles/h5jam-ub-nohdf5.txt b/tools/test/h5jam/expected/h5jam-ub-nohdf5.txt similarity index 100% rename from tools/test/h5jam/testfiles/h5jam-ub-nohdf5.txt rename to tools/test/h5jam/expected/h5jam-ub-nohdf5.txt diff --git a/tools/test/h5jam/testfiles/h5unjam-help.txt b/tools/test/h5jam/expected/h5unjam-help.txt similarity index 100% rename from tools/test/h5jam/testfiles/h5unjam-help.txt rename to tools/test/h5jam/expected/h5unjam-help.txt diff --git a/tools/test/h5jam/testfiles/u10.txt b/tools/test/h5jam/expected/u10.txt similarity index 100% rename from tools/test/h5jam/testfiles/u10.txt rename to tools/test/h5jam/expected/u10.txt diff --git a/tools/test/h5jam/testfiles/u511.txt b/tools/test/h5jam/expected/u511.txt similarity index 100% rename from tools/test/h5jam/testfiles/u511.txt rename to tools/test/h5jam/expected/u511.txt diff --git a/tools/test/h5jam/testfiles/u512.txt b/tools/test/h5jam/expected/u512.txt similarity index 100% rename from tools/test/h5jam/testfiles/u512.txt rename to tools/test/h5jam/expected/u512.txt diff --git a/tools/test/h5jam/testfiles/u513.txt b/tools/test/h5jam/expected/u513.txt similarity index 100% rename from tools/test/h5jam/testfiles/u513.txt rename to tools/test/h5jam/expected/u513.txt diff --git a/tools/test/h5jam/testh5jam.sh.in b/tools/test/h5jam/testh5jam.sh.in index 805ce11e06e..49598da07d0 100644 --- a/tools/test/h5jam/testh5jam.sh.in +++ b/tools/test/h5jam/testh5jam.sh.in @@ -43,17 +43,17 @@ verbose=yes # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" +SRC_H5JAM_OUTFILES="$SRC_TOOLS/test/h5jam/expected" TESTDIR=./testfiles test -d $TESTDIR || mkdir $TESTDIR @@ -73,13 +73,13 @@ $SRC_H5JAM_TESTFILES/twithub.h5 $SRC_H5JAM_TESTFILES/twithub513.h5 " LIST_OTHER_TEST_FILES=" -$SRC_H5JAM_TESTFILES/u10.txt -$SRC_H5JAM_TESTFILES/u511.txt -$SRC_H5JAM_TESTFILES/u512.txt -$SRC_H5JAM_TESTFILES/u513.txt -$SRC_H5JAM_TESTFILES/h5jam-help.txt -$SRC_H5JAM_TESTFILES/h5unjam-help.txt -$SRC_H5JAM_TESTFILES/h5jam-ub-nohdf5.txt +$SRC_H5JAM_OUTFILES/u10.txt +$SRC_H5JAM_OUTFILES/u511.txt +$SRC_H5JAM_OUTFILES/u512.txt +$SRC_H5JAM_OUTFILES/u513.txt +$SRC_H5JAM_OUTFILES/h5jam-help.txt +$SRC_H5JAM_OUTFILES/h5unjam-help.txt +$SRC_H5JAM_OUTFILES/h5jam-ub-nohdf5.txt " # Source in the output filter function definitions. diff --git a/tools/test/h5ls/CMakeTests.cmake b/tools/test/h5ls/CMakeTests.cmake index 15f18b5e7a8..14a7e5d97a3 100644 --- a/tools/test/h5ls/CMakeTests.cmake +++ b/tools/test/h5ls/CMakeTests.cmake @@ -19,112 +19,119 @@ # -------------------------------------------------------------------- # Copy all the test files from source directory to test directory # -------------------------------------------------------------------- + set (LIST_HDF5_TESTLS_FILES + tdset_idx.h5 + ) + set (LIST_HDF5_TEST_FILES - ${HDF5_TOOLS_DIR}/testfiles/tall.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5 - ${HDF5_TOOLS_DIR}/testfiles/tattr2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdset.h5 - ${HDF5_TOOLS_DIR}/testfiles/tempty.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlinktar.h5 - ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5 - ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.h5 - ${HDF5_TOOLS_DIR}/testfiles/tgrpnullspace.h5 - ${HDF5_TOOLS_DIR}/testfiles/thlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tloop.h5 - ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5 - ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5 - ${HDF5_TOOLS_DIR}/testfiles/tslink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks.h5 - ${HDF5_TOOLS_DIR}/testfiles/tstr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tudfilter.h5 - ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdset_idx.h5 + tall.h5 + tarray1.h5 + tattr2.h5 + tattrreg.h5 + tcompound.h5 + tdatareg.h5 + tdset.h5 + tempty.h5 + textlink.h5 + textlinksrc.h5 + textlinktar.h5 + tgroup.h5 + tgrp_comments.h5 + tgrpnullspace.h5 + thlink.h5 + tloop.h5 + tnestedcomp.h5 + tsaf.h5 + tslink.h5 + tsoftlinks.h5 + tstr.h5 + tudfilter.h5 + tudlink.h5 + tvldtypes1.h5 ) set (LIST_ERR_TEST_FILES - ${HDF5_TOOLS_DIR}/test/h5ls/errfiles/nosuchfile.err - ${HDF5_TOOLS_DIR}/test/h5ls/errfiles/textlinksrc-nodangle-1.err - ${HDF5_TOOLS_DIR}/test/h5ls/errfiles/tgroup-1.err + nosuchfile.err + textlinksrc-nodangle-1.err + tgroup-1.err ) set (LIST_OTHER_TEST_FILES - ${HDF5_TOOLS_DIR}/testfiles/help-1.ls - ${HDF5_TOOLS_DIR}/testfiles/help-2.ls - ${HDF5_TOOLS_DIR}/testfiles/help-3.ls - ${HDF5_TOOLS_DIR}/testfiles/nosuchfile.ls - ${HDF5_TOOLS_DIR}/testfiles/tall-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tall-2.ls - ${HDF5_TOOLS_DIR}/testfiles/tarray1.ls - ${HDF5_TOOLS_DIR}/testfiles/tattr2.ls - ${HDF5_TOOLS_DIR}/testfiles/tattrreg_le.ls - ${HDF5_TOOLS_DIR}/testfiles/tattrreg_be.ls - ${HDF5_TOOLS_DIR}/testfiles/tcomp-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tdataregbe.ls - ${HDF5_TOOLS_DIR}/testfiles/tdataregle.ls - ${HDF5_TOOLS_DIR}/testfiles/tdset-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tempty.ls - ${HDF5_TOOLS_DIR}/testfiles/textlink-1.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-1.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-2.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-3.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-4.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-5.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-6.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-7.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-1-old.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-2-old.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-3-old.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-6-old.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-7-old.ls - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-2.ls - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-3.ls - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-4.ls - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-5.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-nodangle-1.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-nodangle-2.ls - ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.ls - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-nodangle-1.ls - ${HDF5_TOOLS_DIR}/testfiles/thlinks-nodangle-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tgroup.ls - ${HDF5_TOOLS_DIR}/testfiles/tgroup-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tgroup-2.ls - ${HDF5_TOOLS_DIR}/testfiles/tgroup-3.ls - ${HDF5_TOOLS_DIR}/testfiles/tgrpnullspace.ls - ${HDF5_TOOLS_DIR}/testfiles/thlink-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tloop-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tmultifile.ls - ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-2.ls - ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-3.ls - ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-4.ls - ${HDF5_TOOLS_DIR}/testfiles/tsaf.ls - ${HDF5_TOOLS_DIR}/testfiles/tslink-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tstr-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tudfilter.ls - ${HDF5_TOOLS_DIR}/testfiles/tudlink-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.ls - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2le.ls - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2be.ls - ${HDF5_TOOLS_DIR}/testfiles/tdset_idx.ls + help-1.ls + help-2.ls + help-3.ls + nosuchfile.ls + tall-1.ls + tall-2.ls + tarray1.ls + tattr2.ls + tattrreg_le.ls + tattrreg_be.ls + tcomp-1.ls + tdataregbe.ls + tdataregle.ls + tdset-1.ls + tdset_idx.ls + tempty.ls + textlink-1.ls + textlinksrc-1.ls + textlinksrc-2.ls + textlinksrc-3.ls + textlinksrc-4.ls + textlinksrc-5.ls + textlinksrc-6.ls + textlinksrc-7.ls + textlinksrc-1-old.ls + textlinksrc-2-old.ls + textlinksrc-3-old.ls + textlinksrc-6-old.ls + textlinksrc-7-old.ls + textlinksrc-nodangle-1.ls + textlinksrc-nodangle-2.ls + tgroup.ls + tgroup-1.ls + tgroup-2.ls + tgroup-3.ls + tgrpnullspace.ls + tgrp_comments.ls + thlinks-nodangle-1.ls + thlink-1.ls + tloop-1.ls + tmultifile.ls + tnestcomp-1.ls + tnestcomp-2.ls + tnestcomp-3.ls + tnestcomp-4.ls + tsaf.ls + tslink-1.ls + tsoftlinks-1.ls + tsoftlinks-2.ls + tsoftlinks-3.ls + tsoftlinks-4.ls + tsoftlinks-5.ls + tsoftlinks-nodangle-1.ls + tstr-1.ls + tudfilter.ls + tudlink-1.ls + tvldtypes1.ls + tvldtypes2le.ls + tvldtypes2be.ls ) file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") # copy the list of test files - foreach (listfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES}) - get_filename_component(fname "${listfiles}" NAME) - HDFTEST_COPY_FILE("${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5ls_files") + foreach (listlsfiles ${LIST_HDF5_TESTLS_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${listlsfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listlsfiles}" "h5ls_files") + endforeach () + foreach (listfiles ${LIST_HDF5_TEST_FILES}) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listfiles}" "h5ls_files") + endforeach () + foreach (listothers ${LIST_OTHER_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/${listothers}" "h5ls_files") endforeach () - foreach (listfiles ${LIST_ERR_TEST_FILES}) - get_filename_component(fname "${listfiles}" NAME) - HDFTEST_COPY_FILE("${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5ls_files") + foreach (listerrfiles ${LIST_ERR_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${listerrfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listerrfiles}" "h5ls_files") endforeach () add_custom_target(h5ls_files ALL COMMENT "Copying files needed by h5ls tests" DEPENDS ${h5ls_files_list}) diff --git a/tools/test/h5ls/CMakeTestsVDS.cmake b/tools/test/h5ls/CMakeTestsVDS.cmake index 5ef21abbb29..3718f64e51c 100644 --- a/tools/test/h5ls/CMakeTestsVDS.cmake +++ b/tools/test/h5ls/CMakeTestsVDS.cmake @@ -57,19 +57,20 @@ file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") # copy the list of test files - foreach (listfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES}) - get_filename_component(fname "${listfiles}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}" "h5ls_vds_files") + foreach (listfiles ${LIST_HDF5_TEST_FILES}) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/${listfiles}" "h5ls_vds_files") + endforeach () + + foreach (listothers ${LIST_OTHER_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/vds/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/vds/${listothers}" "h5ls_vds_files") endforeach () foreach (listfiles ${LIST_HDF5_TEST_FILES}) - get_filename_component(fname "${listfiles}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${fname}" "h5ls_vds_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${listfiles}" "h5ls_vds_files") endforeach () - foreach (listfiles ${LIST_OTHER_TEST_FILES}) - get_filename_component(fname "${listfiles}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5LS_SOURCE_DIR}/vds_prefix/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${fname}" "h5ls_vds_files") + foreach (listothers ${LIST_OTHER_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/vds_prefix/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${listothers}" "h5ls_vds_files") endforeach () add_custom_target(h5ls_vds_files ALL COMMENT "Copying files needed by h5ls_vds tests" DEPENDS ${h5ls_vds_files_list}) diff --git a/tools/testfiles/help-1.ls b/tools/test/h5ls/expected/help-1.ls similarity index 100% rename from tools/testfiles/help-1.ls rename to tools/test/h5ls/expected/help-1.ls diff --git a/tools/testfiles/help-2.ls b/tools/test/h5ls/expected/help-2.ls similarity index 100% rename from tools/testfiles/help-2.ls rename to tools/test/h5ls/expected/help-2.ls diff --git a/tools/testfiles/help-3.ls b/tools/test/h5ls/expected/help-3.ls similarity index 100% rename from tools/testfiles/help-3.ls rename to tools/test/h5ls/expected/help-3.ls diff --git a/tools/testfiles/nosuchfile.ls b/tools/test/h5ls/expected/nosuchfile.ls similarity index 100% rename from tools/testfiles/nosuchfile.ls rename to tools/test/h5ls/expected/nosuchfile.ls diff --git a/tools/testfiles/tall-1.ls b/tools/test/h5ls/expected/tall-1.ls similarity index 100% rename from tools/testfiles/tall-1.ls rename to tools/test/h5ls/expected/tall-1.ls diff --git a/tools/testfiles/tall-2.ls b/tools/test/h5ls/expected/tall-2.ls similarity index 100% rename from tools/testfiles/tall-2.ls rename to tools/test/h5ls/expected/tall-2.ls diff --git a/tools/testfiles/tarray1.ls b/tools/test/h5ls/expected/tarray1.ls similarity index 100% rename from tools/testfiles/tarray1.ls rename to tools/test/h5ls/expected/tarray1.ls diff --git a/tools/testfiles/tattr2.ls b/tools/test/h5ls/expected/tattr2.ls similarity index 100% rename from tools/testfiles/tattr2.ls rename to tools/test/h5ls/expected/tattr2.ls diff --git a/tools/testfiles/tattrreg_be.ls b/tools/test/h5ls/expected/tattrreg_be.ls similarity index 100% rename from tools/testfiles/tattrreg_be.ls rename to tools/test/h5ls/expected/tattrreg_be.ls diff --git a/tools/testfiles/tattrreg_le.ls b/tools/test/h5ls/expected/tattrreg_le.ls similarity index 100% rename from tools/testfiles/tattrreg_le.ls rename to tools/test/h5ls/expected/tattrreg_le.ls diff --git a/tools/testfiles/tcomp-1.ls b/tools/test/h5ls/expected/tcomp-1.ls similarity index 100% rename from tools/testfiles/tcomp-1.ls rename to tools/test/h5ls/expected/tcomp-1.ls diff --git a/tools/testfiles/tdataregbe.ls b/tools/test/h5ls/expected/tdataregbe.ls similarity index 100% rename from tools/testfiles/tdataregbe.ls rename to tools/test/h5ls/expected/tdataregbe.ls diff --git a/tools/testfiles/tdataregle.ls b/tools/test/h5ls/expected/tdataregle.ls similarity index 100% rename from tools/testfiles/tdataregle.ls rename to tools/test/h5ls/expected/tdataregle.ls diff --git a/tools/testfiles/tdset-1.ls b/tools/test/h5ls/expected/tdset-1.ls similarity index 100% rename from tools/testfiles/tdset-1.ls rename to tools/test/h5ls/expected/tdset-1.ls diff --git a/tools/testfiles/tdset_idx.ls b/tools/test/h5ls/expected/tdset_idx.ls similarity index 100% rename from tools/testfiles/tdset_idx.ls rename to tools/test/h5ls/expected/tdset_idx.ls diff --git a/tools/testfiles/tempty.ls b/tools/test/h5ls/expected/tempty.ls similarity index 100% rename from tools/testfiles/tempty.ls rename to tools/test/h5ls/expected/tempty.ls diff --git a/tools/testfiles/textlink-1.ls b/tools/test/h5ls/expected/textlink-1.ls similarity index 100% rename from tools/testfiles/textlink-1.ls rename to tools/test/h5ls/expected/textlink-1.ls diff --git a/tools/testfiles/textlinksrc-1-old.ls b/tools/test/h5ls/expected/textlinksrc-1-old.ls similarity index 100% rename from tools/testfiles/textlinksrc-1-old.ls rename to tools/test/h5ls/expected/textlinksrc-1-old.ls diff --git a/tools/testfiles/textlinksrc-1.ls b/tools/test/h5ls/expected/textlinksrc-1.ls similarity index 100% rename from tools/testfiles/textlinksrc-1.ls rename to tools/test/h5ls/expected/textlinksrc-1.ls diff --git a/tools/testfiles/textlinksrc-2-old.ls b/tools/test/h5ls/expected/textlinksrc-2-old.ls similarity index 100% rename from tools/testfiles/textlinksrc-2-old.ls rename to tools/test/h5ls/expected/textlinksrc-2-old.ls diff --git a/tools/testfiles/textlinksrc-2.ls b/tools/test/h5ls/expected/textlinksrc-2.ls similarity index 100% rename from tools/testfiles/textlinksrc-2.ls rename to tools/test/h5ls/expected/textlinksrc-2.ls diff --git a/tools/testfiles/textlinksrc-3-old.ls b/tools/test/h5ls/expected/textlinksrc-3-old.ls similarity index 100% rename from tools/testfiles/textlinksrc-3-old.ls rename to tools/test/h5ls/expected/textlinksrc-3-old.ls diff --git a/tools/testfiles/textlinksrc-3.ls b/tools/test/h5ls/expected/textlinksrc-3.ls similarity index 100% rename from tools/testfiles/textlinksrc-3.ls rename to tools/test/h5ls/expected/textlinksrc-3.ls diff --git a/tools/testfiles/textlinksrc-4.ls b/tools/test/h5ls/expected/textlinksrc-4.ls similarity index 100% rename from tools/testfiles/textlinksrc-4.ls rename to tools/test/h5ls/expected/textlinksrc-4.ls diff --git a/tools/testfiles/textlinksrc-5.ls b/tools/test/h5ls/expected/textlinksrc-5.ls similarity index 100% rename from tools/testfiles/textlinksrc-5.ls rename to tools/test/h5ls/expected/textlinksrc-5.ls diff --git a/tools/testfiles/textlinksrc-6-old.ls b/tools/test/h5ls/expected/textlinksrc-6-old.ls similarity index 100% rename from tools/testfiles/textlinksrc-6-old.ls rename to tools/test/h5ls/expected/textlinksrc-6-old.ls diff --git a/tools/testfiles/textlinksrc-6.ls b/tools/test/h5ls/expected/textlinksrc-6.ls similarity index 100% rename from tools/testfiles/textlinksrc-6.ls rename to tools/test/h5ls/expected/textlinksrc-6.ls diff --git a/tools/testfiles/textlinksrc-7-old.ls b/tools/test/h5ls/expected/textlinksrc-7-old.ls similarity index 100% rename from tools/testfiles/textlinksrc-7-old.ls rename to tools/test/h5ls/expected/textlinksrc-7-old.ls diff --git a/tools/testfiles/textlinksrc-7.ls b/tools/test/h5ls/expected/textlinksrc-7.ls similarity index 100% rename from tools/testfiles/textlinksrc-7.ls rename to tools/test/h5ls/expected/textlinksrc-7.ls diff --git a/tools/testfiles/textlinksrc-nodangle-1.ls b/tools/test/h5ls/expected/textlinksrc-nodangle-1.ls similarity index 100% rename from tools/testfiles/textlinksrc-nodangle-1.ls rename to tools/test/h5ls/expected/textlinksrc-nodangle-1.ls diff --git a/tools/testfiles/textlinksrc-nodangle-2.ls b/tools/test/h5ls/expected/textlinksrc-nodangle-2.ls similarity index 100% rename from tools/testfiles/textlinksrc-nodangle-2.ls rename to tools/test/h5ls/expected/textlinksrc-nodangle-2.ls diff --git a/tools/testfiles/tgroup-1.ls b/tools/test/h5ls/expected/tgroup-1.ls similarity index 100% rename from tools/testfiles/tgroup-1.ls rename to tools/test/h5ls/expected/tgroup-1.ls diff --git a/tools/testfiles/tgroup-2.ls b/tools/test/h5ls/expected/tgroup-2.ls similarity index 100% rename from tools/testfiles/tgroup-2.ls rename to tools/test/h5ls/expected/tgroup-2.ls diff --git a/tools/testfiles/tgroup-3.ls b/tools/test/h5ls/expected/tgroup-3.ls similarity index 100% rename from tools/testfiles/tgroup-3.ls rename to tools/test/h5ls/expected/tgroup-3.ls diff --git a/tools/testfiles/tgroup.ls b/tools/test/h5ls/expected/tgroup.ls similarity index 100% rename from tools/testfiles/tgroup.ls rename to tools/test/h5ls/expected/tgroup.ls diff --git a/tools/testfiles/tgrp_comments.ls b/tools/test/h5ls/expected/tgrp_comments.ls similarity index 100% rename from tools/testfiles/tgrp_comments.ls rename to tools/test/h5ls/expected/tgrp_comments.ls diff --git a/tools/testfiles/tgrpnullspace.ls b/tools/test/h5ls/expected/tgrpnullspace.ls similarity index 100% rename from tools/testfiles/tgrpnullspace.ls rename to tools/test/h5ls/expected/tgrpnullspace.ls diff --git a/tools/testfiles/thlink-1.ls b/tools/test/h5ls/expected/thlink-1.ls similarity index 100% rename from tools/testfiles/thlink-1.ls rename to tools/test/h5ls/expected/thlink-1.ls diff --git a/tools/testfiles/thlinks-nodangle-1.ls b/tools/test/h5ls/expected/thlinks-nodangle-1.ls similarity index 100% rename from tools/testfiles/thlinks-nodangle-1.ls rename to tools/test/h5ls/expected/thlinks-nodangle-1.ls diff --git a/tools/testfiles/tloop-1.ls b/tools/test/h5ls/expected/tloop-1.ls similarity index 100% rename from tools/testfiles/tloop-1.ls rename to tools/test/h5ls/expected/tloop-1.ls diff --git a/tools/testfiles/tmultifile.ls b/tools/test/h5ls/expected/tmultifile.ls similarity index 100% rename from tools/testfiles/tmultifile.ls rename to tools/test/h5ls/expected/tmultifile.ls diff --git a/tools/testfiles/tnestcomp-1.ls b/tools/test/h5ls/expected/tnestcomp-1.ls similarity index 100% rename from tools/testfiles/tnestcomp-1.ls rename to tools/test/h5ls/expected/tnestcomp-1.ls diff --git a/tools/testfiles/tnestcomp-2.ls b/tools/test/h5ls/expected/tnestcomp-2.ls similarity index 100% rename from tools/testfiles/tnestcomp-2.ls rename to tools/test/h5ls/expected/tnestcomp-2.ls diff --git a/tools/testfiles/tnestcomp-3.ls b/tools/test/h5ls/expected/tnestcomp-3.ls similarity index 100% rename from tools/testfiles/tnestcomp-3.ls rename to tools/test/h5ls/expected/tnestcomp-3.ls diff --git a/tools/testfiles/tnestcomp-4.ls b/tools/test/h5ls/expected/tnestcomp-4.ls similarity index 100% rename from tools/testfiles/tnestcomp-4.ls rename to tools/test/h5ls/expected/tnestcomp-4.ls diff --git a/tools/testfiles/tsaf.ls b/tools/test/h5ls/expected/tsaf.ls similarity index 100% rename from tools/testfiles/tsaf.ls rename to tools/test/h5ls/expected/tsaf.ls diff --git a/tools/testfiles/tslink-1.ls b/tools/test/h5ls/expected/tslink-1.ls similarity index 100% rename from tools/testfiles/tslink-1.ls rename to tools/test/h5ls/expected/tslink-1.ls diff --git a/tools/testfiles/tsoftlinks-1.ls b/tools/test/h5ls/expected/tsoftlinks-1.ls similarity index 100% rename from tools/testfiles/tsoftlinks-1.ls rename to tools/test/h5ls/expected/tsoftlinks-1.ls diff --git a/tools/testfiles/tsoftlinks-2.ls b/tools/test/h5ls/expected/tsoftlinks-2.ls similarity index 100% rename from tools/testfiles/tsoftlinks-2.ls rename to tools/test/h5ls/expected/tsoftlinks-2.ls diff --git a/tools/testfiles/tsoftlinks-3.ls b/tools/test/h5ls/expected/tsoftlinks-3.ls similarity index 100% rename from tools/testfiles/tsoftlinks-3.ls rename to tools/test/h5ls/expected/tsoftlinks-3.ls diff --git a/tools/testfiles/tsoftlinks-4.ls b/tools/test/h5ls/expected/tsoftlinks-4.ls similarity index 100% rename from tools/testfiles/tsoftlinks-4.ls rename to tools/test/h5ls/expected/tsoftlinks-4.ls diff --git a/tools/testfiles/tsoftlinks-5.ls b/tools/test/h5ls/expected/tsoftlinks-5.ls similarity index 100% rename from tools/testfiles/tsoftlinks-5.ls rename to tools/test/h5ls/expected/tsoftlinks-5.ls diff --git a/tools/testfiles/tsoftlinks-nodangle-1.ls b/tools/test/h5ls/expected/tsoftlinks-nodangle-1.ls similarity index 100% rename from tools/testfiles/tsoftlinks-nodangle-1.ls rename to tools/test/h5ls/expected/tsoftlinks-nodangle-1.ls diff --git a/tools/testfiles/tstr-1.ls b/tools/test/h5ls/expected/tstr-1.ls similarity index 100% rename from tools/testfiles/tstr-1.ls rename to tools/test/h5ls/expected/tstr-1.ls diff --git a/tools/testfiles/tudfilter.ls b/tools/test/h5ls/expected/tudfilter.ls similarity index 100% rename from tools/testfiles/tudfilter.ls rename to tools/test/h5ls/expected/tudfilter.ls diff --git a/tools/testfiles/tudlink-1.ls b/tools/test/h5ls/expected/tudlink-1.ls similarity index 100% rename from tools/testfiles/tudlink-1.ls rename to tools/test/h5ls/expected/tudlink-1.ls diff --git a/tools/testfiles/tvldtypes1.ls b/tools/test/h5ls/expected/tvldtypes1.ls similarity index 100% rename from tools/testfiles/tvldtypes1.ls rename to tools/test/h5ls/expected/tvldtypes1.ls diff --git a/tools/testfiles/tvldtypes2be.ls b/tools/test/h5ls/expected/tvldtypes2be.ls similarity index 100% rename from tools/testfiles/tvldtypes2be.ls rename to tools/test/h5ls/expected/tvldtypes2be.ls diff --git a/tools/testfiles/tvldtypes2le.ls b/tools/test/h5ls/expected/tvldtypes2le.ls similarity index 100% rename from tools/testfiles/tvldtypes2le.ls rename to tools/test/h5ls/expected/tvldtypes2le.ls diff --git a/tools/testfiles/vds/tvds-1.ls b/tools/test/h5ls/expected/vds/tvds-1.ls similarity index 100% rename from tools/testfiles/vds/tvds-1.ls rename to tools/test/h5ls/expected/vds/tvds-1.ls diff --git a/tools/testfiles/vds/tvds-2.ls b/tools/test/h5ls/expected/vds/tvds-2.ls similarity index 100% rename from tools/testfiles/vds/tvds-2.ls rename to tools/test/h5ls/expected/vds/tvds-2.ls diff --git a/tools/testfiles/vds/tvds-3_1.ls b/tools/test/h5ls/expected/vds/tvds-3_1.ls similarity index 100% rename from tools/testfiles/vds/tvds-3_1.ls rename to tools/test/h5ls/expected/vds/tvds-3_1.ls diff --git a/tools/testfiles/vds/tvds-3_2.ls b/tools/test/h5ls/expected/vds/tvds-3_2.ls similarity index 100% rename from tools/testfiles/vds/tvds-3_2.ls rename to tools/test/h5ls/expected/vds/tvds-3_2.ls diff --git a/tools/testfiles/vds/tvds-4.ls b/tools/test/h5ls/expected/vds/tvds-4.ls similarity index 100% rename from tools/testfiles/vds/tvds-4.ls rename to tools/test/h5ls/expected/vds/tvds-4.ls diff --git a/tools/testfiles/vds/tvds-5.ls b/tools/test/h5ls/expected/vds/tvds-5.ls similarity index 100% rename from tools/testfiles/vds/tvds-5.ls rename to tools/test/h5ls/expected/vds/tvds-5.ls diff --git a/tools/test/h5ls/h5ls_plugin.sh.in b/tools/test/h5ls/h5ls_plugin.sh.in index 02e0cf7c499..3408876e0b0 100644 --- a/tools/test/h5ls/h5ls_plugin.sh.in +++ b/tools/test/h5ls/h5ls_plugin.sh.in @@ -45,8 +45,9 @@ AWK='awk' SRC_TOOLS="$srcdir/../.." # testfiles source dirs for tools -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" +SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected" TESTDIR=./testplug test -d $TESTDIR || mkdir $TESTDIR @@ -61,8 +62,8 @@ test -d $TESTDIR || mkdir $TESTDIR # Comment '#' without space can be used. # -------------------------------------------------------------------- LIST_HDF5_TEST_FILES=" -$SRC_TOOLS_TESTFILES/tudfilter.h5 -$SRC_TOOLS_TESTFILES/tudfilter.ls +$SRC_H5DUMP_TESTFILES/tudfilter.h5 +$SRC_H5LS_OUTFILES/tudfilter.ls " # RUNSERIAL is used. Check if it can return exit code from executable correctly. diff --git a/tools/testfiles/tdset_idx.h5 b/tools/test/h5ls/testfiles/tdset_idx.h5 similarity index 100% rename from tools/testfiles/tdset_idx.h5 rename to tools/test/h5ls/testfiles/tdset_idx.h5 diff --git a/tools/test/h5ls/testh5ls.sh.in b/tools/test/h5ls/testh5ls.sh.in index 9b0e5cb85bf..fc6daab00ac 100644 --- a/tools/test/h5ls/testh5ls.sh.in +++ b/tools/test/h5ls/testh5ls.sh.in @@ -41,11 +41,10 @@ h5haveexitcode=yes # default is yes # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" @@ -53,6 +52,7 @@ SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" SRC_H5LS_ERRFILES="$SRC_TOOLS/test/h5ls/errfiles" +SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected" TESTDIR=./testfiles test -d $TESTDIR || mkdir $TESTDIR @@ -67,29 +67,29 @@ test -d $TESTDIR || mkdir $TESTDIR # Comment '#' without space can be used. # -------------------------------------------------------------------- LIST_HDF5_TEST_FILES=" -$SRC_H5LS_TESTFILES/tall.h5 -$SRC_H5LS_TESTFILES/tarray1.h5 -$SRC_H5LS_TESTFILES/tattr2.h5 -$SRC_H5LS_TESTFILES/tattrreg.h5 -$SRC_H5LS_TESTFILES/tcompound.h5 -$SRC_H5LS_TESTFILES/tdatareg.h5 -$SRC_H5LS_TESTFILES/tdset.h5 -$SRC_H5LS_TESTFILES/tempty.h5 -$SRC_H5LS_TESTFILES/textlink.h5 -$SRC_H5LS_TESTFILES/textlinksrc.h5 -$SRC_H5LS_TESTFILES/textlinktar.h5 -$SRC_H5LS_TESTFILES/tgroup.h5 -$SRC_H5LS_TESTFILES/tgrp_comments.h5 -$SRC_H5LS_TESTFILES/tgrpnullspace.h5 -$SRC_H5LS_TESTFILES/thlink.h5 -$SRC_H5LS_TESTFILES/tloop.h5 -$SRC_H5LS_TESTFILES/tnestedcomp.h5 -$SRC_H5LS_TESTFILES/tsaf.h5 -$SRC_H5LS_TESTFILES/tslink.h5 -$SRC_H5LS_TESTFILES/tsoftlinks.h5 -$SRC_H5LS_TESTFILES/tstr.h5 -$SRC_H5LS_TESTFILES/tudlink.h5 -$SRC_H5LS_TESTFILES/tvldtypes1.h5 +$SRC_H5DUMP_TESTFILES/tall.h5 +$SRC_H5DUMP_TESTFILES/tarray1.h5 +$SRC_H5DUMP_TESTFILES/tattr2.h5 +$SRC_H5DUMP_TESTFILES/tattrreg.h5 +$SRC_H5DUMP_TESTFILES/tcompound.h5 +$SRC_H5DUMP_TESTFILES/tdatareg.h5 +$SRC_H5DUMP_TESTFILES/tdset.h5 +$SRC_H5DUMP_TESTFILES/tempty.h5 +$SRC_H5DUMP_TESTFILES/textlink.h5 +$SRC_H5DUMP_TESTFILES/textlinksrc.h5 +$SRC_H5DUMP_TESTFILES/textlinktar.h5 +$SRC_H5DUMP_TESTFILES/tgroup.h5 +$SRC_H5DUMP_TESTFILES/tgrp_comments.h5 +$SRC_H5DUMP_TESTFILES/tgrpnullspace.h5 +$SRC_H5DUMP_TESTFILES/thlink.h5 +$SRC_H5DUMP_TESTFILES/tloop.h5 +$SRC_H5DUMP_TESTFILES/tnestedcomp.h5 +$SRC_H5DUMP_TESTFILES/tsaf.h5 +$SRC_H5DUMP_TESTFILES/tslink.h5 +$SRC_H5DUMP_TESTFILES/tsoftlinks.h5 +$SRC_H5DUMP_TESTFILES/tstr.h5 +$SRC_H5DUMP_TESTFILES/tudlink.h5 +$SRC_H5DUMP_TESTFILES/tvldtypes1.h5 $SRC_H5LS_TESTFILES/tdset_idx.h5 " @@ -100,64 +100,64 @@ $SRC_H5LS_ERRFILES/tgroup-1.err " LIST_OTHER_TEST_FILES=" -$SRC_H5LS_TESTFILES/help-1.ls -$SRC_H5LS_TESTFILES/help-2.ls -$SRC_H5LS_TESTFILES/help-3.ls -$SRC_H5LS_TESTFILES/nosuchfile.ls -$SRC_H5LS_TESTFILES/tall-1.ls -$SRC_H5LS_TESTFILES/tall-2.ls -$SRC_H5LS_TESTFILES/tarray1.ls -$SRC_H5LS_TESTFILES/tattr2.ls -$SRC_H5LS_TESTFILES/tattrreg_le.ls -$SRC_H5LS_TESTFILES/tattrreg_be.ls -$SRC_H5LS_TESTFILES/tcomp-1.ls -$SRC_H5LS_TESTFILES/tdataregbe.ls -$SRC_H5LS_TESTFILES/tdataregle.ls -$SRC_H5LS_TESTFILES/tdset-1.ls -$SRC_H5LS_TESTFILES/tempty.ls -$SRC_H5LS_TESTFILES/textlink-1.ls -$SRC_H5LS_TESTFILES/textlinksrc-1.ls -$SRC_H5LS_TESTFILES/textlinksrc-2.ls -$SRC_H5LS_TESTFILES/textlinksrc-3.ls -$SRC_H5LS_TESTFILES/textlinksrc-4.ls -$SRC_H5LS_TESTFILES/textlinksrc-5.ls -$SRC_H5LS_TESTFILES/textlinksrc-6.ls -$SRC_H5LS_TESTFILES/textlinksrc-7.ls -$SRC_H5LS_TESTFILES/textlinksrc-1-old.ls -$SRC_H5LS_TESTFILES/textlinksrc-2-old.ls -$SRC_H5LS_TESTFILES/textlinksrc-3-old.ls -$SRC_H5LS_TESTFILES/textlinksrc-6-old.ls -$SRC_H5LS_TESTFILES/textlinksrc-7-old.ls -$SRC_H5LS_TESTFILES/tsoftlinks-1.ls -$SRC_H5LS_TESTFILES/tsoftlinks-2.ls -$SRC_H5LS_TESTFILES/tsoftlinks-3.ls -$SRC_H5LS_TESTFILES/tsoftlinks-4.ls -$SRC_H5LS_TESTFILES/tsoftlinks-5.ls -$SRC_H5LS_TESTFILES/textlinksrc-nodangle-1.ls -$SRC_H5LS_TESTFILES/textlinksrc-nodangle-2.ls -$SRC_H5LS_TESTFILES/tgrp_comments.ls -$SRC_H5LS_TESTFILES/tsoftlinks-nodangle-1.ls -$SRC_H5LS_TESTFILES/thlinks-nodangle-1.ls -$SRC_H5LS_TESTFILES/tgroup.ls -$SRC_H5LS_TESTFILES/tgroup-1.ls -$SRC_H5LS_TESTFILES/tgroup-2.ls -$SRC_H5LS_TESTFILES/tgroup-3.ls -$SRC_H5LS_TESTFILES/tgrpnullspace.ls -$SRC_H5LS_TESTFILES/thlink-1.ls -$SRC_H5LS_TESTFILES/tloop-1.ls -$SRC_H5LS_TESTFILES/tmultifile.ls -$SRC_H5LS_TESTFILES/tnestcomp-1.ls -$SRC_H5LS_TESTFILES/tnestcomp-2.ls -$SRC_H5LS_TESTFILES/tnestcomp-3.ls -$SRC_H5LS_TESTFILES/tnestcomp-4.ls -$SRC_H5LS_TESTFILES/tsaf.ls -$SRC_H5LS_TESTFILES/tslink-1.ls -$SRC_H5LS_TESTFILES/tstr-1.ls -$SRC_H5LS_TESTFILES/tudlink-1.ls -$SRC_H5LS_TESTFILES/tvldtypes1.ls -$SRC_H5LS_TESTFILES/tvldtypes2le.ls -$SRC_H5LS_TESTFILES/tvldtypes2be.ls -$SRC_H5LS_TESTFILES/tdset_idx.ls +$SRC_H5LS_OUTFILES/help-1.ls +$SRC_H5LS_OUTFILES/help-2.ls +$SRC_H5LS_OUTFILES/help-3.ls +$SRC_H5LS_OUTFILES/nosuchfile.ls +$SRC_H5LS_OUTFILES/tall-1.ls +$SRC_H5LS_OUTFILES/tall-2.ls +$SRC_H5LS_OUTFILES/tarray1.ls +$SRC_H5LS_OUTFILES/tattr2.ls +$SRC_H5LS_OUTFILES/tattrreg_le.ls +$SRC_H5LS_OUTFILES/tattrreg_be.ls +$SRC_H5LS_OUTFILES/tcomp-1.ls +$SRC_H5LS_OUTFILES/tdataregbe.ls +$SRC_H5LS_OUTFILES/tdataregle.ls +$SRC_H5LS_OUTFILES/tdset-1.ls +$SRC_H5LS_OUTFILES/tempty.ls +$SRC_H5LS_OUTFILES/textlink-1.ls +$SRC_H5LS_OUTFILES/textlinksrc-1.ls +$SRC_H5LS_OUTFILES/textlinksrc-2.ls +$SRC_H5LS_OUTFILES/textlinksrc-3.ls +$SRC_H5LS_OUTFILES/textlinksrc-4.ls +$SRC_H5LS_OUTFILES/textlinksrc-5.ls +$SRC_H5LS_OUTFILES/textlinksrc-6.ls +$SRC_H5LS_OUTFILES/textlinksrc-7.ls +$SRC_H5LS_OUTFILES/textlinksrc-1-old.ls +$SRC_H5LS_OUTFILES/textlinksrc-2-old.ls +$SRC_H5LS_OUTFILES/textlinksrc-3-old.ls +$SRC_H5LS_OUTFILES/textlinksrc-6-old.ls +$SRC_H5LS_OUTFILES/textlinksrc-7-old.ls +$SRC_H5LS_OUTFILES/tsoftlinks-1.ls +$SRC_H5LS_OUTFILES/tsoftlinks-2.ls +$SRC_H5LS_OUTFILES/tsoftlinks-3.ls +$SRC_H5LS_OUTFILES/tsoftlinks-4.ls +$SRC_H5LS_OUTFILES/tsoftlinks-5.ls +$SRC_H5LS_OUTFILES/textlinksrc-nodangle-1.ls +$SRC_H5LS_OUTFILES/textlinksrc-nodangle-2.ls +$SRC_H5LS_OUTFILES/tgrp_comments.ls +$SRC_H5LS_OUTFILES/tsoftlinks-nodangle-1.ls +$SRC_H5LS_OUTFILES/thlinks-nodangle-1.ls +$SRC_H5LS_OUTFILES/tgroup.ls +$SRC_H5LS_OUTFILES/tgroup-1.ls +$SRC_H5LS_OUTFILES/tgroup-2.ls +$SRC_H5LS_OUTFILES/tgroup-3.ls +$SRC_H5LS_OUTFILES/tgrpnullspace.ls +$SRC_H5LS_OUTFILES/thlink-1.ls +$SRC_H5LS_OUTFILES/tloop-1.ls +$SRC_H5LS_OUTFILES/tmultifile.ls +$SRC_H5LS_OUTFILES/tnestcomp-1.ls +$SRC_H5LS_OUTFILES/tnestcomp-2.ls +$SRC_H5LS_OUTFILES/tnestcomp-3.ls +$SRC_H5LS_OUTFILES/tnestcomp-4.ls +$SRC_H5LS_OUTFILES/tsaf.ls +$SRC_H5LS_OUTFILES/tslink-1.ls +$SRC_H5LS_OUTFILES/tstr-1.ls +$SRC_H5LS_OUTFILES/tudlink-1.ls +$SRC_H5LS_OUTFILES/tvldtypes1.ls +$SRC_H5LS_OUTFILES/tvldtypes2le.ls +$SRC_H5LS_OUTFILES/tvldtypes2be.ls +$SRC_H5LS_OUTFILES/tdset_idx.ls " diff --git a/tools/test/h5ls/testh5lsvds.sh.in b/tools/test/h5ls/testh5lsvds.sh.in index beba73fe187..2408ee29466 100644 --- a/tools/test/h5ls/testh5lsvds.sh.in +++ b/tools/test/h5ls/testh5lsvds.sh.in @@ -38,17 +38,17 @@ h5haveexitcode=yes # default is yes # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" +SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected" TEST_P_DIR=./testfiles TESTDIR=./testfiles/vds @@ -65,38 +65,38 @@ test -d $TESTDIR || mkdir $TESTDIR # Comment '#' without space can be used. # -------------------------------------------------------------------- LIST_HDF5_TEST_FILES=" -$SRC_H5LS_TESTFILES/vds/1_a.h5 -$SRC_H5LS_TESTFILES/vds/1_b.h5 -$SRC_H5LS_TESTFILES/vds/1_c.h5 -$SRC_H5LS_TESTFILES/vds/1_d.h5 -$SRC_H5LS_TESTFILES/vds/1_e.h5 -$SRC_H5LS_TESTFILES/vds/1_f.h5 -$SRC_H5LS_TESTFILES/vds/1_vds.h5 -$SRC_H5LS_TESTFILES/vds/2_a.h5 -$SRC_H5LS_TESTFILES/vds/2_b.h5 -$SRC_H5LS_TESTFILES/vds/2_c.h5 -$SRC_H5LS_TESTFILES/vds/2_d.h5 -$SRC_H5LS_TESTFILES/vds/2_e.h5 -$SRC_H5LS_TESTFILES/vds/2_vds.h5 -$SRC_H5LS_TESTFILES/vds/3_1_vds.h5 -$SRC_H5LS_TESTFILES/vds/3_2_vds.h5 -$SRC_H5LS_TESTFILES/vds/4_0.h5 -$SRC_H5LS_TESTFILES/vds/4_1.h5 -$SRC_H5LS_TESTFILES/vds/4_2.h5 -$SRC_H5LS_TESTFILES/vds/4_vds.h5 -$SRC_H5LS_TESTFILES/vds/5_a.h5 -$SRC_H5LS_TESTFILES/vds/5_b.h5 -$SRC_H5LS_TESTFILES/vds/5_c.h5 -$SRC_H5LS_TESTFILES/vds/5_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/1_a.h5 +$SRC_H5DUMP_TESTFILES/vds/1_b.h5 +$SRC_H5DUMP_TESTFILES/vds/1_c.h5 +$SRC_H5DUMP_TESTFILES/vds/1_d.h5 +$SRC_H5DUMP_TESTFILES/vds/1_e.h5 +$SRC_H5DUMP_TESTFILES/vds/1_f.h5 +$SRC_H5DUMP_TESTFILES/vds/1_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/2_a.h5 +$SRC_H5DUMP_TESTFILES/vds/2_b.h5 +$SRC_H5DUMP_TESTFILES/vds/2_c.h5 +$SRC_H5DUMP_TESTFILES/vds/2_d.h5 +$SRC_H5DUMP_TESTFILES/vds/2_e.h5 +$SRC_H5DUMP_TESTFILES/vds/2_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/3_1_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/3_2_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/4_0.h5 +$SRC_H5DUMP_TESTFILES/vds/4_1.h5 +$SRC_H5DUMP_TESTFILES/vds/4_2.h5 +$SRC_H5DUMP_TESTFILES/vds/4_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/5_a.h5 +$SRC_H5DUMP_TESTFILES/vds/5_b.h5 +$SRC_H5DUMP_TESTFILES/vds/5_c.h5 +$SRC_H5DUMP_TESTFILES/vds/5_vds.h5 " LIST_OTHER_TEST_FILES=" -$SRC_H5LS_TESTFILES/vds/tvds-1.ls -$SRC_H5LS_TESTFILES/vds/tvds-2.ls -$SRC_H5LS_TESTFILES/vds/tvds-3_1.ls -$SRC_H5LS_TESTFILES/vds/tvds-3_2.ls -$SRC_H5LS_TESTFILES/vds/tvds-4.ls -$SRC_H5LS_TESTFILES/vds/tvds-5.ls +$SRC_H5LS_OUTFILES/vds/tvds-1.ls +$SRC_H5LS_OUTFILES/vds/tvds-2.ls +$SRC_H5LS_OUTFILES/vds/tvds-3_1.ls +$SRC_H5LS_OUTFILES/vds/tvds-3_2.ls +$SRC_H5LS_OUTFILES/vds/tvds-4.ls +$SRC_H5LS_OUTFILES/vds/tvds-5.ls " diff --git a/tools/test/h5repack/CMakeTests.cmake b/tools/test/h5repack/CMakeTests.cmake index bd2cb9b9f05..5c412545af2 100644 --- a/tools/test/h5repack/CMakeTests.cmake +++ b/tools/test/h5repack/CMakeTests.cmake @@ -19,203 +19,224 @@ # -------------------------------------------------------------------- # Copy all the HDF5 files from the source directory into the test directory # -------------------------------------------------------------------- - set (LIST_HDF5_TEST_FILES - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/bounds_latest_latest.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_attr.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_attr_refs.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_deflate.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_early.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_ext.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_f32le.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_f32le_ex-0.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_f32le_ex.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fill.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fletcher.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_hlink.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d_ex-0.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d_ex-1.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d_ex.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_2d.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_2d_ex-0.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_2d_ex.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_3d.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_3d_ex-0.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_3d_ex.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layouto.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout2.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout3.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.UD.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_named_dtypes.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nested_8bit_enum.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nested_8bit_enum_deflated.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_CVE-2018-17432.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_CVE-2018-14460.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nbit.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_objs.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_refs.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_shuffle.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_soffset.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_szip.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-0.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-1.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-2.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-3.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex.h5 + set (LIST_REPACK_TEST_FILES + bounds_latest_latest.h5 + h5repack_attr.h5 + h5repack_attr_refs.h5 + h5repack_deflate.h5 + h5repack_early.h5 + h5repack_ext.h5 + h5repack_f32le.h5 + h5repack_f32le_ex-0.dat + h5repack_f32le_ex.h5 + h5repack_fill.h5 + h5repack_filters.h5 + h5repack_fletcher.h5 + h5repack_hlink.h5 + h5repack_int32le_1d.h5 + h5repack_int32le_1d_ex-0.dat + h5repack_int32le_1d_ex-1.dat + h5repack_int32le_1d_ex.h5 + h5repack_int32le_2d.h5 + h5repack_int32le_2d_ex-0.dat + h5repack_int32le_2d_ex.h5 + h5repack_int32le_3d.h5 + h5repack_int32le_3d_ex-0.dat + h5repack_int32le_3d_ex.h5 + h5repack_layout.h5 + h5repack_layouto.h5 + h5repack_layout2.h5 + h5repack_layout3.h5 + h5repack_layout.UD.h5 + h5repack_named_dtypes.h5 + h5repack_nested_8bit_enum.h5 + h5repack_nested_8bit_enum_deflated.h5 + h5repack_CVE-2018-17432.h5 + h5repack_CVE-2018-14460.h5 + h5repack_nbit.h5 + h5repack_objs.h5 + h5repack_refs.h5 + h5repack_shuffle.h5 + h5repack_soffset.h5 + h5repack_szip.h5 + h5repack_uint8be.h5 + h5repack_uint8be_ex-0.dat + h5repack_uint8be_ex-1.dat + h5repack_uint8be_ex-2.dat + h5repack_uint8be_ex-3.dat + h5repack_uint8be_ex.h5 # fsm - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_aggr.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fsm_aggr_nopersist.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fsm_aggr_persist.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_none.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_paged_nopersist.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_paged_persist.h5 - # h5diff/testfile - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr1.h5 + h5repack_aggr.h5 + h5repack_fsm_aggr_nopersist.h5 + h5repack_fsm_aggr_persist.h5 + h5repack_none.h5 + h5repack_paged_nopersist.h5 + h5repack_paged_persist.h5 + ) + # h5diff/testfile + set (LIST_DIFF_TEST_FILES + h5diff_attr1.h5 + ) + # tools/testfiles/vds + set (LIST_VDS_TEST_FILES + 1_a.h5 + 1_b.h5 + 1_c.h5 + 1_d.h5 + 1_e.h5 + 1_f.h5 + 1_vds.h5 + 2_a.h5 + 2_b.h5 + 2_c.h5 + 2_d.h5 + 2_e.h5 + 2_vds.h5 + 3_1_vds.h5 + 3_2_vds.h5 + 4_0.h5 + 4_1.h5 + 4_2.h5 + 4_vds.h5 + 5_a.h5 + 5_b.h5 + 5_c.h5 + 5_vds.h5 + ) + set (LIST_COPY_TEST_FILES + h5copy_extlinks_src.h5 + h5copy_extlinks_trg.h5 + ) + set (LIST_HDF5_TEST_FILES # tools/testfiles for external links - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlinkfar.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlinktar.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlink.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_trg.h5 + tsoftlinks.h5 + textlinkfar.h5 + textlinksrc.h5 + textlinktar.h5 + textlink.h5 # tools/testfiles - ${HDF5_TOOLS_DIR}/testfiles/tfamily00000.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00001.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00002.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00003.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00004.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00005.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00006.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00007.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00008.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00009.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00010.h5 - ${HDF5_TOOLS_DIR}/testfiles/tordergr.h5 + tfamily00000.h5 + tfamily00001.h5 + tfamily00002.h5 + tfamily00003.h5 + tfamily00004.h5 + tfamily00005.h5 + tfamily00006.h5 + tfamily00007.h5 + tfamily00008.h5 + tfamily00009.h5 + tfamily00010.h5 + tordergr.h5 # reference conversion files - ${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5 - # tools/testfiles/vds - ${HDF5_TOOLS_DIR}/testfiles/vds/1_a.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_b.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_c.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_d.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_e.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_f.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_a.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_b.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_c.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_d.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_e.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/3_1_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/3_2_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/4_0.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/4_1.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/4_2.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/4_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/5_a.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/5_b.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/5_c.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/5_vds.h5 + tattrreg.h5 + tdatareg.h5 # tools/testfiles onion VFD files - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5 - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5.onion - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5 - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5.onion - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5 - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5.onion + tst_onion_dset_1d.h5 + tst_onion_dset_1d.h5.onion + tst_onion_dset_ext.h5 + tst_onion_dset_ext.h5.onion + tst_onion_objs.h5 + tst_onion_objs.h5.onion ) set (LIST_OTHER_TEST_FILES - h5repack-help.txt h5repack_ext.bin h5repack.info ublock.bin ) set (LIST_TST_TEST_FILES - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5-gzip_verbose_filters - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_test.h5repack_layout.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_version_test.h5repack_layout.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_zero.h5repack_layout.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_none.h5repack_layout.UD.h5 + h5repack-help.txt + h5repack_filters.h5-gzip_verbose_filters.tst + h5repack_layout.h5-dset2_chunk_20x10-errstk.tst + plugin_test.h5repack_layout.h5.tst + plugin_version_test.h5repack_layout.h5.tst + plugin_zero.h5repack_layout.h5.tst + plugin_none.h5repack_layout.UD.h5.tst # tools/testfiles for external links - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-merge.tsoftlinks.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-merge.textlinkfar.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-merge.textlinksrc.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-merge.textlinktar.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-merge.textlink.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5 + tsoftlinks-merge.tsoftlinks.h5.tst + textlinkfar-merge.textlinkfar.h5.tst + textlinksrc-merge.textlinksrc.h5.tst + textlinktar-merge.textlinktar.h5.tst + textlink-merge.textlink.h5.tst + h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst ) set (LIST_DDL_TEST_FILES - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/crtorder.tordergr.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/deflate_limit.h5repack_layout.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_test - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_version_test - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_zero - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.UD.h5-plugin_none + crtorder.tordergr.h5.ddl + deflate_limit.h5repack_layout.h5.ddl + h5repack_layout.h5.ddl + h5repack_layout.h5-plugin_test.ddl + h5repack_layout.h5-plugin_version_test.ddl + h5repack_layout.h5-plugin_zero.ddl + h5repack_layout.UD.h5-plugin_none.ddl # fsm - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/STG.h5repack_none.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/SPT.h5repack_aggr.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/SP.h5repack_fsm_aggr_nopersist.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/S.h5repack_fsm_aggr_persist.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/GS.h5repack_paged_nopersist.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/SP.h5repack_paged_persist.h5 + STG.h5repack_none.h5.ddl + SPT.h5repack_aggr.h5.ddl + SP.h5repack_fsm_aggr_nopersist.h5.ddl + S.h5repack_fsm_aggr_persist.h5.ddl + GS.h5repack_paged_nopersist.h5.ddl + SP.h5repack_paged_persist.h5.ddl # vds - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/2_vds.h5-vds_chunk3x6x9-v - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/3_1_vds.h5-vds_chunk2x5x8-v - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/4_vds.h5-vds_compa-v - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/4_vds.h5-vds_conti-v + 1_vds.h5-vds_dset_chunk20x10x5-v.ddl + 2_vds.h5-vds_chunk3x6x9-v.ddl + 3_1_vds.h5-vds_chunk2x5x8-v.ddl + 4_vds.h5-vds_compa-v.ddl + 4_vds.h5-vds_conti-v.ddl # refs - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/attrregion.tattrreg.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/dataregion.tdatareg.h5 + attrregion.tattrreg.h5.ddl + dataregion.tdatareg.h5.ddl # tools/testfiles for external links - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-base.textlinkfar.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-base.textlinksrc.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-base.textlinktar.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-base.textlink.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-base.tsoftlinks.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-base.h5copy_extlinks_src.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-prune.textlinkfar.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-prune.textlinksrc.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-prune.textlinktar.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-prune.textlink.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-prune.tsoftlinks.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-mergeprune.textlinkfar.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-mergeprune.textlinksrc.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-mergeprune.textlinktar.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-mergeprune.textlink.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-mergeprune.tsoftlinks.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5 + textlinkfar-base.textlinkfar.h5.ddl + textlinksrc-base.textlinksrc.h5.ddl + textlinktar-base.textlinktar.h5.ddl + textlink-base.textlink.h5.ddl + tsoftlinks-base.tsoftlinks.h5.ddl + h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl + textlinkfar-prune.textlinkfar.h5.ddl + textlinksrc-prune.textlinksrc.h5.ddl + textlinktar-prune.textlinktar.h5.ddl + textlink-prune.textlink.h5.ddl + tsoftlinks-prune.tsoftlinks.h5.ddl + h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl + textlinkfar-mergeprune.textlinkfar.h5.ddl + textlinksrc-mergeprune.textlinksrc.h5.ddl + textlinktar-mergeprune.textlinktar.h5.ddl + textlink-mergeprune.textlink.h5.ddl + tsoftlinks-mergeprune.tsoftlinks.h5.ddl + h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl ) + foreach (h5_file ${LIST_REPACK_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") + endforeach () + + foreach (h5_file ${LIST_COPY_TEST_FILES}) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5copy/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") + endforeach () + + foreach (h5_file ${LIST_DIFF_TEST_FILES}) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5diff/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") + endforeach () + + foreach (h5_file ${LIST_VDS_TEST_FILES}) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") + endforeach () + foreach (h5_file ${LIST_HDF5_TEST_FILES}) - get_filename_component(fname "${h5_file}" NAME) - HDFTEST_COPY_FILE("${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5repack_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") endforeach () foreach (h5_file ${LIST_OTHER_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") endforeach () foreach (h5_file ${LIST_TST_TEST_FILES}) - get_filename_component(fname "${h5_file}" NAME) - HDFTEST_COPY_FILE("${h5_file}.tst" "${PROJECT_BINARY_DIR}/testfiles/${fname}.tst" "h5repack_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") endforeach () foreach (h5_file ${LIST_DDL_TEST_FILES}) - get_filename_component(fname "${h5_file}" NAME) - HDFTEST_COPY_FILE("${h5_file}.ddl" "${PROJECT_BINARY_DIR}/testfiles/${fname}.ddl" "h5repack_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") endforeach () add_custom_target(h5repack_files ALL COMMENT "Copying files needed by h5repack tests" DEPENDS ${h5repack_files_list}) diff --git a/tools/test/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl b/tools/test/h5repack/expected/1_vds.h5-vds_dset_chunk20x10x5-v.ddl similarity index 100% rename from tools/test/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl rename to tools/test/h5repack/expected/1_vds.h5-vds_dset_chunk20x10x5-v.ddl diff --git a/tools/test/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl b/tools/test/h5repack/expected/2_vds.h5-vds_chunk3x6x9-v.ddl similarity index 100% rename from tools/test/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl rename to tools/test/h5repack/expected/2_vds.h5-vds_chunk3x6x9-v.ddl diff --git a/tools/test/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl b/tools/test/h5repack/expected/3_1_vds.h5-vds_chunk2x5x8-v.ddl similarity index 100% rename from tools/test/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl rename to tools/test/h5repack/expected/3_1_vds.h5-vds_chunk2x5x8-v.ddl diff --git a/tools/test/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl b/tools/test/h5repack/expected/4_vds.h5-vds_compa-v.ddl similarity index 100% rename from tools/test/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl rename to tools/test/h5repack/expected/4_vds.h5-vds_compa-v.ddl diff --git a/tools/test/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl b/tools/test/h5repack/expected/4_vds.h5-vds_conti-v.ddl similarity index 100% rename from tools/test/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl rename to tools/test/h5repack/expected/4_vds.h5-vds_conti-v.ddl diff --git a/tools/test/h5repack/testfiles/GS.h5repack_paged_nopersist.h5.ddl b/tools/test/h5repack/expected/GS.h5repack_paged_nopersist.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/GS.h5repack_paged_nopersist.h5.ddl rename to tools/test/h5repack/expected/GS.h5repack_paged_nopersist.h5.ddl diff --git a/tools/test/h5repack/testfiles/S.h5repack_fsm_aggr_persist.h5.ddl b/tools/test/h5repack/expected/S.h5repack_fsm_aggr_persist.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/S.h5repack_fsm_aggr_persist.h5.ddl rename to tools/test/h5repack/expected/S.h5repack_fsm_aggr_persist.h5.ddl diff --git a/tools/test/h5repack/testfiles/SP.h5repack_fsm_aggr_nopersist.h5.ddl b/tools/test/h5repack/expected/SP.h5repack_fsm_aggr_nopersist.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/SP.h5repack_fsm_aggr_nopersist.h5.ddl rename to tools/test/h5repack/expected/SP.h5repack_fsm_aggr_nopersist.h5.ddl diff --git a/tools/test/h5repack/testfiles/SP.h5repack_paged_persist.h5.ddl b/tools/test/h5repack/expected/SP.h5repack_paged_persist.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/SP.h5repack_paged_persist.h5.ddl rename to tools/test/h5repack/expected/SP.h5repack_paged_persist.h5.ddl diff --git a/tools/test/h5repack/testfiles/SPT.h5repack_aggr.h5.ddl b/tools/test/h5repack/expected/SPT.h5repack_aggr.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/SPT.h5repack_aggr.h5.ddl rename to tools/test/h5repack/expected/SPT.h5repack_aggr.h5.ddl diff --git a/tools/test/h5repack/testfiles/STG.h5repack_none.h5.ddl b/tools/test/h5repack/expected/STG.h5repack_none.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/STG.h5repack_none.h5.ddl rename to tools/test/h5repack/expected/STG.h5repack_none.h5.ddl diff --git a/tools/test/h5repack/testfiles/attrregion.tattrreg.h5.ddl b/tools/test/h5repack/expected/attrregion.tattrreg.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/attrregion.tattrreg.h5.ddl rename to tools/test/h5repack/expected/attrregion.tattrreg.h5.ddl diff --git a/tools/test/h5repack/testfiles/crtorder.tordergr.h5.ddl b/tools/test/h5repack/expected/crtorder.tordergr.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/crtorder.tordergr.h5.ddl rename to tools/test/h5repack/expected/crtorder.tordergr.h5.ddl diff --git a/tools/test/h5repack/testfiles/dataregion.tdatareg.h5.ddl b/tools/test/h5repack/expected/dataregion.tdatareg.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/dataregion.tdatareg.h5.ddl rename to tools/test/h5repack/expected/dataregion.tdatareg.h5.ddl diff --git a/tools/test/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl b/tools/test/h5repack/expected/deflate_limit.h5repack_layout.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl rename to tools/test/h5repack/expected/deflate_limit.h5repack_layout.h5.ddl diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl b/tools/test/h5repack/expected/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl rename to tools/test/h5repack/expected/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst b/tools/test/h5repack/expected/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst rename to tools/test/h5repack/expected/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl b/tools/test/h5repack/expected/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl rename to tools/test/h5repack/expected/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl b/tools/test/h5repack/expected/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl rename to tools/test/h5repack/expected/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl diff --git a/tools/test/h5repack/testfiles/h5repack-help.txt b/tools/test/h5repack/expected/h5repack-help.txt similarity index 100% rename from tools/test/h5repack/testfiles/h5repack-help.txt rename to tools/test/h5repack/expected/h5repack-help.txt diff --git a/tools/test/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst b/tools/test/h5repack/expected/h5repack_filters.h5-gzip_verbose_filters.tst similarity index 100% rename from tools/test/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst rename to tools/test/h5repack/expected/h5repack_filters.h5-gzip_verbose_filters.tst diff --git a/tools/test/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl b/tools/test/h5repack/expected/h5repack_layout.UD.h5-plugin_none.ddl similarity index 100% rename from tools/test/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl rename to tools/test/h5repack/expected/h5repack_layout.UD.h5-plugin_none.ddl diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst b/tools/test/h5repack/expected/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst similarity index 100% rename from tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst rename to tools/test/h5repack/expected/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_test.ddl similarity index 100% rename from tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl rename to tools/test/h5repack/expected/h5repack_layout.h5-plugin_test.ddl diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_version_test.ddl similarity index 100% rename from tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl rename to tools/test/h5repack/expected/h5repack_layout.h5-plugin_version_test.ddl diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_zero.ddl b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_zero.ddl similarity index 100% rename from tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_zero.ddl rename to tools/test/h5repack/expected/h5repack_layout.h5-plugin_zero.ddl diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5.ddl b/tools/test/h5repack/expected/h5repack_layout.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/h5repack_layout.h5.ddl rename to tools/test/h5repack/expected/h5repack_layout.h5.ddl diff --git a/tools/test/h5repack/testfiles/onion.tst_onion_dset_1d.h5.ddl b/tools/test/h5repack/expected/onion.tst_onion_dset_1d.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/onion.tst_onion_dset_1d.h5.ddl rename to tools/test/h5repack/expected/onion.tst_onion_dset_1d.h5.ddl diff --git a/tools/test/h5repack/testfiles/onion.tst_onion_dset_ext.h5.ddl b/tools/test/h5repack/expected/onion.tst_onion_dset_ext.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/onion.tst_onion_dset_ext.h5.ddl rename to tools/test/h5repack/expected/onion.tst_onion_dset_ext.h5.ddl diff --git a/tools/test/h5repack/testfiles/onion.tst_onion_objs.h5.ddl b/tools/test/h5repack/expected/onion.tst_onion_objs.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/onion.tst_onion_objs.h5.ddl rename to tools/test/h5repack/expected/onion.tst_onion_objs.h5.ddl diff --git a/tools/test/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst b/tools/test/h5repack/expected/plugin_none.h5repack_layout.UD.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst rename to tools/test/h5repack/expected/plugin_none.h5repack_layout.UD.h5.tst diff --git a/tools/test/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst b/tools/test/h5repack/expected/plugin_test.h5repack_layout.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst rename to tools/test/h5repack/expected/plugin_test.h5repack_layout.h5.tst diff --git a/tools/test/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst b/tools/test/h5repack/expected/plugin_version_test.h5repack_layout.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst rename to tools/test/h5repack/expected/plugin_version_test.h5repack_layout.h5.tst diff --git a/tools/test/h5repack/testfiles/plugin_zero.h5repack_layout.h5.tst b/tools/test/h5repack/expected/plugin_zero.h5repack_layout.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/plugin_zero.h5repack_layout.h5.tst rename to tools/test/h5repack/expected/plugin_zero.h5repack_layout.h5.tst diff --git a/tools/test/h5repack/testfiles/textlink-base.textlink.h5.ddl b/tools/test/h5repack/expected/textlink-base.textlink.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlink-base.textlink.h5.ddl rename to tools/test/h5repack/expected/textlink-base.textlink.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlink-merge.textlink.h5.tst b/tools/test/h5repack/expected/textlink-merge.textlink.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/textlink-merge.textlink.h5.tst rename to tools/test/h5repack/expected/textlink-merge.textlink.h5.tst diff --git a/tools/test/h5repack/testfiles/textlink-mergeprune.textlink.h5.ddl b/tools/test/h5repack/expected/textlink-mergeprune.textlink.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlink-mergeprune.textlink.h5.ddl rename to tools/test/h5repack/expected/textlink-mergeprune.textlink.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlink-prune.textlink.h5.ddl b/tools/test/h5repack/expected/textlink-prune.textlink.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlink-prune.textlink.h5.ddl rename to tools/test/h5repack/expected/textlink-prune.textlink.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinkfar-base.textlinkfar.h5.ddl b/tools/test/h5repack/expected/textlinkfar-base.textlinkfar.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinkfar-base.textlinkfar.h5.ddl rename to tools/test/h5repack/expected/textlinkfar-base.textlinkfar.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinkfar-merge.textlinkfar.h5.tst b/tools/test/h5repack/expected/textlinkfar-merge.textlinkfar.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/textlinkfar-merge.textlinkfar.h5.tst rename to tools/test/h5repack/expected/textlinkfar-merge.textlinkfar.h5.tst diff --git a/tools/test/h5repack/testfiles/textlinkfar-mergeprune.textlinkfar.h5.ddl b/tools/test/h5repack/expected/textlinkfar-mergeprune.textlinkfar.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinkfar-mergeprune.textlinkfar.h5.ddl rename to tools/test/h5repack/expected/textlinkfar-mergeprune.textlinkfar.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinkfar-prune.textlinkfar.h5.ddl b/tools/test/h5repack/expected/textlinkfar-prune.textlinkfar.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinkfar-prune.textlinkfar.h5.ddl rename to tools/test/h5repack/expected/textlinkfar-prune.textlinkfar.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinksrc-base.textlinksrc.h5.ddl b/tools/test/h5repack/expected/textlinksrc-base.textlinksrc.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinksrc-base.textlinksrc.h5.ddl rename to tools/test/h5repack/expected/textlinksrc-base.textlinksrc.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinksrc-merge.textlinksrc.h5.tst b/tools/test/h5repack/expected/textlinksrc-merge.textlinksrc.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/textlinksrc-merge.textlinksrc.h5.tst rename to tools/test/h5repack/expected/textlinksrc-merge.textlinksrc.h5.tst diff --git a/tools/test/h5repack/testfiles/textlinksrc-mergeprune.textlinksrc.h5.ddl b/tools/test/h5repack/expected/textlinksrc-mergeprune.textlinksrc.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinksrc-mergeprune.textlinksrc.h5.ddl rename to tools/test/h5repack/expected/textlinksrc-mergeprune.textlinksrc.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinksrc-prune.textlinksrc.h5.ddl b/tools/test/h5repack/expected/textlinksrc-prune.textlinksrc.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinksrc-prune.textlinksrc.h5.ddl rename to tools/test/h5repack/expected/textlinksrc-prune.textlinksrc.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinktar-base.textlinktar.h5.ddl b/tools/test/h5repack/expected/textlinktar-base.textlinktar.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinktar-base.textlinktar.h5.ddl rename to tools/test/h5repack/expected/textlinktar-base.textlinktar.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinktar-merge.textlinktar.h5.tst b/tools/test/h5repack/expected/textlinktar-merge.textlinktar.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/textlinktar-merge.textlinktar.h5.tst rename to tools/test/h5repack/expected/textlinktar-merge.textlinktar.h5.tst diff --git a/tools/test/h5repack/testfiles/textlinktar-mergeprune.textlinktar.h5.ddl b/tools/test/h5repack/expected/textlinktar-mergeprune.textlinktar.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinktar-mergeprune.textlinktar.h5.ddl rename to tools/test/h5repack/expected/textlinktar-mergeprune.textlinktar.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinktar-prune.textlinktar.h5.ddl b/tools/test/h5repack/expected/textlinktar-prune.textlinktar.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinktar-prune.textlinktar.h5.ddl rename to tools/test/h5repack/expected/textlinktar-prune.textlinktar.h5.ddl diff --git a/tools/test/h5repack/testfiles/tsoftlinks-base.tsoftlinks.h5.ddl b/tools/test/h5repack/expected/tsoftlinks-base.tsoftlinks.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/tsoftlinks-base.tsoftlinks.h5.ddl rename to tools/test/h5repack/expected/tsoftlinks-base.tsoftlinks.h5.ddl diff --git a/tools/test/h5repack/testfiles/tsoftlinks-merge.tsoftlinks.h5.tst b/tools/test/h5repack/expected/tsoftlinks-merge.tsoftlinks.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/tsoftlinks-merge.tsoftlinks.h5.tst rename to tools/test/h5repack/expected/tsoftlinks-merge.tsoftlinks.h5.tst diff --git a/tools/test/h5repack/testfiles/tsoftlinks-mergeprune.tsoftlinks.h5.ddl b/tools/test/h5repack/expected/tsoftlinks-mergeprune.tsoftlinks.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/tsoftlinks-mergeprune.tsoftlinks.h5.ddl rename to tools/test/h5repack/expected/tsoftlinks-mergeprune.tsoftlinks.h5.ddl diff --git a/tools/test/h5repack/testfiles/tsoftlinks-prune.tsoftlinks.h5.ddl b/tools/test/h5repack/expected/tsoftlinks-prune.tsoftlinks.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/tsoftlinks-prune.tsoftlinks.h5.ddl rename to tools/test/h5repack/expected/tsoftlinks-prune.tsoftlinks.h5.ddl diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in index 9b58965997f..f3b8d3eb9b9 100644 --- a/tools/test/h5repack/h5repack.sh.in +++ b/tools/test/h5repack/h5repack.sh.in @@ -56,17 +56,17 @@ verbose=yes # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" +SRC_H5REPACK_OUTFILES="$SRC_TOOLS/test/h5repack/expected" TESTDIR=./testpack test -d $TESTDIR || mkdir $TESTDIR @@ -127,62 +127,62 @@ $SRC_H5DIFF_TESTFILES/h5diff_attr1.h5 $SRC_H5REPACK_TESTFILES/h5repack_CVE-2018-17432.h5 $SRC_H5REPACK_TESTFILES/h5repack_CVE-2018-14460.h5 ########tools/testfiles#for#external#links######## -$SRC_TOOLS_TESTFILES/tsoftlinks.h5 -$SRC_TOOLS_TESTFILES/textlinkfar.h5 -$SRC_TOOLS_TESTFILES/textlinksrc.h5 -$SRC_TOOLS_TESTFILES/textlinktar.h5 -$SRC_TOOLS_TESTFILES/textlink.h5 -$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src.h5 -$SRC_H5REPACK_TESTFILES/h5copy_extlinks_trg.h5 +$SRC_H5DUMP_TESTFILES/tsoftlinks.h5 +$SRC_H5DUMP_TESTFILES/textlinkfar.h5 +$SRC_H5DUMP_TESTFILES/textlinksrc.h5 +$SRC_H5DUMP_TESTFILES/textlinktar.h5 +$SRC_H5DUMP_TESTFILES/textlink.h5 +$SRC_H5COPY_TESTFILES/h5copy_extlinks_src.h5 +$SRC_H5COPY_TESTFILES/h5copy_extlinks_trg.h5 ########tools/testfiles######## -$SRC_TOOLS_TESTFILES/tfamily00000.h5 -$SRC_TOOLS_TESTFILES/tfamily00001.h5 -$SRC_TOOLS_TESTFILES/tfamily00002.h5 -$SRC_TOOLS_TESTFILES/tfamily00003.h5 -$SRC_TOOLS_TESTFILES/tfamily00004.h5 -$SRC_TOOLS_TESTFILES/tfamily00005.h5 -$SRC_TOOLS_TESTFILES/tfamily00006.h5 -$SRC_TOOLS_TESTFILES/tfamily00007.h5 -$SRC_TOOLS_TESTFILES/tfamily00008.h5 -$SRC_TOOLS_TESTFILES/tfamily00009.h5 -$SRC_TOOLS_TESTFILES/tfamily00010.h5 -$SRC_TOOLS_TESTFILES/tordergr.h5 +$SRC_H5DUMP_TESTFILES/tfamily00000.h5 +$SRC_H5DUMP_TESTFILES/tfamily00001.h5 +$SRC_H5DUMP_TESTFILES/tfamily00002.h5 +$SRC_H5DUMP_TESTFILES/tfamily00003.h5 +$SRC_H5DUMP_TESTFILES/tfamily00004.h5 +$SRC_H5DUMP_TESTFILES/tfamily00005.h5 +$SRC_H5DUMP_TESTFILES/tfamily00006.h5 +$SRC_H5DUMP_TESTFILES/tfamily00007.h5 +$SRC_H5DUMP_TESTFILES/tfamily00008.h5 +$SRC_H5DUMP_TESTFILES/tfamily00009.h5 +$SRC_H5DUMP_TESTFILES/tfamily00010.h5 +$SRC_H5DUMP_TESTFILES/tordergr.h5 ########reference#conversion#files######## ########tools/testfiles/vds######## -$SRC_TOOLS_TESTFILES/vds/1_a.h5 -$SRC_TOOLS_TESTFILES/vds/1_b.h5 -$SRC_TOOLS_TESTFILES/vds/1_c.h5 -$SRC_TOOLS_TESTFILES/vds/1_d.h5 -$SRC_TOOLS_TESTFILES/vds/1_e.h5 -$SRC_TOOLS_TESTFILES/vds/1_f.h5 -$SRC_TOOLS_TESTFILES/vds/1_vds.h5 -$SRC_TOOLS_TESTFILES/vds/2_a.h5 -$SRC_TOOLS_TESTFILES/vds/2_b.h5 -$SRC_TOOLS_TESTFILES/vds/2_c.h5 -$SRC_TOOLS_TESTFILES/vds/2_d.h5 -$SRC_TOOLS_TESTFILES/vds/2_e.h5 -$SRC_TOOLS_TESTFILES/vds/2_vds.h5 -$SRC_TOOLS_TESTFILES/vds/3_1_vds.h5 -$SRC_TOOLS_TESTFILES/vds/3_2_vds.h5 -$SRC_TOOLS_TESTFILES/vds/4_0.h5 -$SRC_TOOLS_TESTFILES/vds/4_1.h5 -$SRC_TOOLS_TESTFILES/vds/4_2.h5 -$SRC_TOOLS_TESTFILES/vds/4_vds.h5 -$SRC_TOOLS_TESTFILES/vds/5_a.h5 -$SRC_TOOLS_TESTFILES/vds/5_b.h5 -$SRC_TOOLS_TESTFILES/vds/5_c.h5 -$SRC_TOOLS_TESTFILES/vds/5_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/1_a.h5 +$SRC_H5DUMP_TESTFILES/vds/1_b.h5 +$SRC_H5DUMP_TESTFILES/vds/1_c.h5 +$SRC_H5DUMP_TESTFILES/vds/1_d.h5 +$SRC_H5DUMP_TESTFILES/vds/1_e.h5 +$SRC_H5DUMP_TESTFILES/vds/1_f.h5 +$SRC_H5DUMP_TESTFILES/vds/1_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/2_a.h5 +$SRC_H5DUMP_TESTFILES/vds/2_b.h5 +$SRC_H5DUMP_TESTFILES/vds/2_c.h5 +$SRC_H5DUMP_TESTFILES/vds/2_d.h5 +$SRC_H5DUMP_TESTFILES/vds/2_e.h5 +$SRC_H5DUMP_TESTFILES/vds/2_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/3_1_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/3_2_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/4_0.h5 +$SRC_H5DUMP_TESTFILES/vds/4_1.h5 +$SRC_H5DUMP_TESTFILES/vds/4_2.h5 +$SRC_H5DUMP_TESTFILES/vds/4_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/5_a.h5 +$SRC_H5DUMP_TESTFILES/vds/5_b.h5 +$SRC_H5DUMP_TESTFILES/vds/5_c.h5 +$SRC_H5DUMP_TESTFILES/vds/5_vds.h5 ########tools/testfiles######## -$SRC_TOOLS_TESTFILES/tst_onion_dset_1d.h5 -$SRC_TOOLS_TESTFILES/tst_onion_dset_1d.h5.onion -$SRC_TOOLS_TESTFILES/tst_onion_dset_ext.h5 -$SRC_TOOLS_TESTFILES/tst_onion_dset_ext.h5.onion -$SRC_TOOLS_TESTFILES/tst_onion_objs.h5 -$SRC_TOOLS_TESTFILES/tst_onion_objs.h5.onion +$SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.h5 +$SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.h5.onion +$SRC_H5DUMP_TESTFILES/tst_onion_dset_ext.h5 +$SRC_H5DUMP_TESTFILES/tst_onion_dset_ext.h5.onion +$SRC_H5DUMP_TESTFILES/tst_onion_objs.h5 +$SRC_H5DUMP_TESTFILES/tst_onion_objs.h5.onion " LIST_OTHER_TEST_FILES=" -$SRC_H5REPACK_TESTFILES/h5repack-help.txt +$SRC_H5REPACK_OUTFILES/h5repack-help.txt $SRC_H5REPACK_TESTFILES/h5repack_ext.bin $SRC_H5REPACK_TESTFILES/ublock.bin $SRC_H5REPACK_TESTFILES/h5repack.info @@ -197,66 +197,66 @@ $SRC_H5REPACK_TESTFILES/h5repack_uint8be_ex-1.dat $SRC_H5REPACK_TESTFILES/h5repack_uint8be_ex-2.dat $SRC_H5REPACK_TESTFILES/h5repack_uint8be_ex-3.dat ############### -$SRC_H5REPACK_TESTFILES/crtorder.tordergr.h5.ddl -$SRC_H5REPACK_TESTFILES/deflate_limit.h5repack_layout.h5.ddl -$SRC_H5REPACK_TESTFILES/h5repack_layout.h5.ddl -$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-plugin_test.ddl +$SRC_H5REPACK_OUTFILES/crtorder.tordergr.h5.ddl +$SRC_H5REPACK_OUTFILES/deflate_limit.h5repack_layout.h5.ddl +$SRC_H5REPACK_OUTFILES/h5repack_layout.h5.ddl +$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-plugin_test.ddl ########fsm#files######## -$SRC_H5REPACK_TESTFILES/SP.h5repack_fsm_aggr_nopersist.h5.ddl -$SRC_H5REPACK_TESTFILES/S.h5repack_fsm_aggr_persist.h5.ddl -$SRC_H5REPACK_TESTFILES/STG.h5repack_none.h5.ddl -$SRC_H5REPACK_TESTFILES/GS.h5repack_paged_nopersist.h5.ddl -$SRC_H5REPACK_TESTFILES/SP.h5repack_paged_persist.h5.ddl -$SRC_H5REPACK_TESTFILES/SPT.h5repack_aggr.h5.ddl +$SRC_H5REPACK_OUTFILES/SP.h5repack_fsm_aggr_nopersist.h5.ddl +$SRC_H5REPACK_OUTFILES/S.h5repack_fsm_aggr_persist.h5.ddl +$SRC_H5REPACK_OUTFILES/STG.h5repack_none.h5.ddl +$SRC_H5REPACK_OUTFILES/GS.h5repack_paged_nopersist.h5.ddl +$SRC_H5REPACK_OUTFILES/SP.h5repack_paged_persist.h5.ddl +$SRC_H5REPACK_OUTFILES/SPT.h5repack_aggr.h5.ddl ########vds#files######## -$SRC_H5REPACK_TESTFILES/1_vds.h5-vds_dset_chunk20x10x5-v.ddl -$SRC_H5REPACK_TESTFILES/2_vds.h5-vds_chunk3x6x9-v.ddl -$SRC_H5REPACK_TESTFILES/3_1_vds.h5-vds_chunk2x5x8-v.ddl -$SRC_H5REPACK_TESTFILES/4_vds.h5-vds_compa-v.ddl -$SRC_H5REPACK_TESTFILES/4_vds.h5-vds_conti-v.ddl +$SRC_H5REPACK_OUTFILES/1_vds.h5-vds_dset_chunk20x10x5-v.ddl +$SRC_H5REPACK_OUTFILES/2_vds.h5-vds_chunk3x6x9-v.ddl +$SRC_H5REPACK_OUTFILES/3_1_vds.h5-vds_chunk2x5x8-v.ddl +$SRC_H5REPACK_OUTFILES/4_vds.h5-vds_compa-v.ddl +$SRC_H5REPACK_OUTFILES/4_vds.h5-vds_conti-v.ddl ########refs#files######## -$SRC_H5REPACK_TESTFILES/attrregion.tattrreg.h5.ddl -$SRC_H5REPACK_TESTFILES/dataregion.tdatareg.h5.ddl +$SRC_H5REPACK_OUTFILES/attrregion.tattrreg.h5.ddl +$SRC_H5REPACK_OUTFILES/dataregion.tdatareg.h5.ddl ########external#links#files######## -$SRC_H5REPACK_TESTFILES/textlinkfar-base.textlinkfar.h5.ddl -$SRC_H5REPACK_TESTFILES/textlinksrc-base.textlinksrc.h5.ddl -$SRC_H5REPACK_TESTFILES/textlinktar-base.textlinktar.h5.ddl -$SRC_H5REPACK_TESTFILES/textlink-base.textlink.h5.ddl -$SRC_H5REPACK_TESTFILES/tsoftlinks-base.tsoftlinks.h5.ddl -$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl -$SRC_H5REPACK_TESTFILES/textlinkfar-merge.textlinkfar.h5.tst -$SRC_H5REPACK_TESTFILES/textlinksrc-merge.textlinksrc.h5.tst -$SRC_H5REPACK_TESTFILES/textlinktar-merge.textlinktar.h5.tst -$SRC_H5REPACK_TESTFILES/textlink-merge.textlink.h5.tst -$SRC_H5REPACK_TESTFILES/tsoftlinks-merge.tsoftlinks.h5.tst -$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst -$SRC_H5REPACK_TESTFILES/textlinkfar-prune.textlinkfar.h5.ddl -$SRC_H5REPACK_TESTFILES/textlinksrc-prune.textlinksrc.h5.ddl -$SRC_H5REPACK_TESTFILES/textlinktar-prune.textlinktar.h5.ddl -$SRC_H5REPACK_TESTFILES/textlink-prune.textlink.h5.ddl -$SRC_H5REPACK_TESTFILES/tsoftlinks-prune.tsoftlinks.h5.ddl -$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl -$SRC_H5REPACK_TESTFILES/textlinkfar-mergeprune.textlinkfar.h5.ddl -$SRC_H5REPACK_TESTFILES/textlinksrc-mergeprune.textlinksrc.h5.ddl -$SRC_H5REPACK_TESTFILES/textlinktar-mergeprune.textlinktar.h5.ddl -$SRC_H5REPACK_TESTFILES/textlink-mergeprune.textlink.h5.ddl -$SRC_H5REPACK_TESTFILES/tsoftlinks-mergeprune.tsoftlinks.h5.ddl -$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinkfar-base.textlinkfar.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinksrc-base.textlinksrc.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinktar-base.textlinktar.h5.ddl +$SRC_H5REPACK_OUTFILES/textlink-base.textlink.h5.ddl +$SRC_H5REPACK_OUTFILES/tsoftlinks-base.tsoftlinks.h5.ddl +$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinkfar-merge.textlinkfar.h5.tst +$SRC_H5REPACK_OUTFILES/textlinksrc-merge.textlinksrc.h5.tst +$SRC_H5REPACK_OUTFILES/textlinktar-merge.textlinktar.h5.tst +$SRC_H5REPACK_OUTFILES/textlink-merge.textlink.h5.tst +$SRC_H5REPACK_OUTFILES/tsoftlinks-merge.tsoftlinks.h5.tst +$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst +$SRC_H5REPACK_OUTFILES/textlinkfar-prune.textlinkfar.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinksrc-prune.textlinksrc.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinktar-prune.textlinktar.h5.ddl +$SRC_H5REPACK_OUTFILES/textlink-prune.textlink.h5.ddl +$SRC_H5REPACK_OUTFILES/tsoftlinks-prune.tsoftlinks.h5.ddl +$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinkfar-mergeprune.textlinkfar.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinksrc-mergeprune.textlinksrc.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinktar-mergeprune.textlinktar.h5.ddl +$SRC_H5REPACK_OUTFILES/textlink-mergeprune.textlink.h5.ddl +$SRC_H5REPACK_OUTFILES/tsoftlinks-mergeprune.tsoftlinks.h5.ddl +$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl ########tst#files######## -$SRC_H5REPACK_TESTFILES/h5repack_filters.h5-gzip_verbose_filters.tst -$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst -$SRC_H5REPACK_TESTFILES/plugin_test.h5repack_layout.h5.tst +$SRC_H5REPACK_OUTFILES/h5repack_filters.h5-gzip_verbose_filters.tst +$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst +$SRC_H5REPACK_OUTFILES/plugin_test.h5repack_layout.h5.tst ########external#links#tst#files######## -$SRC_H5REPACK_TESTFILES/tsoftlinks-merge.tsoftlinks.h5.tst -$SRC_H5REPACK_TESTFILES/textlinkfar-merge.textlinkfar.h5.tst -$SRC_H5REPACK_TESTFILES/textlinksrc-merge.textlinksrc.h5.tst -$SRC_H5REPACK_TESTFILES/textlinktar-merge.textlinktar.h5.tst -$SRC_H5REPACK_TESTFILES/textlink-merge.textlink.h5.tst -$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst +$SRC_H5REPACK_OUTFILES/tsoftlinks-merge.tsoftlinks.h5.tst +$SRC_H5REPACK_OUTFILES/textlinkfar-merge.textlinkfar.h5.tst +$SRC_H5REPACK_OUTFILES/textlinksrc-merge.textlinksrc.h5.tst +$SRC_H5REPACK_OUTFILES/textlinktar-merge.textlinktar.h5.tst +$SRC_H5REPACK_OUTFILES/textlink-merge.textlink.h5.tst +$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst ########onion#files######## -$SRC_H5REPACK_TESTFILES/onion.tst_onion_dset_1d.h5.ddl -$SRC_H5REPACK_TESTFILES/onion.tst_onion_dset_ext.h5.ddl -$SRC_H5REPACK_TESTFILES/onion.tst_onion_objs.h5.ddl +$SRC_H5REPACK_OUTFILES/onion.tst_onion_dset_1d.h5.ddl +$SRC_H5REPACK_OUTFILES/onion.tst_onion_dset_ext.h5.ddl +$SRC_H5REPACK_OUTFILES/onion.tst_onion_objs.h5.ddl " # diff --git a/tools/test/h5repack/h5repack_plugin.sh.in b/tools/test/h5repack/h5repack_plugin.sh.in index bd7c3a1229c..43be1ee1c7b 100644 --- a/tools/test/h5repack/h5repack_plugin.sh.in +++ b/tools/test/h5repack/h5repack_plugin.sh.in @@ -47,6 +47,7 @@ SRC_TOOLS="$srcdir/../.." # testfiles source dirs for tools SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" +SRC_H5REPACK_OUTFILES="$SRC_TOOLS/test/h5repack/expected" TESTDIR=testplug test -d $TESTDIR || mkdir $TESTDIR @@ -62,14 +63,14 @@ test -d $TESTDIR || mkdir $TESTDIR # -------------------------------------------------------------------- LIST_HDF5_TEST_FILES=" $SRC_H5REPACK_TESTFILES/h5repack_layout.h5 -$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-plugin_test.ddl -$SRC_H5REPACK_TESTFILES/plugin_test.h5repack_layout.h5.tst -$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-plugin_version_test.ddl -$SRC_H5REPACK_TESTFILES/plugin_version_test.h5repack_layout.h5.tst +$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-plugin_test.ddl +$SRC_H5REPACK_OUTFILES/plugin_test.h5repack_layout.h5.tst +$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-plugin_version_test.ddl +$SRC_H5REPACK_OUTFILES/plugin_version_test.h5repack_layout.h5.tst " #$SRC_H5REPACK_TESTFILES/h5repack_layout.UD.h5 -#$SRC_H5REPACK_TESTFILES/h5repack_layout.UD.h5-plugin_none.ddl -#$SRC_H5REPACK_TESTFILES/plugin_none.h5repack_layout.UD.h5.tst +#$SRC_H5REPACK_OUTFILES/h5repack_layout.UD.h5-plugin_none.ddl +#$SRC_H5REPACK_OUTFILES/plugin_none.h5repack_layout.UD.h5.tst #" # diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src.h5 b/tools/test/h5repack/testfiles/h5copy_extlinks_src.h5 deleted file mode 100644 index 7b8621e1fad5b510c0944101777605de629c9be9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2184 zcmeD5aB<`1lHy_j0S*oZ76t(@6Gr@pf({Od2#gPtPk=HQp>zk7Ucm%mFfxE31A_!q zTo7tLy1I}cS62q0N|^aD8mf)q0V{+Bbp}j$lpY}=;Nj{R0P<=C)W5LwbOM^rV8M`H zlwVp9pIT7@6@aBn2bcm9X+{PPl=LeAO}`rK5Q7q+7C_Q3!)W>?F?>gga`f~IE5|yZ zfSHUO z4m`lpC?_*7J3gg2wM2n|A;UB|zn~ISMu9|&<4cOt^)gHu^ouid3vyDS2Cy+0!1Qy& z^rsgU$m7-yF8LUc>=l6NOGzwAEU7F=Rl=zk7Ucm%mFfxE31A_!q zTo7tLy1I}cS62q0N|^aD8mf)q0V{-s>N=S0C_UUmz{Axs0OZFAs7E!R^a*G>gK`#AsREF=@OED8Aj7Df$$uu z(&*_ITAVU;K+_K_Twv)FoY-N46wtwb{w|CR%<%Hp0%kD|GhxyS(DaQ%8N8OzV8^9m zc!@JIuz~9_2*JR>%D@3;GBGiMql_6CA|QqUFaTM=URMB*0%HUu z#LSog4RTlw2~i*fQ~?4YHTG4#-V6*KVE$ks(91=T|3OI^)Bg+%pduQSoIv3MQUeMD E00kCJF#rGn diff --git a/tools/test/h5stat/CMakeTests.cmake b/tools/test/h5stat/CMakeTests.cmake index 14bb5ea3a8c..31b3ae34051 100644 --- a/tools/test/h5stat/CMakeTests.cmake +++ b/tools/test/h5stat/CMakeTests.cmake @@ -75,15 +75,15 @@ ) foreach (ddl_file ${HDF5_REFERENCE_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/testfiles/${ddl_file}.ddl" "${PROJECT_BINARY_DIR}/${ddl_file}.ddl" "h5stat_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${ddl_file}.ddl" "${PROJECT_BINARY_DIR}/${ddl_file}.ddl" "h5stat_files") endforeach () foreach (h5_file ${HDF5_REFERENCE_ERR_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/testfiles/${h5_file}.err" "${PROJECT_BINARY_DIR}/${h5_file}.err" "h5stat_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}.err" "${PROJECT_BINARY_DIR}/${h5_file}.err" "h5stat_files") endforeach () foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5stat_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5stat_files") endforeach () add_custom_target(h5stat_files ALL COMMENT "Copying files needed by h5stat tests" DEPENDS ${h5stat_files_list}) diff --git a/tools/test/h5stat/testfiles/h5stat_dims1.ddl b/tools/test/h5stat/expected/h5stat_dims1.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_dims1.ddl rename to tools/test/h5stat/expected/h5stat_dims1.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_dims2.ddl b/tools/test/h5stat/expected/h5stat_dims2.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_dims2.ddl rename to tools/test/h5stat/expected/h5stat_dims2.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_err1_dims.err b/tools/test/h5stat/expected/h5stat_err1_dims.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err1_dims.err rename to tools/test/h5stat/expected/h5stat_err1_dims.err diff --git a/tools/test/h5stat/testfiles/h5stat_err1_links.err b/tools/test/h5stat/expected/h5stat_err1_links.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err1_links.err rename to tools/test/h5stat/expected/h5stat_err1_links.err diff --git a/tools/test/h5stat/testfiles/h5stat_err1_numattrs.err b/tools/test/h5stat/expected/h5stat_err1_numattrs.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err1_numattrs.err rename to tools/test/h5stat/expected/h5stat_err1_numattrs.err diff --git a/tools/test/h5stat/testfiles/h5stat_err2_numattrs.err b/tools/test/h5stat/expected/h5stat_err2_numattrs.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err2_numattrs.err rename to tools/test/h5stat/expected/h5stat_err2_numattrs.err diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_fill.ddl b/tools/test/h5stat/expected/h5stat_err_old_fill.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err_old_fill.ddl rename to tools/test/h5stat/expected/h5stat_err_old_fill.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_fill.err b/tools/test/h5stat/expected/h5stat_err_old_fill.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err_old_fill.err rename to tools/test/h5stat/expected/h5stat_err_old_fill.err diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_layout.ddl b/tools/test/h5stat/expected/h5stat_err_old_layout.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err_old_layout.ddl rename to tools/test/h5stat/expected/h5stat_err_old_layout.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_layout.err b/tools/test/h5stat/expected/h5stat_err_old_layout.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err_old_layout.err rename to tools/test/h5stat/expected/h5stat_err_old_layout.err diff --git a/tools/test/h5stat/testfiles/h5stat_err_refcount.ddl b/tools/test/h5stat/expected/h5stat_err_refcount.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err_refcount.ddl rename to tools/test/h5stat/expected/h5stat_err_refcount.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_err_refcount.err b/tools/test/h5stat/expected/h5stat_err_refcount.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err_refcount.err rename to tools/test/h5stat/expected/h5stat_err_refcount.err diff --git a/tools/test/h5stat/testfiles/h5stat_filters-F.ddl b/tools/test/h5stat/expected/h5stat_filters-F.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_filters-F.ddl rename to tools/test/h5stat/expected/h5stat_filters-F.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_filters-UD.ddl b/tools/test/h5stat/expected/h5stat_filters-UD.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_filters-UD.ddl rename to tools/test/h5stat/expected/h5stat_filters-UD.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_filters-UT.ddl b/tools/test/h5stat/expected/h5stat_filters-UT.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_filters-UT.ddl rename to tools/test/h5stat/expected/h5stat_filters-UT.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_filters-d.ddl b/tools/test/h5stat/expected/h5stat_filters-d.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_filters-d.ddl rename to tools/test/h5stat/expected/h5stat_filters-d.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_filters-dT.ddl b/tools/test/h5stat/expected/h5stat_filters-dT.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_filters-dT.ddl rename to tools/test/h5stat/expected/h5stat_filters-dT.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_filters-file.ddl b/tools/test/h5stat/expected/h5stat_filters-file.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_filters-file.ddl rename to tools/test/h5stat/expected/h5stat_filters-file.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_filters-g.ddl b/tools/test/h5stat/expected/h5stat_filters-g.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_filters-g.ddl rename to tools/test/h5stat/expected/h5stat_filters-g.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_filters.ddl b/tools/test/h5stat/expected/h5stat_filters.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_filters.ddl rename to tools/test/h5stat/expected/h5stat_filters.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_help1.ddl b/tools/test/h5stat/expected/h5stat_help1.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_help1.ddl rename to tools/test/h5stat/expected/h5stat_help1.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_help2.ddl b/tools/test/h5stat/expected/h5stat_help2.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_help2.ddl rename to tools/test/h5stat/expected/h5stat_help2.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_idx.ddl b/tools/test/h5stat/expected/h5stat_idx.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_idx.ddl rename to tools/test/h5stat/expected/h5stat_idx.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_links1.ddl b/tools/test/h5stat/expected/h5stat_links1.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_links1.ddl rename to tools/test/h5stat/expected/h5stat_links1.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_links2.ddl b/tools/test/h5stat/expected/h5stat_links2.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_links2.ddl rename to tools/test/h5stat/expected/h5stat_links2.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_links3.ddl b/tools/test/h5stat/expected/h5stat_links3.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_links3.ddl rename to tools/test/h5stat/expected/h5stat_links3.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_links4.ddl b/tools/test/h5stat/expected/h5stat_links4.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_links4.ddl rename to tools/test/h5stat/expected/h5stat_links4.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_links5.ddl b/tools/test/h5stat/expected/h5stat_links5.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_links5.ddl rename to tools/test/h5stat/expected/h5stat_links5.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_newgrat-UA.ddl b/tools/test/h5stat/expected/h5stat_newgrat-UA.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_newgrat-UA.ddl rename to tools/test/h5stat/expected/h5stat_newgrat-UA.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_newgrat-UG.ddl b/tools/test/h5stat/expected/h5stat_newgrat-UG.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_newgrat-UG.ddl rename to tools/test/h5stat/expected/h5stat_newgrat-UG.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_newgrat.ddl b/tools/test/h5stat/expected/h5stat_newgrat.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_newgrat.ddl rename to tools/test/h5stat/expected/h5stat_newgrat.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_nofile.ddl b/tools/test/h5stat/expected/h5stat_nofile.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_nofile.ddl rename to tools/test/h5stat/expected/h5stat_nofile.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_nofile.err b/tools/test/h5stat/expected/h5stat_nofile.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_nofile.err rename to tools/test/h5stat/expected/h5stat_nofile.err diff --git a/tools/test/h5stat/testfiles/h5stat_notexist.ddl b/tools/test/h5stat/expected/h5stat_notexist.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_notexist.ddl rename to tools/test/h5stat/expected/h5stat_notexist.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_notexist.err b/tools/test/h5stat/expected/h5stat_notexist.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_notexist.err rename to tools/test/h5stat/expected/h5stat_notexist.err diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs1.ddl b/tools/test/h5stat/expected/h5stat_numattrs1.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_numattrs1.ddl rename to tools/test/h5stat/expected/h5stat_numattrs1.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs2.ddl b/tools/test/h5stat/expected/h5stat_numattrs2.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_numattrs2.ddl rename to tools/test/h5stat/expected/h5stat_numattrs2.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs3.ddl b/tools/test/h5stat/expected/h5stat_numattrs3.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_numattrs3.ddl rename to tools/test/h5stat/expected/h5stat_numattrs3.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs4.ddl b/tools/test/h5stat/expected/h5stat_numattrs4.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_numattrs4.ddl rename to tools/test/h5stat/expected/h5stat_numattrs4.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_tsohm.ddl b/tools/test/h5stat/expected/h5stat_tsohm.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_tsohm.ddl rename to tools/test/h5stat/expected/h5stat_tsohm.ddl diff --git a/tools/test/h5stat/testh5stat.sh.in b/tools/test/h5stat/testh5stat.sh.in index 65e40c4d820..1223c8fc5d4 100644 --- a/tools/test/h5stat/testh5stat.sh.in +++ b/tools/test/h5stat/testh5stat.sh.in @@ -39,17 +39,17 @@ verbose=yes # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" +SRC_H5STAT_OUTFILES="$SRC_TOOLS/test/h5stat/expected" TESTDIR=./testfiles test -d $TESTDIR || mkdir $TESTDIR @@ -75,49 +75,49 @@ $SRC_H5STAT_TESTFILES/h5stat_threshold.h5 " LIST_ERR_TEST_FILES=" -$SRC_H5STAT_TESTFILES/h5stat_err_refcount.err -$SRC_H5STAT_TESTFILES/h5stat_err_old_layout.err -$SRC_H5STAT_TESTFILES/h5stat_err_old_fill.err -$SRC_H5STAT_TESTFILES/h5stat_err1_links.err -$SRC_H5STAT_TESTFILES/h5stat_err1_dims.err -$SRC_H5STAT_TESTFILES/h5stat_err1_numattrs.err -$SRC_H5STAT_TESTFILES/h5stat_err2_numattrs.err -$SRC_H5STAT_TESTFILES/h5stat_notexist.err -$SRC_H5STAT_TESTFILES/h5stat_nofile.err +$SRC_H5STAT_OUTFILES/h5stat_err_refcount.err +$SRC_H5STAT_OUTFILES/h5stat_err_old_layout.err +$SRC_H5STAT_OUTFILES/h5stat_err_old_fill.err +$SRC_H5STAT_OUTFILES/h5stat_err1_links.err +$SRC_H5STAT_OUTFILES/h5stat_err1_dims.err +$SRC_H5STAT_OUTFILES/h5stat_err1_numattrs.err +$SRC_H5STAT_OUTFILES/h5stat_err2_numattrs.err +$SRC_H5STAT_OUTFILES/h5stat_notexist.err +$SRC_H5STAT_OUTFILES/h5stat_nofile.err " LIST_OTHER_TEST_FILES=" -$SRC_H5STAT_TESTFILES/h5stat_err_refcount.ddl -$SRC_H5STAT_TESTFILES/h5stat_err_old_layout.ddl -$SRC_H5STAT_TESTFILES/h5stat_err_old_fill.ddl -$SRC_H5STAT_TESTFILES/h5stat_help1.ddl -$SRC_H5STAT_TESTFILES/h5stat_help2.ddl -$SRC_H5STAT_TESTFILES/h5stat_notexist.ddl -$SRC_H5STAT_TESTFILES/h5stat_nofile.ddl -$SRC_H5STAT_TESTFILES/h5stat_filters.ddl -$SRC_H5STAT_TESTFILES/h5stat_filters-file.ddl -$SRC_H5STAT_TESTFILES/h5stat_filters-F.ddl -$SRC_H5STAT_TESTFILES/h5stat_filters-d.ddl -$SRC_H5STAT_TESTFILES/h5stat_filters-g.ddl -$SRC_H5STAT_TESTFILES/h5stat_filters-dT.ddl -$SRC_H5STAT_TESTFILES/h5stat_filters-UD.ddl -$SRC_H5STAT_TESTFILES/h5stat_filters-UT.ddl -$SRC_H5STAT_TESTFILES/h5stat_tsohm.ddl -$SRC_H5STAT_TESTFILES/h5stat_newgrat.ddl -$SRC_H5STAT_TESTFILES/h5stat_newgrat-UG.ddl -$SRC_H5STAT_TESTFILES/h5stat_newgrat-UA.ddl -$SRC_H5STAT_TESTFILES/h5stat_idx.ddl -$SRC_H5STAT_TESTFILES/h5stat_links1.ddl -$SRC_H5STAT_TESTFILES/h5stat_links2.ddl -$SRC_H5STAT_TESTFILES/h5stat_links3.ddl -$SRC_H5STAT_TESTFILES/h5stat_links4.ddl -$SRC_H5STAT_TESTFILES/h5stat_links5.ddl -$SRC_H5STAT_TESTFILES/h5stat_dims1.ddl -$SRC_H5STAT_TESTFILES/h5stat_dims2.ddl -$SRC_H5STAT_TESTFILES/h5stat_numattrs1.ddl -$SRC_H5STAT_TESTFILES/h5stat_numattrs2.ddl -$SRC_H5STAT_TESTFILES/h5stat_numattrs3.ddl -$SRC_H5STAT_TESTFILES/h5stat_numattrs4.ddl +$SRC_H5STAT_OUTFILES/h5stat_err_refcount.ddl +$SRC_H5STAT_OUTFILES/h5stat_err_old_layout.ddl +$SRC_H5STAT_OUTFILES/h5stat_err_old_fill.ddl +$SRC_H5STAT_OUTFILES/h5stat_help1.ddl +$SRC_H5STAT_OUTFILES/h5stat_help2.ddl +$SRC_H5STAT_OUTFILES/h5stat_notexist.ddl +$SRC_H5STAT_OUTFILES/h5stat_nofile.ddl +$SRC_H5STAT_OUTFILES/h5stat_filters.ddl +$SRC_H5STAT_OUTFILES/h5stat_filters-file.ddl +$SRC_H5STAT_OUTFILES/h5stat_filters-F.ddl +$SRC_H5STAT_OUTFILES/h5stat_filters-d.ddl +$SRC_H5STAT_OUTFILES/h5stat_filters-g.ddl +$SRC_H5STAT_OUTFILES/h5stat_filters-dT.ddl +$SRC_H5STAT_OUTFILES/h5stat_filters-UD.ddl +$SRC_H5STAT_OUTFILES/h5stat_filters-UT.ddl +$SRC_H5STAT_OUTFILES/h5stat_tsohm.ddl +$SRC_H5STAT_OUTFILES/h5stat_newgrat.ddl +$SRC_H5STAT_OUTFILES/h5stat_newgrat-UG.ddl +$SRC_H5STAT_OUTFILES/h5stat_newgrat-UA.ddl +$SRC_H5STAT_OUTFILES/h5stat_idx.ddl +$SRC_H5STAT_OUTFILES/h5stat_links1.ddl +$SRC_H5STAT_OUTFILES/h5stat_links2.ddl +$SRC_H5STAT_OUTFILES/h5stat_links3.ddl +$SRC_H5STAT_OUTFILES/h5stat_links4.ddl +$SRC_H5STAT_OUTFILES/h5stat_links5.ddl +$SRC_H5STAT_OUTFILES/h5stat_dims1.ddl +$SRC_H5STAT_OUTFILES/h5stat_dims2.ddl +$SRC_H5STAT_OUTFILES/h5stat_numattrs1.ddl +$SRC_H5STAT_OUTFILES/h5stat_numattrs2.ddl +$SRC_H5STAT_OUTFILES/h5stat_numattrs3.ddl +$SRC_H5STAT_OUTFILES/h5stat_numattrs4.ddl " # diff --git a/tools/test/misc/CMakeTestsClear.cmake b/tools/test/misc/CMakeTestsClear.cmake index 5e307aa3fcc..2f3c62f9652 100644 --- a/tools/test/misc/CMakeTestsClear.cmake +++ b/tools/test/misc/CMakeTestsClear.cmake @@ -63,11 +63,14 @@ h5clear_open_fail.err ) - foreach (h5_file ${HDF5_TEST_FILES} ${HDF5_SEC2_TEST_FILES} ${HDF5_REFERENCE_TEST_FILES}) + foreach (h5_file ${HDF5_TEST_FILES} ${HDF5_SEC2_TEST_FILES}) HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5clear_files") endforeach () + foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5clear_files") + endforeach () foreach (h5_file ${HDF5_REFERENCE_ERR_FILES}) - HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5clear_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5clear_files") endforeach () # make second copy of h5clear_sec2.h5 foreach (h5_file ${HDF5_SEC2_TEST_FILES}) @@ -99,6 +102,10 @@ -D "TEST_REFERENCE=${resultfile}.ddl" -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) + if (last_test) + set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS ${last_test}) + endif () + set (last_test "H5CLEAR_CMP-${testname}") endif () endmacro () @@ -117,6 +124,10 @@ -D "TEST_ERRREF=${resultfile}.err" -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) + if (last_test) + set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS ${last_test}) + endif () + set (last_test "H5CLEAR_CMP-${testname}") endif () endmacro () diff --git a/tools/test/misc/CMakeTestsMkgrp.cmake b/tools/test/misc/CMakeTestsMkgrp.cmake index b4d1a563a30..9e4f7393518 100644 --- a/tools/test/misc/CMakeTestsMkgrp.cmake +++ b/tools/test/misc/CMakeTestsMkgrp.cmake @@ -40,10 +40,10 @@ file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") foreach (h5_mkgrp_file ${HDF5_MKGRP_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_mkgrp_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_mkgrp_file}" "h5mkgrp_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_mkgrp_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_mkgrp_file}" "h5mkgrp_files") endforeach () - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/testfiles/h5mkgrp_help.txt" "${PROJECT_BINARY_DIR}/testfiles/h5mkgrp_help.txt" "h5mkgrp_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/h5mkgrp_help.txt" "${PROJECT_BINARY_DIR}/testfiles/h5mkgrp_help.txt" "h5mkgrp_files") add_custom_target(h5mkgrp_files ALL COMMENT "Copying files needed by h5mkgrp tests" DEPENDS ${h5mkgrp_files_list}) configure_file (${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/testfiles/h5mkgrp_version.txt.in ${PROJECT_BINARY_DIR}/testfiles/h5mkgrp_version.txt @ONLY) diff --git a/tools/test/misc/CMakeTestsRepart.cmake b/tools/test/misc/CMakeTestsRepart.cmake index 04c74ecc257..764778e9b96 100644 --- a/tools/test/misc/CMakeTestsRepart.cmake +++ b/tools/test/misc/CMakeTestsRepart.cmake @@ -41,7 +41,7 @@ ) foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5repart_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5repart_files") endforeach () add_custom_target(h5repart_files ALL COMMENT "Copying files needed by h5repart tests" DEPENDS ${h5repart_files_list}) diff --git a/tools/test/misc/testfiles/h5clear_equal_after_size.ddl b/tools/test/misc/expected/h5clear_equal_after_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_equal_after_size.ddl rename to tools/test/misc/expected/h5clear_equal_after_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_equal_before_size.ddl b/tools/test/misc/expected/h5clear_equal_before_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_equal_before_size.ddl rename to tools/test/misc/expected/h5clear_equal_before_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_greater_after_size.ddl b/tools/test/misc/expected/h5clear_greater_after_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_greater_after_size.ddl rename to tools/test/misc/expected/h5clear_greater_after_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_greater_before_size.ddl b/tools/test/misc/expected/h5clear_greater_before_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_greater_before_size.ddl rename to tools/test/misc/expected/h5clear_greater_before_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_less_after_size.ddl b/tools/test/misc/expected/h5clear_less_after_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_less_after_size.ddl rename to tools/test/misc/expected/h5clear_less_after_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_less_before_size.ddl b/tools/test/misc/expected/h5clear_less_before_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_less_before_size.ddl rename to tools/test/misc/expected/h5clear_less_before_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_missing_file.ddl b/tools/test/misc/expected/h5clear_missing_file.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_missing_file.ddl rename to tools/test/misc/expected/h5clear_missing_file.ddl diff --git a/tools/test/misc/testfiles/h5clear_missing_file.err b/tools/test/misc/expected/h5clear_missing_file.err similarity index 100% rename from tools/test/misc/testfiles/h5clear_missing_file.err rename to tools/test/misc/expected/h5clear_missing_file.err diff --git a/tools/test/misc/testfiles/h5clear_no_mdc_image.err b/tools/test/misc/expected/h5clear_no_mdc_image.err similarity index 100% rename from tools/test/misc/testfiles/h5clear_no_mdc_image.err rename to tools/test/misc/expected/h5clear_no_mdc_image.err diff --git a/tools/test/misc/testfiles/h5clear_noclose_after_size.ddl b/tools/test/misc/expected/h5clear_noclose_after_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_noclose_after_size.ddl rename to tools/test/misc/expected/h5clear_noclose_after_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_noclose_before_size.ddl b/tools/test/misc/expected/h5clear_noclose_before_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_noclose_before_size.ddl rename to tools/test/misc/expected/h5clear_noclose_before_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_open_fail.err b/tools/test/misc/expected/h5clear_open_fail.err similarity index 100% rename from tools/test/misc/testfiles/h5clear_open_fail.err rename to tools/test/misc/expected/h5clear_open_fail.err diff --git a/tools/test/misc/testfiles/h5clear_status_noclose_after_size.ddl b/tools/test/misc/expected/h5clear_status_noclose_after_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_status_noclose_after_size.ddl rename to tools/test/misc/expected/h5clear_status_noclose_after_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_usage.ddl b/tools/test/misc/expected/h5clear_usage.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_usage.ddl rename to tools/test/misc/expected/h5clear_usage.ddl diff --git a/tools/test/misc/testfiles/h5clear_user_equal_after_size.ddl b/tools/test/misc/expected/h5clear_user_equal_after_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_user_equal_after_size.ddl rename to tools/test/misc/expected/h5clear_user_equal_after_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_user_equal_before_size.ddl b/tools/test/misc/expected/h5clear_user_equal_before_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_user_equal_before_size.ddl rename to tools/test/misc/expected/h5clear_user_equal_before_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_user_greater_after_size.ddl b/tools/test/misc/expected/h5clear_user_greater_after_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_user_greater_after_size.ddl rename to tools/test/misc/expected/h5clear_user_greater_after_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_user_greater_before_size.ddl b/tools/test/misc/expected/h5clear_user_greater_before_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_user_greater_before_size.ddl rename to tools/test/misc/expected/h5clear_user_greater_before_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_user_less_after_size.ddl b/tools/test/misc/expected/h5clear_user_less_after_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_user_less_after_size.ddl rename to tools/test/misc/expected/h5clear_user_less_after_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_user_less_before_size.ddl b/tools/test/misc/expected/h5clear_user_less_before_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_user_less_before_size.ddl rename to tools/test/misc/expected/h5clear_user_less_before_size.ddl diff --git a/tools/test/misc/testfiles/h5mkgrp_help.txt b/tools/test/misc/expected/h5mkgrp_help.txt similarity index 100% rename from tools/test/misc/testfiles/h5mkgrp_help.txt rename to tools/test/misc/expected/h5mkgrp_help.txt diff --git a/tools/testfiles/h5mkgrp_nested_lp.ls b/tools/test/misc/expected/h5mkgrp_nested_lp.ls similarity index 100% rename from tools/testfiles/h5mkgrp_nested_lp.ls rename to tools/test/misc/expected/h5mkgrp_nested_lp.ls diff --git a/tools/testfiles/h5mkgrp_nested_mult_lp.ls b/tools/test/misc/expected/h5mkgrp_nested_mult_lp.ls similarity index 100% rename from tools/testfiles/h5mkgrp_nested_mult_lp.ls rename to tools/test/misc/expected/h5mkgrp_nested_mult_lp.ls diff --git a/tools/testfiles/h5mkgrp_nested_mult_p.ls b/tools/test/misc/expected/h5mkgrp_nested_mult_p.ls similarity index 100% rename from tools/testfiles/h5mkgrp_nested_mult_p.ls rename to tools/test/misc/expected/h5mkgrp_nested_mult_p.ls diff --git a/tools/testfiles/h5mkgrp_nested_p.ls b/tools/test/misc/expected/h5mkgrp_nested_p.ls similarity index 100% rename from tools/testfiles/h5mkgrp_nested_p.ls rename to tools/test/misc/expected/h5mkgrp_nested_p.ls diff --git a/tools/testfiles/h5mkgrp_several.ls b/tools/test/misc/expected/h5mkgrp_several.ls similarity index 100% rename from tools/testfiles/h5mkgrp_several.ls rename to tools/test/misc/expected/h5mkgrp_several.ls diff --git a/tools/testfiles/h5mkgrp_several_l.ls b/tools/test/misc/expected/h5mkgrp_several_l.ls similarity index 100% rename from tools/testfiles/h5mkgrp_several_l.ls rename to tools/test/misc/expected/h5mkgrp_several_l.ls diff --git a/tools/testfiles/h5mkgrp_several_p.ls b/tools/test/misc/expected/h5mkgrp_several_p.ls similarity index 100% rename from tools/testfiles/h5mkgrp_several_p.ls rename to tools/test/misc/expected/h5mkgrp_several_p.ls diff --git a/tools/testfiles/h5mkgrp_several_v.ls b/tools/test/misc/expected/h5mkgrp_several_v.ls similarity index 100% rename from tools/testfiles/h5mkgrp_several_v.ls rename to tools/test/misc/expected/h5mkgrp_several_v.ls diff --git a/tools/testfiles/h5mkgrp_single.ls b/tools/test/misc/expected/h5mkgrp_single.ls similarity index 100% rename from tools/testfiles/h5mkgrp_single.ls rename to tools/test/misc/expected/h5mkgrp_single.ls diff --git a/tools/testfiles/h5mkgrp_single_l.ls b/tools/test/misc/expected/h5mkgrp_single_l.ls similarity index 100% rename from tools/testfiles/h5mkgrp_single_l.ls rename to tools/test/misc/expected/h5mkgrp_single_l.ls diff --git a/tools/testfiles/h5mkgrp_single_p.ls b/tools/test/misc/expected/h5mkgrp_single_p.ls similarity index 100% rename from tools/testfiles/h5mkgrp_single_p.ls rename to tools/test/misc/expected/h5mkgrp_single_p.ls diff --git a/tools/testfiles/h5mkgrp_single_v.ls b/tools/test/misc/expected/h5mkgrp_single_v.ls similarity index 100% rename from tools/testfiles/h5mkgrp_single_v.ls rename to tools/test/misc/expected/h5mkgrp_single_v.ls diff --git a/tools/testfiles/family_file00000.h5 b/tools/test/misc/testfiles/family_file00000.h5 similarity index 100% rename from tools/testfiles/family_file00000.h5 rename to tools/test/misc/testfiles/family_file00000.h5 diff --git a/tools/testfiles/family_file00001.h5 b/tools/test/misc/testfiles/family_file00001.h5 similarity index 100% rename from tools/testfiles/family_file00001.h5 rename to tools/test/misc/testfiles/family_file00001.h5 diff --git a/tools/testfiles/family_file00002.h5 b/tools/test/misc/testfiles/family_file00002.h5 similarity index 100% rename from tools/testfiles/family_file00002.h5 rename to tools/test/misc/testfiles/family_file00002.h5 diff --git a/tools/testfiles/family_file00003.h5 b/tools/test/misc/testfiles/family_file00003.h5 similarity index 100% rename from tools/testfiles/family_file00003.h5 rename to tools/test/misc/testfiles/family_file00003.h5 diff --git a/tools/testfiles/family_file00004.h5 b/tools/test/misc/testfiles/family_file00004.h5 similarity index 100% rename from tools/testfiles/family_file00004.h5 rename to tools/test/misc/testfiles/family_file00004.h5 diff --git a/tools/testfiles/family_file00005.h5 b/tools/test/misc/testfiles/family_file00005.h5 similarity index 100% rename from tools/testfiles/family_file00005.h5 rename to tools/test/misc/testfiles/family_file00005.h5 diff --git a/tools/testfiles/family_file00006.h5 b/tools/test/misc/testfiles/family_file00006.h5 similarity index 100% rename from tools/testfiles/family_file00006.h5 rename to tools/test/misc/testfiles/family_file00006.h5 diff --git a/tools/testfiles/family_file00007.h5 b/tools/test/misc/testfiles/family_file00007.h5 similarity index 100% rename from tools/testfiles/family_file00007.h5 rename to tools/test/misc/testfiles/family_file00007.h5 diff --git a/tools/testfiles/family_file00008.h5 b/tools/test/misc/testfiles/family_file00008.h5 similarity index 100% rename from tools/testfiles/family_file00008.h5 rename to tools/test/misc/testfiles/family_file00008.h5 diff --git a/tools/testfiles/family_file00009.h5 b/tools/test/misc/testfiles/family_file00009.h5 similarity index 100% rename from tools/testfiles/family_file00009.h5 rename to tools/test/misc/testfiles/family_file00009.h5 diff --git a/tools/testfiles/family_file00010.h5 b/tools/test/misc/testfiles/family_file00010.h5 similarity index 100% rename from tools/testfiles/family_file00010.h5 rename to tools/test/misc/testfiles/family_file00010.h5 diff --git a/tools/testfiles/family_file00011.h5 b/tools/test/misc/testfiles/family_file00011.h5 similarity index 100% rename from tools/testfiles/family_file00011.h5 rename to tools/test/misc/testfiles/family_file00011.h5 diff --git a/tools/testfiles/family_file00012.h5 b/tools/test/misc/testfiles/family_file00012.h5 similarity index 100% rename from tools/testfiles/family_file00012.h5 rename to tools/test/misc/testfiles/family_file00012.h5 diff --git a/tools/testfiles/family_file00013.h5 b/tools/test/misc/testfiles/family_file00013.h5 similarity index 100% rename from tools/testfiles/family_file00013.h5 rename to tools/test/misc/testfiles/family_file00013.h5 diff --git a/tools/testfiles/family_file00014.h5 b/tools/test/misc/testfiles/family_file00014.h5 similarity index 100% rename from tools/testfiles/family_file00014.h5 rename to tools/test/misc/testfiles/family_file00014.h5 diff --git a/tools/testfiles/family_file00015.h5 b/tools/test/misc/testfiles/family_file00015.h5 similarity index 100% rename from tools/testfiles/family_file00015.h5 rename to tools/test/misc/testfiles/family_file00015.h5 diff --git a/tools/testfiles/family_file00016.h5 b/tools/test/misc/testfiles/family_file00016.h5 similarity index 100% rename from tools/testfiles/family_file00016.h5 rename to tools/test/misc/testfiles/family_file00016.h5 diff --git a/tools/testfiles/family_file00017.h5 b/tools/test/misc/testfiles/family_file00017.h5 similarity index 100% rename from tools/testfiles/family_file00017.h5 rename to tools/test/misc/testfiles/family_file00017.h5 diff --git a/tools/test/misc/testh5clear.sh.in b/tools/test/misc/testh5clear.sh.in index 018d1fd3a48..b5bf5cc3d83 100644 --- a/tools/test/misc/testh5clear.sh.in +++ b/tools/test/misc/testh5clear.sh.in @@ -40,9 +40,9 @@ verbose=yes # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools SRC_H5CLEAR_TESTFILES="$SRC_TOOLS/test/misc/testfiles" +SRC_H5CLEAR_OUTFILES="$SRC_TOOLS/test/misc/expected" TESTDIR=./testh5clear test -d $TESTDIR || mkdir -p $TESTDIR @@ -61,25 +61,25 @@ test -d $TESTDIR || mkdir -p $TESTDIR # copy test files and expected output files from source dirs to test dir # COPY_TESTFILES=" -$SRC_H5CLEAR_TESTFILES/h5clear_open_fail.err -$SRC_H5CLEAR_TESTFILES/h5clear_no_mdc_image.err -$SRC_H5CLEAR_TESTFILES/h5clear_usage.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_missing_file.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_status_noclose_after_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_noclose_before_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_noclose_after_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_equal_before_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_equal_after_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_greater_before_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_greater_after_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_less_before_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_less_after_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_user_equal_before_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_user_equal_after_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_user_greater_before_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_user_greater_after_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_user_less_before_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_user_less_after_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_open_fail.err +$SRC_H5CLEAR_OUTFILES/h5clear_no_mdc_image.err +$SRC_H5CLEAR_OUTFILES/h5clear_usage.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_missing_file.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_status_noclose_after_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_noclose_before_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_noclose_after_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_equal_before_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_equal_after_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_greater_before_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_greater_after_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_less_before_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_less_after_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_user_equal_before_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_user_equal_after_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_user_greater_before_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_user_greater_after_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_user_less_before_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_user_less_after_size.ddl $SRC_H5CLEAR_TESTFILES/h5clear_sec2_v0.h5 $SRC_H5CLEAR_TESTFILES/h5clear_sec2_v2.h5 $SRC_H5CLEAR_TESTFILES/h5clear_sec2_v3.h5 diff --git a/tools/test/misc/testh5mkgrp.sh.in b/tools/test/misc/testh5mkgrp.sh.in index d581fe1e12a..676f6b04e55 100644 --- a/tools/test/misc/testh5mkgrp.sh.in +++ b/tools/test/misc/testh5mkgrp.sh.in @@ -39,9 +39,9 @@ verbose=yes # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools SRC_H5MKGRP_TESTFILES="$SRC_TOOLS/test/misc/testfiles" +SRC_H5MKGRP_OUTFILES="$SRC_TOOLS/test/misc/expected" TESTDIR=./testgrp test -d $TESTDIR || mkdir -p $TESTDIR @@ -60,19 +60,19 @@ test -d $TESTDIR || mkdir -p $TESTDIR # copy test files and expected output files from source dirs to test dir # COPY_TESTFILES=" -$SRC_H5MKGRP_TESTFILES/h5mkgrp_help.txt -$SRC_TOOLS_TESTFILES/h5mkgrp_single.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_single_v.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_single_p.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_single_l.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_several.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_several_v.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_several_p.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_several_l.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_nested_p.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_nested_lp.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_nested_mult_p.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_nested_mult_lp.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_help.txt +$SRC_H5MKGRP_OUTFILES/h5mkgrp_single.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_single_v.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_single_p.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_single_l.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_several.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_several_v.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_several_p.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_several_l.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_nested_p.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_nested_lp.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_nested_mult_p.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_nested_mult_lp.ls " COPY_TESTFILES_TO_TESTDIR() diff --git a/tools/test/misc/testh5repart.sh.in b/tools/test/misc/testh5repart.sh.in index b0d52f60b2d..addd0db9e22 100644 --- a/tools/test/misc/testh5repart.sh.in +++ b/tools/test/misc/testh5repart.sh.in @@ -38,7 +38,7 @@ verbose=yes # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" +SRC_H5REPART_TESTFILES="$SRC_TOOLS/test/misc/testfiles" TESTDIR=./testrepart test -d $TESTDIR || mkdir -p $TESTDIR @@ -47,24 +47,24 @@ test -d $TESTDIR || mkdir -p $TESTDIR # copy test files and expected output files from source dirs to test dir # COPY_TESTFILES=" -$SRC_TOOLS_TESTFILES/family_file00000.h5 -$SRC_TOOLS_TESTFILES/family_file00001.h5 -$SRC_TOOLS_TESTFILES/family_file00002.h5 -$SRC_TOOLS_TESTFILES/family_file00003.h5 -$SRC_TOOLS_TESTFILES/family_file00004.h5 -$SRC_TOOLS_TESTFILES/family_file00005.h5 -$SRC_TOOLS_TESTFILES/family_file00006.h5 -$SRC_TOOLS_TESTFILES/family_file00007.h5 -$SRC_TOOLS_TESTFILES/family_file00008.h5 -$SRC_TOOLS_TESTFILES/family_file00009.h5 -$SRC_TOOLS_TESTFILES/family_file00010.h5 -$SRC_TOOLS_TESTFILES/family_file00011.h5 -$SRC_TOOLS_TESTFILES/family_file00012.h5 -$SRC_TOOLS_TESTFILES/family_file00013.h5 -$SRC_TOOLS_TESTFILES/family_file00014.h5 -$SRC_TOOLS_TESTFILES/family_file00015.h5 -$SRC_TOOLS_TESTFILES/family_file00016.h5 -$SRC_TOOLS_TESTFILES/family_file00017.h5 +$SRC_H5REPART_TESTFILES/family_file00000.h5 +$SRC_H5REPART_TESTFILES/family_file00001.h5 +$SRC_H5REPART_TESTFILES/family_file00002.h5 +$SRC_H5REPART_TESTFILES/family_file00003.h5 +$SRC_H5REPART_TESTFILES/family_file00004.h5 +$SRC_H5REPART_TESTFILES/family_file00005.h5 +$SRC_H5REPART_TESTFILES/family_file00006.h5 +$SRC_H5REPART_TESTFILES/family_file00007.h5 +$SRC_H5REPART_TESTFILES/family_file00008.h5 +$SRC_H5REPART_TESTFILES/family_file00009.h5 +$SRC_H5REPART_TESTFILES/family_file00010.h5 +$SRC_H5REPART_TESTFILES/family_file00011.h5 +$SRC_H5REPART_TESTFILES/family_file00012.h5 +$SRC_H5REPART_TESTFILES/family_file00013.h5 +$SRC_H5REPART_TESTFILES/family_file00014.h5 +$SRC_H5REPART_TESTFILES/family_file00015.h5 +$SRC_H5REPART_TESTFILES/family_file00016.h5 +$SRC_H5REPART_TESTFILES/family_file00017.h5 " COPY_TESTFILES_TO_TESTDIR() @@ -100,7 +100,7 @@ CLEAN_TESTFILES_AND_TESTDIR() # skip rm if srcdir is same as destdir # this occurs when build/test performed in source dir and # make cp fail - SDIR=$SRC_TOOLS_TESTFILES + SDIR=$SRC_H5REPART_TESTFILES INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then diff --git a/tools/test/perform/CMakeTests.cmake b/tools/test/perform/CMakeTests.cmake index acfe169fc9e..2dea619438a 100644 --- a/tools/test/perform/CMakeTests.cmake +++ b/tools/test/perform/CMakeTests.cmake @@ -16,7 +16,7 @@ ############################################################################## ############################################################################## -HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfilters.h5" "${PROJECT_BINARY_DIR}/tfilters.h5" "zip_perf_files") +HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tfilters.h5" "${PROJECT_BINARY_DIR}/tfilters.h5" "zip_perf_files") add_custom_target(zip_perf_files ALL COMMENT "Copying files needed by zip_perf tests" DEPENDS ${zip_perf_list}) #----------------------------------------------------------------------------- diff --git a/utils/tools/test/h5dwalk/testh5dwalk.sh.in b/utils/tools/test/h5dwalk/testh5dwalk.sh.in index 4f6dbdee3ac..a123f8d98cb 100644 --- a/utils/tools/test/h5dwalk/testh5dwalk.sh.in +++ b/utils/tools/test/h5dwalk/testh5dwalk.sh.in @@ -57,11 +57,10 @@ export LD_LIBRARY_PATH=@LL_PATH@ # source dirs SRC_TOOLS="$TOP_DIR/tools/test" -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/h5repack/testfiles" From 8e964d4622d655514d5494e9e45ebd06031099c8 Mon Sep 17 00:00:00 2001 From: jhendersonHDF Date: Tue, 26 Sep 2023 15:47:13 -0500 Subject: [PATCH 10/10] Clean up Subfiling VFD header doxygen formatting (#3601) --- src/H5FDsubfiling/H5FDsubfiling.h | 42 +++++++++++++++++++------------ 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/src/H5FDsubfiling/H5FDsubfiling.h b/src/H5FDsubfiling/H5FDsubfiling.h index 5a520ce4270..d6d2ffd16da 100644 --- a/src/H5FDsubfiling/H5FDsubfiling.h +++ b/src/H5FDsubfiling/H5FDsubfiling.h @@ -61,32 +61,42 @@ /** * \def H5FD_SUBFILING_FILENAME_TEMPLATE - * The basic template for a subfile filename. The format specifiers - * correspond to: + * The basic printf-style template for a #H5FD_SUBFILING driver + * subfile filename. The format specifiers correspond to: * - * %s -> base filename, e.g. "file.h5" - * %PRIu64 -> file inode, e.g. 11273556 - * %0*d -> number (starting at 1) signifying the Nth (out of total - * number of subfiles) subfile. Zero-padded according - * to the number of digits in the number of subfiles - * (calculated by log10(num_subfiles) + 1) - * %d -> number of subfiles + * \par \%s + * base filename, e.g. "file.h5" + * + * \par \%PRIu64 + * file inode, e.g. 11273556 + * + * \par \%0*d + * number (starting at 1) signifying the Nth (out of + * total number of subfiles) subfile. Zero-padded + * according to the number of digits in the number of + * subfiles (calculated by log10(num_subfiles) + 1) + * + * \par \%d + * number of subfiles * * yielding filenames such as: * - * file.h5.subfile_11273556_01_of_10 - * file.h5.subfile_11273556_02_of_10 - * file.h5.subfile_11273556_10_of_10 + * file.h5.subfile_11273556_01_of_10 \n + * file.h5.subfile_11273556_02_of_10 \n + * file.h5.subfile_11273556_10_of_10 \n */ #define H5FD_SUBFILING_FILENAME_TEMPLATE "%s.subfile_%" PRIu64 "_%0*d_of_%d" /** * \def H5FD_SUBFILING_CONFIG_FILENAME_TEMPLATE - * The basic template for a #H5FD_SUBFILING driver configuration filename. - * The format specifiers correspond to: + * The basic printf-style template for a #H5FD_SUBFILING driver + * configuration filename. The format specifiers correspond to: + * + * \par \%s + * base filename, e.g. "file.h5" * - * %s -> base filename, e.g. "file.h5" - * %PRIu64 -> file inode, e.g. 11273556 + * \par \%PRIu64 + * file inode, e.g. 11273556 * * yielding a filename such as: *