mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-30 15:32:37 +08:00
[svn-r9298] Purpose:
Bug fix. Description: the Data transformation code that failed when a data transform property for simple expression is fixed. Turned the tests back on. Platforms tested: Tested in copper (pp) where the failure appeared. Also in eirene as double check. No h5committest as the change is trivial.
This commit is contained in:
parent
9d9621ef0c
commit
0a69acf992
@ -79,9 +79,7 @@ int main(void)
|
|||||||
|
|
||||||
if((err= H5Pset_data_transform(dxpl_id_f_to_c, f_to_c))<0) TEST_ERROR;
|
if((err= H5Pset_data_transform(dxpl_id_f_to_c, f_to_c))<0) TEST_ERROR;
|
||||||
if((err= H5Pset_data_transform(dxpl_id_c_to_f, c_to_f))<0) TEST_ERROR;
|
if((err= H5Pset_data_transform(dxpl_id_c_to_f, c_to_f))<0) TEST_ERROR;
|
||||||
/* Temporary disabled. AKC
|
|
||||||
if((err = H5Pset_data_transform(dxpl_id_simple, simple))<0) TEST_ERROR;
|
if((err = H5Pset_data_transform(dxpl_id_simple, simple))<0) TEST_ERROR;
|
||||||
*/
|
|
||||||
if((err = H5Pset_data_transform(dxpl_id_polynomial, polynomial))<0) TEST_ERROR;
|
if((err = H5Pset_data_transform(dxpl_id_polynomial, polynomial))<0) TEST_ERROR;
|
||||||
if((dxpl_id_polynomial_copy = H5Pcopy(dxpl_id_polynomial)) < 0) TEST_ERROR;
|
if((dxpl_id_polynomial_copy = H5Pcopy(dxpl_id_polynomial)) < 0) TEST_ERROR;
|
||||||
if((dxpl_id_c_to_f_copy = H5Pcopy(dxpl_id_c_to_f)) < 0) TEST_ERROR;
|
if((dxpl_id_c_to_f_copy = H5Pcopy(dxpl_id_c_to_f)) < 0) TEST_ERROR;
|
||||||
@ -198,8 +196,6 @@ int main(void)
|
|||||||
|
|
||||||
|
|
||||||
TESTING("data transform, trivial transform, without type conversion")
|
TESTING("data transform, trivial transform, without type conversion")
|
||||||
#if 0
|
|
||||||
/* temporary disabled. AKC */
|
|
||||||
if((err = H5Dread(dset_id_float, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, dxpl_id_simple, windchillFfloatread))<0) TEST_ERROR;
|
if((err = H5Dread(dset_id_float, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, dxpl_id_simple, windchillFfloatread))<0) TEST_ERROR;
|
||||||
for(row = 0; row<ROWS; row++)
|
for(row = 0; row<ROWS; row++)
|
||||||
{
|
{
|
||||||
@ -213,13 +209,8 @@ int main(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
PASSED();
|
PASSED();
|
||||||
#else
|
|
||||||
SKIPPED();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
TESTING("data transform, trivial transform, with type conversion")
|
TESTING("data transform, trivial transform, with type conversion")
|
||||||
#if 0
|
|
||||||
/* temporary disabled. AKC */
|
|
||||||
if((err = H5Dread(dset_id_float, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_simple, windchillFintread))<0) TEST_ERROR;
|
if((err = H5Dread(dset_id_float, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_simple, windchillFintread))<0) TEST_ERROR;
|
||||||
for(row = 0; row<ROWS; row++)
|
for(row = 0; row<ROWS; row++)
|
||||||
{
|
{
|
||||||
@ -233,9 +224,6 @@ int main(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
PASSED();
|
PASSED();
|
||||||
#else
|
|
||||||
SKIPPED();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Close the objects we opened/created */
|
/* Close the objects we opened/created */
|
||||||
|
Loading…
Reference in New Issue
Block a user