diff options
author | Albert Cheng <acheng@hdfgroup.org> | 2006-01-06 14:52:25 (GMT) |
---|---|---|
committer | Albert Cheng <acheng@hdfgroup.org> | 2006-01-06 14:52:25 (GMT) |
commit | 16ec39276000b6e06e12dba66bce52e4dba5be04 (patch) | |
tree | 4a430d1b70af9b47a7ace1a140b27a9e5a0ec42b /testpar | |
parent | 63e69411fd5b98927b969594db2a18301cd6b6bd (diff) | |
download | hdf5-16ec39276000b6e06e12dba66bce52e4dba5be04.zip hdf5-16ec39276000b6e06e12dba66bce52e4dba5be04.tar.gz hdf5-16ec39276000b6e06e12dba66bce52e4dba5be04.tar.bz2 |
[svn-r11866] Purpose:
bug fix 504
Description:
testpar/t_mpi would hang if $HDF5_NOCLEANUP is set. E.g.,
% env HDF5_NOCLEANUP=yes mpirun -np 3 ./t_mpi
This happened because the environment variables are not exported to all
mpi processes by the mpirun command. So, some attempted to do cleanup
while others don't and some hang waiting for others to act.
Solution:
Instead individual program checking getenv, they all just called h5_cleanup
no matter. h5_cleanup now uses getenv_all to check the $HDF5_NOCLEANUP if
it is in parallel mode.
Platforms tested:
h5committested, tested pp in heping too.
Diffstat (limited to 'testpar')
-rw-r--r-- | testpar/testphdf5.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c index a07ac4a..f607d8f 100644 --- a/testpar/testphdf5.c +++ b/testpar/testphdf5.c @@ -516,12 +516,8 @@ int main(int argc, char **argv) if (MAINPROCESS && GetTestSummary()) TestSummary(); - /* Clean up test files, if allowed */ - if (GetTestCleanup() && !getenv("HDF5_NOCLEANUP")) - h5_cleanup(FILENAME, fapl); - else - /* h5_cleanup would have closed fapl. Now must do it explicitedly */ - H5Pclose(fapl); + /* Clean up test files */ + h5_cleanup(FILENAME, fapl); nerrors += GetTestNumErrs(); |