diff options
| author | Leon Arber <larber@ncsa.uiuc.edu> | 2005-04-25 19:33:44 (GMT) |
|---|---|---|
| committer | Leon Arber <larber@ncsa.uiuc.edu> | 2005-04-25 19:33:44 (GMT) |
| commit | 12088553352465908be0d5e4981a9503e78e4026 (patch) | |
| tree | cdb4364c481da4dba7f87f654c9202e2337e71eb | |
| parent | b3c8b2f846cc16b45a61783ca6b9d3247f8ed61c (diff) | |
| download | hdf5-12088553352465908be0d5e4981a9503e78e4026.zip hdf5-12088553352465908be0d5e4981a9503e78e4026.tar.gz hdf5-12088553352465908be0d5e4981a9503e78e4026.tar.bz2 | |
[svn-r10660] Purpose:
bug fix (sorta)
Description:
Rename H5_LLONG_TO_FP_CAST_WORKS to H5_LLONG_TO_FP_CAST_BROKEN
Solution:
Since a test for H5_LLONG_TO_FP_CAST_WORKS is not present in the configure script,
the dtransform test would assume that this cast doesn't work and skip the test. Change the variable around
so that, by default, it is assumed a long long to double cast does work.
Platforms tested:
minor change: copper, sol
Misc. update:
| -rw-r--r-- | src/H5Ztrans.c | 2 | ||||
| -rw-r--r-- | test/dtransform.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c index 8858b63..d8e45cf 100644 --- a/src/H5Ztrans.c +++ b/src/H5Ztrans.c @@ -154,7 +154,7 @@ static void H5Z_print(H5Z_node *tree, FILE *stream); #define ULLONG_TO_FP_XFORM_TYPE_OP_ERROR #endif -#ifndef H5_LLONG_TO_FP_CAST_WORKS +#ifdef H5_LLONG_TO_FP_CAST_BROKEN #define LLONG_TO_FP_XFORM_TYPE_OP_ERROR HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Cannot convert from long long to double: required for data transform") #else #define LLONG_TO_FP_XFORM_TYPE_OP_ERROR diff --git a/test/dtransform.c b/test/dtransform.c index 8e77590..b3bce4f 100644 --- a/test/dtransform.c +++ b/test/dtransform.c @@ -247,14 +247,14 @@ int main(void) TEST_TYPE_CONTIG(dxpl_id_c_to_f, long, H5T_NATIVE_LONG, "long", windchillFfloat, 1); TEST_TYPE_CONTIG(dxpl_id_utrans_inv, unsigned long, H5T_NATIVE_ULONG, "ulong", transformData, 0); -#ifdef H5_LLONG_TO_FP_CAST_WORKS +#ifndef H5_LLONG_TO_FP_CAST_BROKEN TEST_TYPE_CONTIG(dxpl_id_c_to_f, long_long, H5T_NATIVE_LLONG, "llong", windchillFfloat, 1); #else TESTING("contiguous, with type conversion (float->llong)") SKIPPED() #endif -#ifdef H5_ULLONG_TO_FP_CAST_WORKS +#ifndef H5_LLONG_TO_FP_CAST_BROKEN TEST_TYPE_CONTIG(dxpl_id_utrans_inv, unsigned long_long, H5T_NATIVE_ULLONG, "ullong", transformData, 0); #else TESTING("contiguous, with type conversion (float->ullong)") @@ -273,14 +273,14 @@ int main(void) TEST_TYPE_CHUNK(dxpl_id_utrans_inv, unsigned int, H5T_NATIVE_UINT, "uint", transformData, 0); TEST_TYPE_CHUNK(dxpl_id_c_to_f, long, H5T_NATIVE_LONG, "long", windchillFfloat, 1); TEST_TYPE_CHUNK(dxpl_id_utrans_inv, unsigned long, H5T_NATIVE_ULONG, "ulong", transformData, 0); -#ifdef H5_LLONG_TO_FP_CAST_WORKS +#ifndef H5_LLONG_TO_FP_CAST_BROKEN TEST_TYPE_CHUNK(dxpl_id_c_to_f, long_long, H5T_NATIVE_LLONG, "llong", windchillFfloat, 1); #else TESTING("chunked, with type conversion (float->llong)") SKIPPED() #endif -#ifdef H5_ULLONG_TO_FP_CAST_WORKS +#ifndef H5_LLONG_TO_FP_CAST_BROKEN TEST_TYPE_CHUNK(dxpl_id_utrans_inv, unsigned long_long, H5T_NATIVE_ULLONG, "ullong", transformData, 0); #else TESTING("chunked, with type conversion (float->ullong)") |