summaryrefslogtreecommitdiffstats
path: root/tools/libtest
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2021-05-06 20:49:15 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2021-05-06 20:49:15 (GMT)
commit457b199a383865febbd52045b343b902ef383512 (patch)
tree45d0ffc5fffcb7b797a5858d9fab7237d4f025a7 /tools/libtest
parenta24428efb73ab4dacd8d66edbf0b93276c533cd4 (diff)
downloadhdf5-457b199a383865febbd52045b343b902ef383512.zip
hdf5-457b199a383865febbd52045b343b902ef383512.tar.gz
hdf5-457b199a383865febbd52045b343b902ef383512.tar.bz2
Brings much of the printf changes over from develop
Diffstat (limited to 'tools/libtest')
-rw-r--r--tools/libtest/h5tools_test_utils.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/libtest/h5tools_test_utils.c b/tools/libtest/h5tools_test_utils.c
index 05fce76..b27a399 100644
--- a/tools/libtest/h5tools_test_utils.c
+++ b/tools/libtest/h5tools_test_utils.c
@@ -69,6 +69,8 @@
*
*****************************************************************************/
+H5_GCC_DIAG_OFF("format")
+
/*----------------------------------------------------------------------------
*
* ifdef flag: JSVERIFY_EXP_ACT
@@ -1005,8 +1007,9 @@ test_set_configured_fapl(void)
* TEST-LOCAL VARIABLES *
************************/
- hid_t fapl_id = H5I_INVALID_HID;
- other_fa_t wrong_fa = {0x432, 0xf82, 0x9093};
+ hid_t fapl_id = H5I_INVALID_HID;
+ other_fa_t wrong_fa = {0x432, 0xf82, 0x9093};
+#ifdef H5_HAVE_ROS3_VFD
H5FD_ros3_fapl_t ros3_anon_fa = {1, FALSE, "", "", ""};
H5FD_ros3_fapl_t ros3_auth_fa = {
1, /* fapl version */
@@ -1015,6 +1018,8 @@ test_set_configured_fapl(void)
"12345677890abcdef", /* simulate access key ID */
"oiwnerwe9u0234nJw0-aoj+dsf", /* simulate secret key */
};
+#endif /* H5_HAVE_ROS3_VFD */
+#ifdef H5_HAVE_LIBHDFS
H5FD_hdfs_fapl_t hdfs_fa = {
1, /* fapl version */
"", /* namenode name */
@@ -1023,6 +1028,7 @@ test_set_configured_fapl(void)
"", /* user name */
2048, /* stream buffer size */
};
+#endif /* H5_HAVE_LIBHDFS */
unsigned n_cases = 7; /* number of common testcases */
testcase cases[] = {
{
@@ -1249,6 +1255,7 @@ error:
#undef UTIL_TEST_DEFAULT
#undef UTIL_TEST_CREATE
} /* test_set_configured_fapl */
+H5_GCC_DIAG_ON("format")
/*----------------------------------------------------------------------------
*