diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2020-09-30 12:22:30 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2020-09-30 12:22:30 (GMT) |
commit | ff9f228949643dd2efd6680e8d5ab616047ed70e (patch) | |
tree | 7bbe2f15ec2abb37cbce3706725d5cec12212615 /tools | |
parent | 5cc0a92c8d6983268404fe3f14294b67c5c3513d (diff) | |
download | hdf5-ff9f228949643dd2efd6680e8d5ab616047ed70e.zip hdf5-ff9f228949643dd2efd6680e8d5ab616047ed70e.tar.gz hdf5-ff9f228949643dd2efd6680e8d5ab616047ed70e.tar.bz2 |
warning format fixes and define name from develop
Diffstat (limited to 'tools')
-rw-r--r-- | tools/libtest/h5tools_test_utils.c | 2 | ||||
-rw-r--r-- | tools/src/h5diff/h5diff_common.c | 6 | ||||
-rw-r--r-- | tools/test/h5diff/CMakeTests.cmake | 2 | ||||
-rw-r--r-- | tools/test/h5diff/testh5diff.sh.in | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/tools/libtest/h5tools_test_utils.c b/tools/libtest/h5tools_test_utils.c index 244fd43..95eaf9c 100644 --- a/tools/libtest/h5tools_test_utils.c +++ b/tools/libtest/h5tools_test_utils.c @@ -69,6 +69,7 @@ * *****************************************************************************/ +H5_GCC_DIAG_OFF("format") /*---------------------------------------------------------------------------- * @@ -1225,6 +1226,7 @@ error : #undef UTIL_TEST_DEFAULT #undef UTIL_TEST_CREATE } /* test_set_configured_fapl */ +H5_GCC_DIAG_ON("format") /*---------------------------------------------------------------------------- diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c index 8ed2d37..b51ab0d 100644 --- a/tools/src/h5diff/h5diff_common.c +++ b/tools/src/h5diff/h5diff_common.c @@ -75,7 +75,7 @@ static void check_options(diff_opt_t* opts) } } -#if TRILABS-227 +#if TRILABS_227 /*------------------------------------------------------------------------- * Function: parse_hsize_list * @@ -478,10 +478,10 @@ void parse_command_line(int argc, const char* argv[], const char** fname1, const H5TOOLS_DEBUG("objname2 = %s", *objname2); /* - * TRILABS-227 is complete except for an issue with printing indices + * TRILABS_227 is complete except for an issue with printing indices * the following calls will enable subsetting */ -#if TRILABS-227 +#if TRILABS_227 opts->sset[0] = parse_subset_params(*objname1); opts->sset[1] = parse_subset_params(*objname2); diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake index 4e8e8d1..4e5ce5c 100644 --- a/tools/test/h5diff/CMakeTests.cmake +++ b/tools/test/h5diff/CMakeTests.cmake @@ -1549,7 +1549,7 @@ ADD_H5_TEST (h5diff_801 1 -v ${FILE7} ${FILE8A} /g1/array /g1/array) # ############################################################################## # # dataset subsets # ############################################################################## -#TRILABS-227 ADD_H5_TEST (h5diff_830 1 --enable-error-stack -v ${FILE7} ${FILE8} /g1/array3D[0,0,0;2,2,1;2,2,2;] /g1/array3D[0,0,0;2,2,1;2,2,2;]) +#TRILABS_227 ADD_H5_TEST (h5diff_830 1 --enable-error-stack -v ${FILE7} ${FILE8} /g1/array3D[0,0,0;2,2,1;2,2,2;] /g1/array3D[0,0,0;2,2,1;2,2,2;]) # ############################################################################## # # VDS tests diff --git a/tools/test/h5diff/testh5diff.sh.in b/tools/test/h5diff/testh5diff.sh.in index 587c340..bbee564 100644 --- a/tools/test/h5diff/testh5diff.sh.in +++ b/tools/test/h5diff/testh5diff.sh.in @@ -1205,7 +1205,7 @@ TOOLTEST h5diff_801.txt -v h5diff_dset1.h5 h5diff_dset3.h5 /g1/array /g1/array # ############################################################################## # # dataset subsets # ############################################################################## -#TRILABS-227 TOOLTEST h5diff_830.txt --enable-error-stack -v h5diff_dset1.h5 h5diff_dset2.h5 /g1/array3D[0,0,0;2,2,1;2,2,2;] /g1/array3D[0,0,0;2,2,1;2,2,2;] +#TRILABS_227 TOOLTEST h5diff_830.txt --enable-error-stack -v h5diff_dset1.h5 h5diff_dset2.h5 /g1/array3D[0,0,0;2,2,1;2,2,2;] /g1/array3D[0,0,0;2,2,1;2,2,2;] # ############################################################################## # VDS tests |