From 394f5403a0f257933cd6859ef34337a5075de6e6 Mon Sep 17 00:00:00 2001 From: Jonathan Kim Date: Wed, 5 Sep 2012 14:15:52 -0500 Subject: [svn-r22741] Purpose: HDFFV-8143 Provide a routine(s) for telling the user why the library broke collective data access Description: Daily test failed from the previous commit r22735. (koala , ember) Fixed failure due to not be able to read external-storage file from external test. Tested: jam (linux32-LE), koala-pp (linux64-LE) --- testpar/t_dset.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/testpar/t_dset.c b/testpar/t_dset.c index eac92a1..d9139d3 100644 --- a/testpar/t_dset.c +++ b/testpar/t_dset.c @@ -3373,8 +3373,6 @@ test_no_collective_cause_mode(int selection_mode) ret = H5Pget_mpio_no_collective_cause (dxpl_write, &no_collective_cause_local_write, &no_collective_cause_global_write); VRFY((ret >= 0), "retriving no collective cause succeeded" ); - /* Wait for file to be written */ - MPI_Barrier(MPI_COMM_WORLD); /*--------------------- * Test Read access @@ -3413,10 +3411,6 @@ test_no_collective_cause_mode(int selection_mode) } - /* clean up external file */ - if (selection_mode & TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_EXTERNAL) - HDremove(FILE_EXTERNAL); - /* Release some resources */ if (sid) H5Sclose(sid); @@ -3438,6 +3432,10 @@ test_no_collective_cause_mode(int selection_mode) H5Fclose(fid); HDfree(buffer); + /* clean up external file */ + if (selection_mode & TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_EXTERNAL) + HDremove(FILE_EXTERNAL); + return; } @@ -3626,8 +3624,6 @@ test_no_collective_cause_mode_filter(int selection_mode) if (fid) H5Fclose(fid); - /* Wait for file to be written */ - MPI_Barrier(MPI_COMM_WORLD); /*--------------------- * Test Read access -- cgit v0.12