diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-27 22:12:22 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-27 22:12:22 (GMT) |
commit | 46f59e4fd4309862727dc72409476fdb76239961 (patch) | |
tree | 0ca5b5de357e9f632ee7a8fed9c31a761208b0dd /test/dt_arith.c | |
parent | fe01716dbc8443764542777d22b1252716293884 (diff) | |
download | hdf5-46f59e4fd4309862727dc72409476fdb76239961.zip hdf5-46f59e4fd4309862727dc72409476fdb76239961.tar.gz hdf5-46f59e4fd4309862727dc72409476fdb76239961.tar.bz2 |
[svn-r26630] Description:
Bring r26595 from trunk to 1.8 branch:
Bring r26494 from autotools_rework branch back to trunk:
Remove the LDOUBLE_TO_UINT_ACCURATE macro/define, it was addressing
problems with older Intel compilers on Linux that are no longer supported.
Tested on:
Linux/32 2.6.18 (jam) w/serial & parallel
(Daily tested on trunk for 2+ days)
Diffstat (limited to 'test/dt_arith.c')
-rw-r--r-- | test/dt_arith.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/test/dt_arith.c b/test/dt_arith.c index 110c996..3b98a2e 100644 --- a/test/dt_arith.c +++ b/test/dt_arith.c @@ -5307,23 +5307,7 @@ run_fp_int_conv(const char *name) nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_SHORT); nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_USHORT); nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_INT); -#if H5_LDOUBLE_TO_UINT_ACCURATE nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_UINT); -#else /*H5_LDOUBLE_TO_UINT_ACCURATE*/ - { - char str[256]; /*string */ - - HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", - name, "long double", "unsigned int"); - printf("%-70s", str); - SKIPPED(); -#if H5_SIZEOF_LONG_DOUBLE!=0 - HDputs(" Test skipped due to hardware conversion error."); -#else - HDputs(" Test skipped due to disabled long double."); -#endif - } -#endif /*H5_LDOUBLE_TO_UINT_ACCURATE*/ #if H5_SIZEOF_LONG!=H5_SIZEOF_INT && H5_SIZEOF_LONG_DOUBLE!=0 #ifndef H5_LDOUBLE_TO_LONG_SPECIAL nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_LONG); |