fix any serial failures from diag_manager and mpp

Author: rem1776

test_fms/diag_manager/Makefile.am

@@ -105,7 +105,7 @@ else
   ncdump_skip=""
 endif
 
-if SKIP_PARALLEL_TEST
+if SERIAL_BUILD 
   parallel_skip="skip"
 else
   parallel_skip=""

test_fms/diag_manager/test_diag_manager2.sh

@@ -1336,10 +1336,13 @@ diag_files:
 ...
 _EOF
 
-my_test_count=`expr $my_test_count + 1`
-test_expect_success "check modern diag manager yaml output (test $my_test_count)" '
-    mpirun -n 1 ../test_diag_out_yaml
-'
+# skip if mpi is disabled, previous test is parallel so no output to check
+if [ -z "${parallel_skip}" ]; then
+  my_test_count=`expr $my_test_count + 1`
+  test_expect_success "check modern diag manager yaml output (test $my_test_count)" '
+      mpirun -n 1 ../test_diag_out_yaml
+  '
+fi
 
 printf "&diag_manager_nml \n use_modern_diag = .true. \n use_clock_average = .true. \n /" | cat > input.nml
 cat <<_EOF > diag_table.yaml

test_fms/diag_manager/test_subregional.sh

@@ -21,7 +21,7 @@
 # Set common test settings.
 . ../test-lib.sh
 
-if [ -z "${parser_skip}" ]; then
+if [ -z "${parser_skip}" ] && [ -z "${parallel_skip}" ]; then
 # create and enter directory for in/output files
 output_dir
 

test_fms/diag_manager/test_time_avg.sh

@@ -21,7 +21,7 @@
 # Set common test settings.
 . ../test-lib.sh
 
-if [ -z "${parser_skip}" ]; then
+if [ -z "${parser_skip}" ] && [ -z "${parallel_skip}" ]; then
 # create and enter directory for in/output files
 output_dir
 

test_fms/diag_manager/test_time_diurnal.sh

@@ -21,7 +21,7 @@
 # Set common test settings.
 . ../test-lib.sh
 
-if [ -z "${parser_skip}" ]; then
+if [ -z "${parser_skip}" ] && [ -z "${parallel_skip}" ]; then
 # create and enter directory for in/output files
 output_dir
 

test_fms/diag_manager/test_time_max.sh

@@ -23,7 +23,7 @@
 # Set common test settings.
 . ../test-lib.sh
 
-if [ -z "${parser_skip}" ]; then
+if [ -z "${parser_skip}" ] && [ -z "${parallel_skip}" ]; then
 # create and enter directory for in/output files
 output_dir
 

test_fms/diag_manager/test_time_min.sh

@@ -23,7 +23,7 @@
 # Set common test settings.
 . ../test-lib.sh
 
-if [ -z "${parser_skip}" ]; then
+if [ -z "${parser_skip}" ] && [ -z "${parallel_skip}" ]; then
 # create and enter directory for in/output files
 output_dir
 

test_fms/diag_manager/test_time_none.sh

@@ -23,7 +23,7 @@
 # Set common test settings.
 . ../test-lib.sh
 
-if [ -z "${parser_skip}" ]; then
+if [ -z "${parser_skip}" ] && [ -z "${parallel_skip}" ]; then
 # create and enter directory for in/output files
 output_dir
 

test_fms/diag_manager/test_time_pow.sh

@@ -21,7 +21,7 @@
 # Set common test settings.
 . ../test-lib.sh
 
-if [ -z "${parser_skip}" ]; then
+if [ -z "${parser_skip}" ] && [ -z "${parallel_skip}" ]; then
 # create and enter directory for in/output files
 output_dir
 

test_fms/diag_manager/test_time_rms.sh

@@ -21,7 +21,7 @@
 # Set common test settings.
 . ../test-lib.sh
 
-if [ -z "${parser_skip}" ]; then
+if [ -z "${parser_skip}" ] && [ -z "${parallel_skip}" ]; then
 # create and enter directory for in/output files
 output_dir