summaryrefslogtreecommitdiffstats
path: root/tools/test
diff options
context:
space:
mode:
Diffstat (limited to 'tools/test')
-rw-r--r--tools/test/h5diff/h5diff_plugin.sh.in2
-rw-r--r--tools/test/h5dump/binread.c2
-rw-r--r--tools/test/h5dump/h5dump_plugin.sh.in2
-rw-r--r--tools/test/h5dump/h5dumpgentest.c4
-rw-r--r--tools/test/h5ls/h5ls_plugin.sh.in2
-rw-r--r--tools/test/h5repack/h5repack_plugin.sh.in2
-rw-r--r--tools/test/h5repack/testh5repack_detect_szip.c4
-rw-r--r--tools/test/h5stat/testh5stat.sh.in4
-rw-r--r--tools/test/perform/chunk.c10
-rw-r--r--tools/test/perform/overhead.c10
-rw-r--r--tools/test/perform/perf_meta.c26
-rw-r--r--tools/test/perform/zip_perf.c28
12 files changed, 6 insertions, 90 deletions
diff --git a/tools/test/h5diff/h5diff_plugin.sh.in b/tools/test/h5diff/h5diff_plugin.sh.in
index ee7bc8b..e3f0f01 100644
--- a/tools/test/h5diff/h5diff_plugin.sh.in
+++ b/tools/test/h5diff/h5diff_plugin.sh.in
@@ -82,7 +82,7 @@ if [ $? != 0 ]; then
fi
# setup plugin path
-ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}"
+ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}:${HDF5_PLUGIN_PATH}"
#
# copy test files and expected output files from source dirs to test dir
diff --git a/tools/test/h5dump/binread.c b/tools/test/h5dump/binread.c
index 484e354..2315e85 100644
--- a/tools/test/h5dump/binread.c
+++ b/tools/test/h5dump/binread.c
@@ -39,8 +39,6 @@
*
* Programmer: Pedro Vicente Nunes
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
static void
diff --git a/tools/test/h5dump/h5dump_plugin.sh.in b/tools/test/h5dump/h5dump_plugin.sh.in
index b2f9f31..d9b77ee 100644
--- a/tools/test/h5dump/h5dump_plugin.sh.in
+++ b/tools/test/h5dump/h5dump_plugin.sh.in
@@ -88,7 +88,7 @@ if [ $? != 0 ]; then
fi
# setup plugin path
-ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}"
+ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}:${HDF5_PLUGIN_PATH}"
#
# copy test files and expected output files from source dirs to test dir
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 7e8e19b..1fd512c 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -7175,10 +7175,6 @@ gent_fs_strategy_threshold(void)
* Create one dataset with (set_chunk, fixed dims, fixed max. dims)
* so that Fixed Array indexing will be used.
*
- * Modifications:
- * Fixed Array indexing will be used for chunked dataset
- * with fixed max. dims setting.
- *
*/
static void
gent_dataset_idx(void)
diff --git a/tools/test/h5ls/h5ls_plugin.sh.in b/tools/test/h5ls/h5ls_plugin.sh.in
index 48f6e1e..02e0cf7 100644
--- a/tools/test/h5ls/h5ls_plugin.sh.in
+++ b/tools/test/h5ls/h5ls_plugin.sh.in
@@ -88,7 +88,7 @@ if [ $? != 0 ]; then
fi
# setup plugin path
-ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}"
+ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}:${HDF5_PLUGIN_PATH}"
#
# copy test files and expected output files from source dirs to test dir
diff --git a/tools/test/h5repack/h5repack_plugin.sh.in b/tools/test/h5repack/h5repack_plugin.sh.in
index 14bcbbf..bd7c3a1 100644
--- a/tools/test/h5repack/h5repack_plugin.sh.in
+++ b/tools/test/h5repack/h5repack_plugin.sh.in
@@ -98,7 +98,7 @@ if [ $? != 0 ]; then
fi
# setup plugin path
-ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}"
+ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}:${HDF5_PLUGIN_PATH}"
COPY_TESTFILES_TO_TESTDIR()
{
diff --git a/tools/test/h5repack/testh5repack_detect_szip.c b/tools/test/h5repack/testh5repack_detect_szip.c
index f4e4aec..b2be484 100644
--- a/tools/test/h5repack/testh5repack_detect_szip.c
+++ b/tools/test/h5repack/testh5repack_detect_szip.c
@@ -30,10 +30,6 @@
*
* Date:
*
- * Comments:
- *
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
diff --git a/tools/test/h5stat/testh5stat.sh.in b/tools/test/h5stat/testh5stat.sh.in
index 9cbedce..65e40c4 100644
--- a/tools/test/h5stat/testh5stat.sh.in
+++ b/tools/test/h5stat/testh5stat.sh.in
@@ -12,10 +12,6 @@
#
# Tests for the h5stat tool
#
-# Modifications:
-# Vailin Choi; July 2013
-# Add tests for -l, -m, -a options
-#
srcdir=@srcdir@
diff --git a/tools/test/perform/chunk.c b/tools/test/perform/chunk.c
index 27ada87..3f4b3d7 100644
--- a/tools/test/perform/chunk.c
+++ b/tools/test/perform/chunk.c
@@ -97,8 +97,6 @@ const H5Z_class2_t H5Z_COUNTER[1] = {{
* Programmer: Robb Matzke
* Thursday, May 14, 1998
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
static size_t
@@ -123,8 +121,6 @@ counter(unsigned H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts,
* Programmer: Robb Matzke
* Thursday, May 14, 1998
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
static void
@@ -175,8 +171,6 @@ create_dataset(void)
* Programmer: Robb Matzke
* Thursday, May 14, 1998
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
static double
@@ -247,8 +241,6 @@ test_rowmaj(int op, size_t cache_size, size_t io_size)
* Programmer: Robb Matzke
* Friday, May 15, 1998
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
static double
@@ -318,8 +310,6 @@ test_diag(int op, size_t cache_size, size_t io_size, size_t offset)
* Programmer: Robb Matzke
* Thursday, May 14, 1998
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
int
diff --git a/tools/test/perform/overhead.c b/tools/test/perform/overhead.c
index 69a8251..257d3ec 100644
--- a/tools/test/perform/overhead.c
+++ b/tools/test/perform/overhead.c
@@ -62,8 +62,6 @@ typedef enum fill_t { FILL_ALL, FILL_FORWARD, FILL_REVERSE, FILL_INWARD, FILL_OU
* Programmer: Robb Matzke
* Wednesday, September 30, 1998
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
static void
@@ -111,8 +109,6 @@ usage(const char *prog)
* Programmer: Robb Matzke
* Thursday, June 4, 1998
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
static void
@@ -135,8 +131,6 @@ cleanup(void)
* Programmer: Robb Matzke
* Wednesday, March 4, 1998
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
static herr_t
@@ -160,8 +154,6 @@ display_error_cb(hid_t estack, void H5_ATTR_UNUSED *client_data)
* Programmer: Robb Matzke
* Wednesday, September 30, 1998
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
static int
@@ -333,8 +325,6 @@ error:
* Programmer: Robb Matzke
* Monday, September 28, 1998
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
int
diff --git a/tools/test/perform/perf_meta.c b/tools/test/perform/perf_meta.c
index 94fe849..6e62f6a 100644
--- a/tools/test/perform/perf_meta.c
+++ b/tools/test/perform/perf_meta.c
@@ -68,13 +68,11 @@ void print_perf(p_time, p_time, p_time);
/*-------------------------------------------------------------------------
* Function: parse_options
*
- Purpose: Parse command line options
+ * Purpose: Parse command line options
*
* Programmer: Raymond Lu
* Friday, Oct 3, 2003
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
static int
@@ -188,13 +186,11 @@ parse_options(int argc, char **argv)
/*-------------------------------------------------------------------------
* Function: usage
*
- Purpose: Prints help page
+ * Purpose: Prints help page
*
* Programmer: Raymond Lu
* Friday, Oct 3, 2003
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
static void
@@ -248,8 +244,6 @@ usage(void)
* Programmer: Raymond Lu
* Friday, Oct 3, 2003
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
static herr_t
@@ -288,8 +282,6 @@ error:
* Programmer: Raymond Lu
* Friday, Oct 3, 2003
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
static herr_t
@@ -330,8 +322,6 @@ error:
* Programmer: Raymond Lu
* Friday, Oct 3, 2003
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
static herr_t
@@ -435,8 +425,6 @@ error:
* Programmer: Raymond Lu
* Friday, Oct 3, 2003
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
static herr_t
@@ -538,8 +526,6 @@ error:
* Programmer: Raymond Lu
* Friday, Oct 3, 2003
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
static herr_t
@@ -644,8 +630,6 @@ error:
* Programmer: Raymond Lu
* Friday, Oct 3, 2003
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
double
@@ -674,8 +658,6 @@ retrieve_time(void)
* Programmer: Raymond Lu
* Friday, Oct 3, 2003
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
void
@@ -728,8 +710,6 @@ perf(p_time *perf_t, double start_t, double end_t)
* Programmer: Raymond Lu
* Friday, Oct 3, 2003
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
void
@@ -756,8 +736,6 @@ print_perf(p_time open_t, p_time close_t, p_time attr_t)
* Programmer: Raymond Lu
* Friday, Oct 3, 2003
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
int
diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c
index 1265c30..256289c 100644
--- a/tools/test/perform/zip_perf.c
+++ b/tools/test/perform/zip_perf.c
@@ -77,7 +77,6 @@ static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'},
* Function: error
* Purpose: Display error message and exit.
* Programmer: Bill Wendling, 05. June 2002
- * Modifications:
*/
static void
error(const char *fmt, ...)
@@ -99,7 +98,6 @@ error(const char *fmt, ...)
* Purpose: Cleanup the output file.
* Returns: Nothing
* Programmer: Bill Wendling, 06. June 2002
- * Modifications:
*/
static void
cleanup(void)
@@ -164,7 +162,6 @@ write_file(Bytef *source, uLongf sourceLen)
* Z_BUF_ERROR - not enough room in the output buffer
* Z_STREAM_ERROR - level parameter is invalid
* Programmer: Bill Wendling, 05. June 2002
- * Modifications:
*/
static void
compress_buffer(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen)
@@ -192,33 +189,12 @@ compress_buffer(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceL
}
}
-#ifdef LATER
-/*
- * Function: uncompress_buffer
- * Purpose: Uncompress the buffer.
- * Returns: Z_OK - success
- * Z_MEM_ERROR - not enough memory
- * Z_BUF_ERROR - not enough room in the output buffer
- * Z_DATA_ERROR - the input data was corrupted
- * Programmer: Bill Wendling, 05. June 2002
- * Modifications:
- */
-static int
-uncompress_buffer(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen)
-{
- int rc = uncompress(dest, destLen, source, sourceLen);
-
- return rc;
-}
-#endif /* LATER */
-
/*
* Function: get_unique_name
* Purpose: Create a new file who's name doesn't conflict with
* pre-existing files.
* Returns: Nothing
* Programmer: Bill Wendling, 06. June 2002
- * Modifications:
*/
#define ZIP_PERF_FILE "zip_perf.data"
static void
@@ -255,7 +231,6 @@ get_unique_name(void)
* Purpose: Print a usage message and then exit.
* Return: Nothing
* Programmer: Bill Wendling, 05. June 2002
- * Modifications:
*/
static void
usage(void)
@@ -298,7 +273,6 @@ usage(void)
* If an unknown size indicator is used, then the program will
* exit with EXIT_FAILURE as the return value.
* Programmer: Bill Wendling, 05. June 2002
- * Modifications:
*/
static unsigned long
parse_size_directive(const char *size)
@@ -487,7 +461,6 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, unsigned long
* Purpose: Run the program
* Return: EXIT_SUCCESS or EXIT_FAILURE
* Programmer: Bill Wendling, 05. June 2002
- * Modifications:
*/
int
main(int argc, char *argv[])
@@ -575,7 +548,6 @@ main(int argc, char *argv[])
* zlib stuff.
* Return: EXIT_SUCCESS
* Programmer: Bill Wendling, 10. June 2002
- * Modifications:
*/
int
main(void)