summaryrefslogtreecommitdiffstats
path: root/tools/test/h5diff
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-01-20 20:23:41 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-01-20 20:23:41 (GMT)
commitc3463d800d7eaf56b5da79d94af9b153f58a512d (patch)
tree08a044fb8775025a18e56fc730cc17ecd0b8ad64 /tools/test/h5diff
parent95242bbd5ce97f48e94bab11e8f736a60c0f509b (diff)
downloadhdf5-c3463d800d7eaf56b5da79d94af9b153f58a512d.zip
hdf5-c3463d800d7eaf56b5da79d94af9b153f58a512d.tar.gz
hdf5-c3463d800d7eaf56b5da79d94af9b153f58a512d.tar.bz2
HDFFV-10118 fixed plugin tests for tools
Diffstat (limited to 'tools/test/h5diff')
-rw-r--r--tools/test/h5diff/dynlib_diff.c57
-rw-r--r--tools/test/h5diff/testfiles/h5diff_ud.txt4
-rw-r--r--tools/test/h5diff/testfiles/h5diff_udfail.txt6
-rw-r--r--tools/test/h5diff/testfiles/tudfilter.h5bin4816 -> 4816 bytes
-rw-r--r--tools/test/h5diff/testfiles/tudfilter2.h5bin4816 -> 4816 bytes
5 files changed, 32 insertions, 35 deletions
diff --git a/tools/test/h5diff/dynlib_diff.c b/tools/test/h5diff/dynlib_diff.c
index 0d8be2b..d80777d 100644
--- a/tools/test/h5diff/dynlib_diff.c
+++ b/tools/test/h5diff/dynlib_diff.c
@@ -12,59 +12,52 @@
* to either file, you may request a copy from help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
- * Programmer: Raymond Lu
- * 13 February 2013
- *
- * Purpose: Tests the plugin module (H5PL)
+ * Purpose: Tests the plugin module (H5PL)
*/
#include <stdlib.h>
#include <stdio.h>
#include "H5PLextern.h"
-#define H5Z_FILTER_DYNLIB2 258
+#define H5Z_FILTER_DYNLIBUD 300
#define MULTIPLIER 3
-static size_t H5Z_filter_dynlib2(unsigned int flags, size_t cd_nelmts,
+static size_t H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
/* This message derives from H5Z */
-const H5Z_class2_t H5Z_DYNLIB2[1] = {{
+const H5Z_class2_t H5Z_DYNLIBUD[1] = {{
H5Z_CLASS_T_VERS, /* H5Z_class_t version */
- H5Z_FILTER_DYNLIB2, /* Filter id number */
+ H5Z_FILTER_DYNLIBUD, /* Filter id number */
1, 1, /* Encoding and decoding enabled */
- "dynlib2", /* Filter name for debugging */
+ "dynlibud", /* Filter name for debugging */
NULL, /* The "can apply" callback */
NULL, /* The "set local" callback */
- (H5Z_func_t)H5Z_filter_dynlib2, /* The actual filter function */
+ (H5Z_func_t)H5Z_filter_dynlibud, /* The actual filter function */
}};
H5PL_type_t H5PLget_plugin_type(void) {return H5PL_TYPE_FILTER;}
-const void *H5PLget_plugin_info(void) {return H5Z_DYNLIB2;}
+const void *H5PLget_plugin_info(void) {return H5Z_DYNLIBUD;}
/*-------------------------------------------------------------------------
- * Function: H5Z_filter_dynlib2
+ * Function: H5Z_filter_dynlibud
*
- * Purpose: A dynlib2 filter method that multiplies the original value
+ * Purpose: A dynlib2 filter method that multiplies the original value
* during write and divide the original value during read. It
- * will be built as a shared library. plugin.c test will load
- * and use this filter library.
- *
- * Return: Success: Data chunk size
- *
- * Failure: 0
+ * will be built as a shared library. plugin.c test will load
+ * and use this filter library.
*
- * Programmer: Raymond Lu
- * 29 March 2013
+ * Return: Success: Data chunk size
*
+ * Failure: 0
*-------------------------------------------------------------------------
*/
static size_t
-H5Z_filter_dynlib2(unsigned int flags, size_t cd_nelmts,
+H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
const unsigned int *cd_values, size_t nbytes,
size_t *buf_size, void **buf)
{
- int *int_ptr = (int *)*buf; /* Pointer to the data values */
+ char *int_ptr = (char *)*buf; /* Pointer to the data values */
size_t buf_left = *buf_size; /* Amount of data buffer left to process */
/* Check for the correct number of parameters */
@@ -75,20 +68,24 @@ H5Z_filter_dynlib2(unsigned int flags, size_t cd_nelmts,
cd_values = cd_values;
if(flags & H5Z_FLAG_REVERSE) { /*read*/
- /* Divide the original value with MULTIPLIER */
+ /* Subtract the original value with MULTIPLIER */
while(buf_left > 0) {
- *int_ptr++ /= MULTIPLIER;
- buf_left -= sizeof(int);
+ char temp = *int_ptr;
+ *int_ptr = temp - MULTIPLIER;
+ int_ptr++;
+ buf_left -= sizeof(*int_ptr);
} /* end while */
} /* end if */
else { /*write*/
- /* Multiply the original value with MULTIPLIER */
+ /* Add the original value with MULTIPLIER */
while(buf_left > 0) {
- *int_ptr++ *= MULTIPLIER;
- buf_left -= sizeof(int);
+ char temp = *int_ptr;
+ *int_ptr = temp + MULTIPLIER;
+ int_ptr++;
+ buf_left -= sizeof(*int_ptr);
} /* end while */
} /* end else */
return nbytes;
-} /* end H5Z_filter_dynlib2() */
+} /* end H5Z_filter_dynlibud() */
diff --git a/tools/test/h5diff/testfiles/h5diff_ud.txt b/tools/test/h5diff/testfiles/h5diff_ud.txt
index 7c9bb5e..ddda3ff 100644
--- a/tools/test/h5diff/testfiles/h5diff_ud.txt
+++ b/tools/test/h5diff/testfiles/h5diff_ud.txt
@@ -2,10 +2,10 @@
file1 file2
---------------------------------------
x x /
- x x /dynlib2
+ x x /dynlibud
group : </> and </>
0 differences found
-dataset: </dynlib2> and </dynlib2>
+dataset: </dynlibud> and </dynlibud>
0 differences found
EXIT CODE: 0
diff --git a/tools/test/h5diff/testfiles/h5diff_udfail.txt b/tools/test/h5diff/testfiles/h5diff_udfail.txt
index 7eb1155..c154c6b 100644
--- a/tools/test/h5diff/testfiles/h5diff_udfail.txt
+++ b/tools/test/h5diff/testfiles/h5diff_udfail.txt
@@ -2,11 +2,11 @@
file1 file2
---------------------------------------
x x /
- x x /dynlib2
+ x x /dynlibud
group : </> and </>
0 differences found
-dataset: </dynlib2> and </dynlib2>
+dataset: </dynlibud> and </dynlibud>
0 differences found
-warning: dataset </dynlib2> cannot be read, user defined filter is not available
+warning: dataset </dynlibud> cannot be read, user defined filter is not available
EXIT CODE: 2
diff --git a/tools/test/h5diff/testfiles/tudfilter.h5 b/tools/test/h5diff/testfiles/tudfilter.h5
index eaf6a43..081b000 100644
--- a/tools/test/h5diff/testfiles/tudfilter.h5
+++ b/tools/test/h5diff/testfiles/tudfilter.h5
Binary files differ
diff --git a/tools/test/h5diff/testfiles/tudfilter2.h5 b/tools/test/h5diff/testfiles/tudfilter2.h5
index eaf6a43..081b000 100644
--- a/tools/test/h5diff/testfiles/tudfilter2.h5
+++ b/tools/test/h5diff/testfiles/tudfilter2.h5
Binary files differ