Merge pull request ESMCI#1594 from NCAR/ejh_close

Some minor fixes to netcdf integration code to get it past all my CI jobs
jedwards4b · Sep 3, 2019 · 4b074a5 · 4b074a5
2 parents 97d08bf + 7ba458f
commit 4b074a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/clib/pioc_support.c b/src/clib/pioc_support.c
@@ -42,6 +42,8 @@ extern int pio_next_ncid;
 /** The default error handler used when iosystem cannot be located. */
 extern int default_error_handler;
 
+/** This prototype from netCDF is required for netCDF integration to
+ * work. */
 int nc4_file_change_ncid(int ncid, unsigned short new_ncid_index);
 
 /**

diff --git a/tests/fncint/Makefile.am b/tests/fncint/Makefile.am
@@ -23,10 +23,10 @@ check_PROGRAMS = ftst_pio ftst_pio_orig tst_c_pio
 ftst_pio_SOURCES = ftst_pio.f90
 ftst_pio_orig_SOURCES = ftst_pio_orig.f90
 
-# if RUN_TESTS
-# # Tests will run from a bash script.
-# TESTS = run_tests.sh
-# endif # RUN_TESTS
+if RUN_TESTS
+# Tests will run from a bash script.
+TESTS = run_tests.sh
+endif # RUN_TESTS
 
 # Distribute the test script.
 EXTRA_DIST = run_tests.sh