diff options
Diffstat (limited to 'testpar')
-rw-r--r-- | testpar/CMakeLists.txt | 2 | ||||
-rw-r--r-- | testpar/CMakeTests.cmake | 4 | ||||
-rw-r--r-- | testpar/t_mpi.c | 2 | ||||
-rw-r--r-- | testpar/t_pflush2.c | 4 | ||||
-rw-r--r-- | testpar/t_shapesame.c | 2 | ||||
-rw-r--r-- | testpar/testphdf5.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt index c88e3e8..5655bb0 100644 --- a/testpar/CMakeLists.txt +++ b/testpar/CMakeLists.txt @@ -53,6 +53,6 @@ set (H5P_TESTS foreach (testp ${H5P_TESTS}) ADD_H5P_EXE(${testp}) -endforeach (testp ${H5P_TESTS}) +endforeach () include (CMakeTests.cmake) diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake index 86eaa03..7dce6d6 100644 --- a/testpar/CMakeTests.cmake +++ b/testpar/CMakeTests.cmake @@ -36,7 +36,7 @@ if (HDF5_TEST_VFD) set (VFD_LIST ${VFD_LIST} direct) endif () - MACRO (ADD_VFD_TEST vfdname resultcode) + macro (ADD_VFD_TEST vfdname resultcode) if (NOT HDF5_ENABLE_USING_MEMCHECKER) foreach (test ${H5P_VFD_TESTS}) add_test ( @@ -52,7 +52,7 @@ if (HDF5_TEST_VFD) ) endforeach () endif () - ENDMACRO () + endmacro () # Run test with different Virtual File Driver foreach (vfd ${VFD_LIST}) diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c index 7bd2f58..814fd22 100644 --- a/testpar/t_mpi.c +++ b/testpar/t_mpi.c @@ -1236,7 +1236,7 @@ finish: /* turn off alarm */ ALARM_OFF; - h5_cleanup(FILENAME, fapl); + h5_clean_files(FILENAME, fapl); H5close(); /* MPI_Finalize must be called AFTER H5close which may use MPI calls */ diff --git a/testpar/t_pflush2.c b/testpar/t_pflush2.c index 3b46afd..42cb6c4 100644 --- a/testpar/t_pflush2.c +++ b/testpar/t_pflush2.c @@ -201,8 +201,8 @@ main(int argc, char* argv[]) H5Eset_auto2(H5E_DEFAULT, func, NULL); - h5_cleanup(&FILENAME[0], fapl1); - h5_cleanup(&FILENAME[1], fapl2); + h5_clean_files(&FILENAME[0], fapl1); + h5_clean_files(&FILENAME[1], fapl2); } else { diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c index 9088470..48b0569 100644 --- a/testpar/t_shapesame.c +++ b/testpar/t_shapesame.c @@ -5123,7 +5123,7 @@ int main(int argc, char **argv) TestSummary(); /* Clean up test files */ - h5_cleanup(FILENAME, fapl); + h5_clean_files(FILENAME, fapl); nerrors += GetTestNumErrs(); diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c index eaa9eb1..8ee8f3e 100644 --- a/testpar/testphdf5.c +++ b/testpar/testphdf5.c @@ -565,7 +565,7 @@ int main(int argc, char **argv) TestSummary(); /* Clean up test files */ - h5_cleanup(FILENAME, fapl); + h5_clean_files(FILENAME, fapl); nerrors += GetTestNumErrs(); |