NNSA Tri-Labs TRILAB-98: Taking out a few more test cases.

This commit is contained in:
Songyu Lu 2019-01-08 12:45:01 -06:00
parent 75c105a2a4
commit 2efc28cf63
2 changed files with 25 additions and 13 deletions

View File

@ -2960,10 +2960,10 @@ else
fi fi
## ---------------------------------------------------------------------- ## ----------------------------------------------------------------------
## Set the flag to indicate that the machine is power9 and cannot ## Set the flag to indicate that the machine is IBM ppc64le and cannot
## accurately convert some long double values. ## accurately convert some long double values.
## ##
AC_MSG_CHECKING([if the system is power9 and cannot correctly convert some long double values]) AC_MSG_CHECKING([if the system is IBM ppc64le and cannot correctly convert some long double values])
TEST_SRC="`(echo \"#define H5_DISABLE_SOME_LDOUBLE_CONV_TEST 1\"; cat $srcdir/config/cmake/ConversionTests.c)`" TEST_SRC="`(echo \"#define H5_DISABLE_SOME_LDOUBLE_CONV_TEST 1\"; cat $srcdir/config/cmake/ConversionTests.c)`"
@ -2977,7 +2977,7 @@ fi
if test ${hdf5_cv_disable_some_ldouble_conv} = "yes"; then if test ${hdf5_cv_disable_some_ldouble_conv} = "yes"; then
AC_DEFINE([DISABLE_SOME_LDOUBLE_CONV], [1], AC_DEFINE([DISABLE_SOME_LDOUBLE_CONV], [1],
[Define if your system is power9 and cannot convert some long double values correctly.]) [Define if your system is IBM ppc64le and cannot convert some long double values correctly.])
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])

View File

@ -4905,7 +4905,7 @@ run_fp_tests(const char *name)
printf("%-70s", str); printf("%-70s", str);
SKIPPED(); SKIPPED();
#if H5_SIZEOF_LONG_DOUBLE!=0 #if H5_SIZEOF_LONG_DOUBLE!=0
HDputs(" Test skipped due to the conversion problem on IBM Power9 cpu."); HDputs(" Test skipped due to the conversion problem on IBM ppc64le cpu.");
#else #else
HDputs(" Test skipped due to disabled long double."); HDputs(" Test skipped due to disabled long double.");
#endif #endif
@ -5095,32 +5095,44 @@ run_fp_int_conv(const char *name)
#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE #if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE
if(test_values != TEST_SPECIAL) { if(test_values != TEST_SPECIAL) {
nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_SCHAR); nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_SCHAR);
nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_UCHAR);
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);
nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_UINT);
} else { } else {
#ifndef H5_DISABLE_SOME_LDOUBLE_CONV #ifndef H5_DISABLE_SOME_LDOUBLE_CONV
nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_SCHAR); nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_SCHAR);
nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_UCHAR);
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);
nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_UINT);
#else #else
char str[256]; /*string */ char str[256]; /*string */
HDsnprintf(str, sizeof(str), "Testing %s special %s -> %s conversions", HDsnprintf(str, sizeof(str), "Testing %s special %s -> %s conversions",
name, "long double", "signed char"); name, "long double", "signed and unsigned char, short, int, long");
printf("%-70s", str); printf("%-70s", str);
SKIPPED(); SKIPPED();
#if H5_SIZEOF_LONG_DOUBLE!=0 #if H5_SIZEOF_LONG_DOUBLE!=0
HDputs(" Test skipped due to the conversion problem on IBM Power9 cpu."); HDputs(" Test skipped due to the conversion problem on IBM ppc64le cpu.");
#else #else
HDputs(" Test skipped due to disabled long double."); HDputs(" Test skipped due to disabled long double.");
#endif #endif
#endif #endif
} }
nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_UCHAR);
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);
nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_UINT);
#if H5_SIZEOF_LONG!=H5_SIZEOF_INT && H5_SIZEOF_LONG_DOUBLE!=0 #if H5_SIZEOF_LONG!=H5_SIZEOF_INT && H5_SIZEOF_LONG_DOUBLE!=0
#ifndef H5_LDOUBLE_TO_LONG_SPECIAL #ifndef H5_LDOUBLE_TO_LONG_SPECIAL
nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_LONG); if(test_values != TEST_SPECIAL) {
nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_ULONG); nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_LONG);
nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_ULONG);
} else {
#ifndef H5_DISABLE_SOME_LDOUBLE_CONV
nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_LONG);
nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_ULONG);
#endif
}
#else #else
{ {
char str[256]; /*string */ char str[256]; /*string */