From 2b26121537a1023fa5d271af84cbf367c14e46a3 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Sat, 9 Apr 2022 14:27:13 -0600 Subject: [PATCH] fixed problems running mpi-enabled tests with --enable-pnetcdf in nc_test --- nc_test/Makefile.am | 3 ++- nc_test/tst_pnetcdf.c | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nc_test/Makefile.am b/nc_test/Makefile.am index a7351c9fa..ab3d8576c 100644 --- a/nc_test/Makefile.am +++ b/nc_test/Makefile.am @@ -103,7 +103,8 @@ endif if USE_PNETCDF TESTS += run_pnetcdf_tests.sh else -TESTS += t_nc tst_atts3 +TESTS += t_nc tst_atts3 tst_nofill nc_test tst_default_format_pnetcdf \ +tst_small tst_formatx_pnetcdf tst_cdf5format endif # The .c files that are generated with m4 are already distributed, but diff --git a/nc_test/tst_pnetcdf.c b/nc_test/tst_pnetcdf.c index de79f1989..2ae175c70 100644 --- a/nc_test/tst_pnetcdf.c +++ b/nc_test/tst_pnetcdf.c @@ -44,7 +44,8 @@ int main(int argc, char* argv[]) size_t start[2], count[2]; MPI_Comm comm=MPI_COMM_SELF; MPI_Info info=MPI_INFO_NULL; - + char file_name[NC_MAX_NAME + 1]; + printf("\n*** Testing bug fix with changing PnetCDF variable offsets..."); MPI_Init(&argc,&argv); @@ -63,7 +64,9 @@ int main(int argc, char* argv[]) #endif cmode = NC_CLOBBER; - st = nc_create_par(FILENAME, cmode, comm, info, &ncid); + sprintf(file_name, "%s/%s", TEMP_LARGE, FILENAME); + st = nc_create_par(file_name, cmode, comm, info, &ncid); + #ifdef USE_PNETCDF CHK_ERR(st) #else @@ -109,7 +112,7 @@ int main(int argc, char* argv[]) if (info != MPI_INFO_NULL) MPI_Info_free(&info); /* re-open the file with netCDF (parallel) and enter define mode */ - st = nc_open_par(FILENAME, NC_WRITE, comm, info, &ncid); CHK_ERR(st) + st = nc_open_par(file_name, NC_WRITE, comm, info, &ncid); CHK_ERR(st) st = nc_redef(ncid); CHK_ERR(st)