summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2016-05-30 07:03:37 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2016-05-30 07:03:37 (GMT)
commitcc95ed32fd506e06093b70ff8db47f21309d693c (patch)
tree7ad64419dfeea7380156b53cabecdc052f7ea92e /test
parent8e5447a185442fa9a5e977fc5be5c95e0b1866db (diff)
downloadhdf5-cc95ed32fd506e06093b70ff8db47f21309d693c.zip
hdf5-cc95ed32fd506e06093b70ff8db47f21309d693c.tar.gz
hdf5-cc95ed32fd506e06093b70ff8db47f21309d693c.tar.bz2
[svn-r29978] Description:
Bring r29914 from revise_chunks branch to trunk: Banished -Wformat= warnings from the library, tools, and tests. Tested on: MacOSX/64 10.11.5 (amazon) w/serial, parallel & production (h5committest forthcoming)
Diffstat (limited to 'test')
-rw-r--r--test/dt_arith.c32
-rw-r--r--test/tconfig.c2
2 files changed, 17 insertions, 17 deletions
diff --git a/test/dt_arith.c b/test/dt_arith.c
index 76ad0f3..bd8babe 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -4507,10 +4507,10 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
printf(" %29lu\n", *((unsigned long*)hw));
break;
case INT_LLONG:
- printf(" %29"H5_PRINTF_LL_WIDTH"d\n", *((long long*)hw));
+ HDfprintf(stdout, " %29"H5_PRINTF_LL_WIDTH"d\n", *((long long*)hw));
break;
case INT_ULLONG:
- printf(" %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long long*)hw));
+ HDfprintf(stdout, " %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long long*)hw));
break;
case FLT_FLOAT:
printf(" %29f\n", (double)*((float*)hw));
@@ -5181,36 +5181,36 @@ main(void)
/* Do the tests */
/* Test H5Tcompiler_conv() for querying hard conversion. */
- nerrors += test_hard_query();
+ nerrors += (unsigned long)test_hard_query();
/* Test user-define, query functions and software conversion
* for user-defined floating-point types */
- nerrors += test_derived_flt();
+ nerrors += (unsigned long)test_derived_flt();
/* Test user-define, query functions and software conversion
* for user-defined integer types */
- nerrors += test_derived_integer();
+ nerrors += (unsigned long)test_derived_integer();
/* Does floating point overflow generate a SIGFPE? */
generates_sigfpe();
/* Test degenerate cases */
- nerrors += run_fp_tests("noop");
+ nerrors += (unsigned long)run_fp_tests("noop");
/* Test hardware floating-point conversion functions */
- nerrors += run_fp_tests("hard");
+ nerrors += (unsigned long)run_fp_tests("hard");
/* Test hardware integer conversion functions */
- nerrors += run_integer_tests("hard");
+ nerrors += (unsigned long)run_integer_tests("hard");
/* Test hardware integer-float conversion functions */
- nerrors += run_int_fp_conv("hard");
+ nerrors += (unsigned long)run_int_fp_conv("hard");
/* Test hardware float-integer conversion functions */
- nerrors += run_fp_int_conv("hard");
+ nerrors += (unsigned long)run_fp_int_conv("hard");
/* Test a few special values for hardware float-integer conversions */
- nerrors += test_particular_fp_integer();
+ nerrors += (unsigned long)test_particular_fp_integer();
/*----------------------------------------------------------------------
* Software tests
@@ -5224,17 +5224,17 @@ main(void)
reset_hdf5();
/* Test software floating-point conversion functions */
- nerrors += run_fp_tests("soft");
+ nerrors += (unsigned long)run_fp_tests("soft");
/* Test software integer conversion functions */
- nerrors += test_conv_int_2();
- nerrors += run_integer_tests("soft");
+ nerrors += (unsigned long)test_conv_int_2();
+ nerrors += (unsigned long)run_integer_tests("soft");
/* Test software float-integer conversion functions */
- nerrors += run_fp_int_conv("soft");
+ nerrors += (unsigned long)run_fp_int_conv("soft");
/* Test software integer-float conversion functions */
- nerrors += run_int_fp_conv("soft");
+ nerrors += (unsigned long)run_int_fp_conv("soft");
/* Restore the default error handler (set in h5_reset()) */
h5_restore_err();
diff --git a/test/tconfig.c b/test/tconfig.c
index 14c863e..6c1321a 100644
--- a/test/tconfig.c
+++ b/test/tconfig.c
@@ -43,7 +43,7 @@
#define vrfy_macrosize(type, macro, macroname) \
if (sizeof(type) != macro) \
TestErrPrintf("Error: sizeof(%s) is %d but %s is %d\n", \
- #type, sizeof(type), macroname, macro);
+ #type, (int)sizeof(type), macroname, (int)macro);
/* local routine prototypes */
void test_config_ctypes(void);