summaryrefslogtreecommitdiffstats
path: root/testpar
diff options
context:
space:
mode:
Diffstat (limited to 'testpar')
-rw-r--r--testpar/t_cache.c6
-rw-r--r--testpar/t_mpi.c2
-rw-r--r--testpar/t_pflush2.c4
-rw-r--r--testpar/t_shapesame.c5
-rw-r--r--testpar/testphdf5.c2
5 files changed, 10 insertions, 9 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index 42788f4..b848827 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -21,9 +21,9 @@
#include "h5test.h"
#include "testpar.h"
-#define H5AC_PACKAGE /*suppress error about including H5ACpkg */
-#define H5C_PACKAGE /*suppress error about including H5Cpkg */
-#define H5F_PACKAGE /*suppress error about including H5Fpkg */
+#define H5AC_FRIEND /*suppress error about including H5ACpkg */
+#define H5C_FRIEND /*suppress error about including H5Cpkg */
+#define H5F_FRIEND /*suppress error about including H5Fpkg */
#include "H5ACpkg.h"
#include "H5Cpkg.h"
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c
index 873b952..feea137 100644
--- a/testpar/t_mpi.c
+++ b/testpar/t_mpi.c
@@ -1235,7 +1235,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 03f7c82..f9f8459 100644
--- a/testpar/t_pflush2.c
+++ b/testpar/t_pflush2.c
@@ -200,8 +200,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..8722ee2 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -18,7 +18,7 @@
same shape by H5Sselect_shape_same().
*/
-#define H5S_PACKAGE /*suppress error about including H5Spkg */
+#define H5S_FRIEND /*suppress error about including H5Spkg */
/* Define this macro to indicate that the testing APIs should be available */
#define H5S_TESTING
@@ -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();
@@ -5148,3 +5148,4 @@ int main(int argc, char **argv)
/* cannot just return (nerrors) because exit code is limited to 1byte */
return(nerrors!=0);
}
+
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index c3da73f..f1ec507 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -563,7 +563,7 @@ int main(int argc, char **argv)
TestSummary();
/* Clean up test files */
- h5_cleanup(FILENAME, fapl);
+ h5_clean_files(FILENAME, fapl);
nerrors += GetTestNumErrs();