diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-28 01:14:40 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-28 01:14:40 (GMT) |
| commit | 87db75e2e6f88b3dfdaf1c8758a1dbb2396d9105 (patch) | |
| tree | ce973d47b7507730bd60ccbe27f01ab7d639572b /test | |
| parent | 03f3e620bbea7dd1474c42150d05817f14d23783 (diff) | |
| download | hdf5-87db75e2e6f88b3dfdaf1c8758a1dbb2396d9105.zip hdf5-87db75e2e6f88b3dfdaf1c8758a1dbb2396d9105.tar.gz hdf5-87db75e2e6f88b3dfdaf1c8758a1dbb2396d9105.tar.bz2 | |
[svn-r26637] Description:
Bring r26597 from trunk to 1.8 branch:
Bring r26500 from autotools_rework branch to trunk:
Remove the LLONG_TO_FP_CAST_WORKS macro/define, as it targets problems with
the Visual Studio 6 compilers.
Tested on:
Linux/32 2.6.18 (jam) w/serial & parallel
(Daily tested on trunk for 2+ days)
Diffstat (limited to 'test')
| -rw-r--r-- | test/dtransform.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/test/dtransform.c b/test/dtransform.c index aa6ae6e..4adbaf5 100644 --- a/test/dtransform.c +++ b/test/dtransform.c @@ -297,19 +297,7 @@ int main(void) TEST_TYPE_CONTIG(dxpl_id_utrans_inv, unsigned int, H5T_NATIVE_UINT, "uint", transformData, 0); 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); - -#ifndef H5_VMS -#ifdef H5_LLONG_TO_FP_CAST_WORKS 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 -#else /*H5_VMS*/ - TESTING("contiguous, with type conversion (float->llong): some problem in library's conversion") - SKIPPED() -#endif /*H5_VMS*/ - TEST_TYPE_CONTIG(dxpl_id_utrans_inv, unsigned long long, H5T_NATIVE_ULLONG, "ullong", transformData, 0); TEST_TYPE_CONTIG(dxpl_id_c_to_f, float, H5T_NATIVE_FLOAT, "float", windchillFfloat, 1); TEST_TYPE_CONTIG(dxpl_id_c_to_f, double, H5T_NATIVE_DOUBLE, "double", windchillFfloat, 1); @@ -326,13 +314,7 @@ 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 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 - TEST_TYPE_CHUNK(dxpl_id_utrans_inv, unsigned long long, H5T_NATIVE_ULLONG, "ullong", transformData, 0); TEST_TYPE_CHUNK(dxpl_id_c_to_f, float, H5T_NATIVE_FLOAT, "float", windchillFfloat, 1); TEST_TYPE_CHUNK(dxpl_id_c_to_f, double, H5T_NATIVE_DOUBLE, "double", windchillFfloat, 1); |