Merge branch 'master' into jedwards/cmake_piolibsettings

ESMCI · Jul 28, 2020 · 1c70406 · 1c70406
2 parents 6400614 + 391f720
commit 1c70406
Show file tree

Hide file tree

Showing 5 changed files with 424 additions and 3 deletions.
diff --git a/src/clib/pioc_support.c b/src/clib/pioc_support.c
@@ -2412,8 +2412,10 @@ inq_file_metadata(file_desc_t *file, int ncid, int iotype, int *nvars,
                 /* Only first dim may be unlimited, for PIO. */
                 if (unlim_found)
                 {
-                    if (d == 0)
+                    if (d == 0){
                         (*rec_var)[v] = 1;
+			break;
+		    }
                     else
                         return pio_err(NULL, file, PIO_EINVAL, __FILE__, __LINE__);
 
@@ -2423,6 +2425,7 @@ inq_file_metadata(file_desc_t *file, int ncid, int iotype, int *nvars,
 
             }
         }
+
     } /* next var */
 
     /* Free resources. */

diff --git a/tests/cunit/CMakeLists.txt b/tests/cunit/CMakeLists.txt
@@ -68,6 +68,8 @@ if (NOT PIO_USE_MPISERIAL)
   target_link_libraries (test_pioc_fill pioc)
   add_executable (test_darray EXCLUDE_FROM_ALL test_darray.c test_common.c)
   target_link_libraries (test_darray pioc)
+  add_executable (test_darray_append EXCLUDE_FROM_ALL test_darray_append.c test_common.c)
+  target_link_libraries (test_darray_append pioc)
   add_executable (test_darray_frame EXCLUDE_FROM_ALL test_darray_frame.c test_common.c)
   target_link_libraries (test_darray_frame pioc)
   add_executable (test_darray_multi EXCLUDE_FROM_ALL test_darray_multi.c test_common.c)
@@ -122,6 +124,7 @@ add_dependencies (tests test_pioc_unlim)
 add_dependencies (tests test_pioc_putget)
 add_dependencies (tests test_pioc_fill)
 add_dependencies (tests test_darray)
+add_dependencies (tests test_darray_append)
 add_dependencies (tests test_darray_frame)
 add_dependencies (tests test_darray_multi)
 add_dependencies (tests test_darray_multivar)
@@ -236,6 +239,10 @@ else ()
     EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/test_darray
     NUMPROCS ${AT_LEAST_FOUR_TASKS}
     TIMEOUT ${DEFAULT_TEST_TIMEOUT})
+  add_mpi_test(test_darray_append
+    EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/test_darray_append
+    NUMPROCS ${AT_LEAST_FOUR_TASKS}
+    TIMEOUT ${DEFAULT_TEST_TIMEOUT})
   add_mpi_test(test_darray_frame
     EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/test_darray_frame
     NUMPROCS ${AT_LEAST_FOUR_TASKS}

diff --git a/tests/cunit/Makefile.am b/tests/cunit/Makefile.am
@@ -19,7 +19,7 @@ test_decomp_uneven test_decomps test_rearr test_darray_async_simple	\
 test_darray_async test_darray_async_many test_darray_2sync		\
 test_async_multicomp test_async_multi2 test_async_manyproc		\
 test_darray_fill test_decomp_frame test_perf2 test_async_perf		\
-test_darray_vard test_async_1d
+test_darray_vard test_async_1d test_darray_append
 
 if RUN_TESTS
 # Tests will run from a bash script.
@@ -41,6 +41,7 @@ test_pioc_unlim_SOURCES = test_pioc_unlim.c test_common.c test_shared.c pio_test
 test_pioc_putget_SOURCES = test_pioc_putget.c test_common.c test_shared.c pio_tests.h
 test_pioc_fill_SOURCES = test_pioc_fill.c test_common.c test_shared.c pio_tests.h
 test_darray_SOURCES = test_darray.c test_common.c pio_tests.h
+test_darray_append_SOURCES = test_darray_append.c test_common.c pio_tests.h
 test_darray_multi_SOURCES = test_darray_multi.c test_common.c pio_tests.h
 test_darray_multivar_SOURCES = test_darray_multivar.c test_common.c pio_tests.h
 test_darray_multivar2_SOURCES = test_darray_multivar2.c test_common.c pio_tests.h

diff --git a/tests/cunit/run_tests.sh b/tests/cunit/run_tests.sh
@@ -17,7 +17,7 @@ PIO_TESTS='test_intercomm2 test_async_mpi test_spmd test_rearr test_async_simple
 'test_darray_multivar test_darray_multivar2 test_darray_multivar3 test_darray_1d '\
 'test_darray_3d test_decomp_uneven test_decomps test_darray_async_simple '\
 'test_darray_async test_darray_async_many test_darray_2sync test_async_multicomp '\
-'test_darray_fill test_darray_vard test_async_1d'
+'test_darray_fill test_darray_vard test_async_1d test_darray_append'
 
 success1=true
 success2=true