diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2012-09-06 16:10:52 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2012-09-06 16:10:52 (GMT) |
| commit | 78b07da7aea98598a74bce25335b9435aa29cdb9 (patch) | |
| tree | e693a242b671d9c3a22d21d3f1e3aed528efb1e1 | |
| parent | 9ce6dadd4848ad1371d32f99d320efa87de32050 (diff) | |
| download | hdf5-78b07da7aea98598a74bce25335b9435aa29cdb9.zip hdf5-78b07da7aea98598a74bce25335b9435aa29cdb9.tar.gz hdf5-78b07da7aea98598a74bce25335b9435aa29cdb9.tar.bz2 | |
[svn-r22742] ported revisions 22738 to 22741 from the trunk
| -rw-r--r-- | testpar/t_dset.c | 12 | ||||
| -rw-r--r-- | tools/h5import/h5importtestutil.sh.in | 2 |
2 files changed, 5 insertions, 9 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 diff --git a/tools/h5import/h5importtestutil.sh.in b/tools/h5import/h5importtestutil.sh.in index ba0743b..fd21dc1 100644 --- a/tools/h5import/h5importtestutil.sh.in +++ b/tools/h5import/h5importtestutil.sh.in @@ -331,7 +331,7 @@ TOOLTEST2 "/int/buin/32-bit" binuin32.h5 TESTING "STR" TOOLTEST $TESTDIR/txtstr.txt -c $TESTDIR/txtstr.conf -o txtstr.h5 TESTING "H5DUMP-STR" -TOOLTEST43 "/mytext/data" txtstr.h5 +TOOLTEST4 "/mytext/data" txtstr.h5 TESTING "BINARY I8 CR LF EOF" |