added test to cmake build

jedwards4b · Sep 4, 2019 · 1503141 · 1503141
1 parent 5eaa61d
commit 1503141
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/src/ncint/ncint_pio.c b/src/ncint/ncint_pio.c
@@ -85,6 +85,10 @@ nc_def_async(MPI_Comm world, int num_io_procs, int *io_proc_list,
     if ((ret = PIO_NCINT_initialize()))
         return ret;
 
+    /* Change error handling so we can test inval parameters. */
+    if ((ret = PIOc_set_iosystem_error_handling(PIO_DEFAULT, PIO_RETURN_ERROR, NULL)))
+        return ret;
+
     /* Call the PIOc_ function to initialize the intracomm. */
     if ((ret = PIOc_init_async(world, num_io_procs, io_proc_list,
                                component_count, num_procs_per_comp, proc_list,

diff --git a/tests/cunit/CMakeLists.txt b/tests/cunit/CMakeLists.txt
@@ -109,6 +109,8 @@ if (NOT PIO_USE_MPISERIAL)
     target_link_libraries (test_async_multi2 pioc)
     add_executable (test_async_manyproc EXCLUDE_FROM_ALL test_async_manyproc.c test_common.c)
     target_link_libraries (test_async_manyproc pioc)
+    add_executable (test_async_1d EXCLUDE_FROM_ALL test_async_1d.c)
+    target_link_libraries (test_async_1d pioc)
   endif ()
 endif ()
 add_executable (test_spmd EXCLUDE_FROM_ALL test_spmd.c test_common.c)
@@ -140,6 +142,7 @@ if(PIO_USE_MALLOC)
   add_dependencies (tests test_async_multicomp)
   add_dependencies (tests test_async_multi2)
   add_dependencies (tests test_async_manyproc)
+  add_dependencies (tests test_async_1d)
 endif ()
 
 # Test Timeout in seconds.

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_darray_fill test_darray_vard test_async_1d'
 
 success1=true
 success2=true

diff --git a/tests/cunit/test_async_1d.c b/tests/cunit/test_async_1d.c
@@ -63,7 +63,7 @@ int main(int argc, char **argv)
     /* Make sure we have 4 tasks. */
     if (ntasks != TARGET_NTASKS) ERR(ERR_WRONG);
 
-    PIOc_set_log_level(4);
+    /* PIOc_set_log_level(4); */
 
     /* Change error handling so we can test inval parameters. */
     if ((ret = PIOc_set_iosystem_error_handling(PIO_DEFAULT, PIO_RETURN_ERROR, NULL)))

diff --git a/tests/ncint/tst_pio_async.c b/tests/ncint/tst_pio_async.c
@@ -53,9 +53,9 @@ main(int argc, char **argv)
         int i;
 
         /* Turn on logging for PIO library. */
-        PIOc_set_log_level(4);
-        if (!my_rank)
-            nc_set_log_level(3);
+        /* PIOc_set_log_level(4); */
+        /* if (!my_rank) */
+        /*     nc_set_log_level(3); */
 
         /* Initialize the intracomm. The IO task will not return from
          * this call until the PIOc_finalize() is called by the