mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-01 16:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2716 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

Browse Source 
* commit '6a1cf090c6a2f970084c714a2f75a31d68a0a6a8':
  Correct reference file
  Correct h5diff filenames
This commit is contained in:
Allen Byrne 2020-07-29 15:40:05 -05:00
commit 2ece66e999
9 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MANIFEST
View File

@ -2400,8 +2400,6 @@
#test files for h5diff
./tools/test/h5diff/testfiles/diff_eps1.txt
./tools/test/h5diff/testfiles/diff_eps2.txt
./tools/test/h5diff/testfiles/h5diff_10.txt
./tools/test/h5diff/testfiles/h5diff_11.txt
./tools/test/h5diff/testfiles/h5diff_12.txt
@ -2609,6 +2607,8 @@
./tools/test/h5diff/testfiles/h5diff_dset3.h5
./tools/test/h5diff/testfiles/h5diff_dtypes.h5
./tools/test/h5diff/testfiles/h5diff_empty.h5
./tools/test/h5diff/testfiles/h5diff_eps1.h5
./tools/test/h5diff/testfiles/h5diff_eps2.h5
./tools/test/h5diff/testfiles/h5diff_hyper1.h5
./tools/test/h5diff/testfiles/h5diff_hyper2.h5
./tools/test/h5diff/testfiles/h5diff_types.h5
@ -2649,8 +2649,8 @@
./tools/test/h5diff/testfiles/h5diff_ud.txt
./tools/test/h5diff/testfiles/h5diff_udfail.err
./tools/test/h5diff/testfiles/h5diff_udfail.txt
./tools/test/h5diff/testfiles/diff_strings1.h5
./tools/test/h5diff/testfiles/diff_strings2.h5
./tools/test/h5diff/testfiles/h5diff_strings1.h5
./tools/test/h5diff/testfiles/h5diff_strings2.h5
./tools/test/h5diff/testfiles/h5diff_vlstr.txt
#vds
./tools/test/h5diff/testfiles/h5diff_v1.txt

16
tools/test/h5diff/CMakeTests.cmake
View File

@ -66,10 +66,10 @@
${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/diff_strings1.h5
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/diff_strings2.h5
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/diff_eps1.h5
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/diff_eps2.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
${HDF5_TOOLS_DIR}/testfiles/vds/1_a.h5
${HDF5_TOOLS_DIR}/testfiles/vds/1_b.h5
@ -542,11 +542,11 @@
set (ATTR_VERBOSE_LEVEL_FILE1 h5diff_attr_v_level1.h5)
set (ATTR_VERBOSE_LEVEL_FILE2 h5diff_attr_v_level2.h5)
# strings
set (STRINGS1 diff_strings1.h5)
set (STRINGS2 diff_strings2.h5)
set (STRINGS1 h5diff_strings1.h5)
set (STRINGS2 h5diff_strings2.h5)
# epsilon
set (EPS1 diff_eps1.h5)
set (EPS2 diff_eps2.h5)
set (EPS1 h5diff_eps1.h5)
set (EPS2 h5diff_eps2.h5)
# VDS tests
set (FILEV1 1_vds.h5)

8
tools/test/h5diff/h5diffgentest.c
View File

@ -94,11 +94,11 @@ size_t H5TOOLS_MALLOCSIZE = (128 * 1024 * 1024);
#define NON_COMPARBLES1 "non_comparables1.h5"
#define NON_COMPARBLES2 "non_comparables2.h5"
/* string dataset and attribute */
#define DIFF_STRINGS1 "diff_strings1.h5"
#define DIFF_STRINGS2 "diff_strings2.h5"
#define DIFF_STRINGS1 "h5diff_strings1.h5"
#define DIFF_STRINGS2 "h5diff_strings2.h5"
/* double dataset and epsilon */
#define DIFF_EPS1 "diff_eps1.h5"
#define DIFF_EPS2 "diff_eps2.h5"
#define DIFF_EPS1 "h5diff_eps1.h5"
#define DIFF_EPS2 "h5diff_eps2.h5"
#define UIMAX 4294967295u /*Maximum value for a variable of type unsigned int */
#define STR_SIZE 3

4
tools/test/h5diff/testfiles/h5diff_eps.txt
View File

@ -1,5 +1,5 @@
file1: diff_eps1.h5
file2: diff_eps2.h5
file1: h5diff_eps1.h5
file2: h5diff_eps2.h5
file1 file2
---------------------------------------

0
tools/test/h5diff/testfiles/diff_eps1.h5 → tools/test/h5diff/testfiles/h5diff_eps1.h5
View File

0
tools/test/h5diff/testfiles/diff_eps2.h5 → tools/test/h5diff/testfiles/h5diff_eps2.h5
View File

0
tools/test/h5diff/testfiles/diff_strings1.h5 → tools/test/h5diff/testfiles/h5diff_strings1.h5
View File

0
tools/test/h5diff/testfiles/diff_strings2.h5 → tools/test/h5diff/testfiles/h5diff_strings2.h5
View File

18
tools/test/h5diff/testh5diff.sh.in
View File

@ -120,10 +120,10 @@ $SRC_H5DIFF_TESTFILES/h5diff_attr_v_level2.h5
$SRC_H5DIFF_TESTFILES/h5diff_enum_invalid_values.h5
$SRC_H5DIFF_TESTFILES/non_comparables1.h5
$SRC_H5DIFF_TESTFILES/non_comparables2.h5
$SRC_H5DIFF_TESTFILES/diff_strings1.h5
$SRC_H5DIFF_TESTFILES/diff_strings2.h5
$SRC_H5DIFF_TESTFILES/diff_eps1.h5
$SRC_H5DIFF_TESTFILES/diff_eps2.h5
$SRC_H5DIFF_TESTFILES/h5diff_strings1.h5
$SRC_H5DIFF_TESTFILES/h5diff_strings2.h5
$SRC_H5DIFF_TESTFILES/h5diff_eps1.h5
$SRC_H5DIFF_TESTFILES/h5diff_eps2.h5
$SRC_TOOLS_TESTFILES/tvlstr.h5
"
@ -723,10 +723,10 @@ TOOLTEST h5diff_59.txt -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset11a dset11b
# Strings
# ( HDFFV-10128 )
TOOLTEST h5diff_60.txt -v diff_strings1.h5 diff_strings2.h5 string1 string1
TOOLTEST h5diff_61.txt -v diff_strings1.h5 diff_strings2.h5 string2 string2
TOOLTEST h5diff_62.txt -v diff_strings1.h5 diff_strings2.h5 string3 string3
TOOLTEST h5diff_63.txt -v diff_strings1.h5 diff_strings2.h5 string4 string4
TOOLTEST h5diff_60.txt -v h5diff_strings1.h5 h5diff_strings2.h5 string1 string1
TOOLTEST h5diff_61.txt -v h5diff_strings1.h5 h5diff_strings2.h5 string2 string2
TOOLTEST h5diff_62.txt -v h5diff_strings1.h5 h5diff_strings2.h5 string3 string3
TOOLTEST h5diff_63.txt -v h5diff_strings1.h5 h5diff_strings2.h5 string4 string4
# ##############################################################################
# # Error messages
@ -770,7 +770,7 @@ TOOLTEST h5diff_609.txt -d 200 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dse
TOOLTEST h5diff_610.txt -d 1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4
# eps: number smaller than epsilon
TOOLTEST h5diff_eps.txt -v3 -d 1e-16 diff_eps1.h5 diff_eps2.h5
TOOLTEST h5diff_eps.txt -v3 -d 1e-16 h5diff_eps1.h5 h5diff_eps2.h5
# ##############################################################################