From 269dd04c2b35ac5f39a2b69546f8a3fecf5227bc Mon Sep 17 00:00:00 2001
From: edoapra <edoardo.apra@gmail.com>
Date: Sun, 13 Oct 2019 13:21:06 -0700
Subject: [PATCH] restructured analysis on failures

---
 .travis.yml              | 16 +---------------
 travis/check_failures.sh | 29 +++++++++++++++++++++++++++++
 travis/run_qas.sh        | 25 +------------------------
 3 files changed, 31 insertions(+), 39 deletions(-)
 create mode 100755 travis/check_failures.sh

diff --git a/.travis.yml b/.travis.yml
index bb85bbc38b..9de7a1b764 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,19 +73,5 @@ script:
 
 
 after_failure:
-        - tail -20 $TRAVIS_BUILD_DIR/src/tools/build/config.log
-        - tail -10 $TRAVIS_BUILD_DIR/src/tools/build/comex/config.log
-        - grep -A 2 -B 2 -i error $TRAVIS_BUILD_DIR/src/make.log 
-        - head -200 $TRAVIS_BUILD_DIR/src/make.log
-        - tail -200 $TRAVIS_BUILD_DIR/src/make.log
-        - tail -200 $TRAVIS_BUILD_DIR/src/6log
-        - grep -i tce_energy $TRAVIS_BUILD_DIR/src/6log
-        - grep d= $TRAVIS_BUILD_DIR/QA/testoutputs/dft_he2+.out
-        - grep @ $TRAVIS_BUILD_DIR/QA/testoutputs/h2o_opt.out
-        - tail -30 $TRAVIS_BUILD_DIR/QA/testoutputs/dft_he2+.out
-        - tail -490 $TRAVIS_BUILD_DIR/QA/testoutputs/h2o2-response.out
-        - tail -30 $TRAVIS_BUILD_DIR/QA/testoutputs/prop_mep_gcube.out
-        - diff $TRAVIS_BUILD_DIR/QA/testoutputs/prop_ch3f.o*nw*
-        - diff $TRAVIS_BUILD_DIR/QA/testoutputs/h2o2-response.o*nw*
-        - diff $TRAVIS_BUILD_DIR/QA/testoutputs/tce_n2.o*nw*
+        - ./travis/check_failures.sh
               
diff --git a/travis/check_failures.sh b/travis/check_failures.sh
new file mode 100755
index 0000000000..8ddce1fa9a
--- /dev/null
+++ b/travis/check_failures.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+tail -20 $TRAVIS_BUILD_DIR/src/tools/build/config.log
+tail -10 $TRAVIS_BUILD_DIR/src/tools/build/comex/config.log
+grep -A 2 -B 2 -i error $TRAVIS_BUILD_DIR/src/make.log 
+head -200 $TRAVIS_BUILD_DIR/src/make.log
+tail -200 $TRAVIS_BUILD_DIR/src/make.log
+tail -200 $TRAVIS_BUILD_DIR/src/6log
+grep -i tce_energy $TRAVIS_BUILD_DIR/src/6log
+# tail output files on failures
+if [[  "NWCHEM_MODULES" == "tce" ]]; then
+    head -2 $TRAVIS_BUILD_DIR/QA/testoutputs/tce_n2.out
+    tail -70 $TRAVIS_BUILD_DIR/QA/testoutputs/tce_n2.out
+    tail -70 $TRAVIS_BUILD_DIR/QA/testoutputs/tce_h2o_eomcc.out
+    tail -70 $TRAVIS_BUILD_DIR/QA/testoutputs/tce_ccsd_t_h2o
+else    
+    grep d= $TRAVIS_BUILD_DIR/QA/testoutputs/dft_he2+.out
+    head -2 $TRAVIS_BUILD_DIR/QA/testoutputs/dft_he2+.out
+    tail -40 $TRAVIS_BUILD_DIR/QA/testoutputs/dft_he2+.out
+    tail -40 $TRAVIS_BUILD_DIR/QA/testoutputs/prop_mep_gcube.out
+    tail -60 $TRAVIS_BUILD_DIR/QA/testoutputs/dft_siosi3.out
+    grep @ $TRAVIS_BUILD_DIR/QA/testoutputs/h2o_opt.out
+    tail -60 $TRAVIS_BUILD_DIR/QA/testoutputs/h2o_opt.out
+    tail -60 $TRAVIS_BUILD_DIR/QA/testoutputs/tddft_h2o.out
+    tail -60 $TRAVIS_BUILD_DIR/QA/testoutputs/h2o2-response.out
+    tail -490 $TRAVIS_BUILD_DIR/QA/testoutputs/h2o2-response.out
+    tail -60 $TRAVIS_BUILD_DIR/QA/testoutputs/pspw.out
+    tail -60 $TRAVIS_BUILD_DIR/QA/testoutputs/pspw_md.out
+    grep 'Total PSPW energy' $TRAVIS_BUILD_DIR/QA/testoutputs/pspw_md.out
+    fi
diff --git a/travis/run_qas.sh b/travis/run_qas.sh
index dbd1d0b918..3c6f1c9b8d 100755
--- a/travis/run_qas.sh
+++ b/travis/run_qas.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -f
+#!/bin/bash 
 # Exit on error
 set -ev
 # source env. variables
@@ -47,22 +47,11 @@ fi
  esac
  if [[ "$NWCHEM_MODULES" == "tce" ]]; then
    cd $TRAVIS_BUILD_DIR/QA && USE_SLEEPLOOP=1 ./runtests.mpi.unix procs $nprocs tce_n2 tce_ccsd_t_h2o tce_h2o_eomcc
-   if [ $? -ne 0 ]; then
-   head -2 $TRAVIS_BUILD_DIR/QA/testoutputs/tce_n2.out
-   tail -70 $TRAVIS_BUILD_DIR/QA/testoutputs/tce_n2.out
-   cat $TRAVIS_BUILD_DIR/QA/testoutputs/tce_n2.out.nwparse
-   tail -70 $TRAVIS_BUILD_DIR/QA/testoutputs/tce_h2o_eomcc.out
-   fi
  if  [[ "$do_largeqas" == 1 ]]; then
 	cd $TRAVIS_BUILD_DIR/QA && USE_SLEEPLOOP=1 ./runtests.mpi.unix procs $nprocs tce_ipccsd_f2 tce_eaccsd_ozone
     fi
  else
      cd $TRAVIS_BUILD_DIR/QA && ./runtests.mpi.unix procs $nprocs dft_he2+ prop_mep_gcube
-     if [ $? -ne 0 ]; then
-       head -2 $TRAVIS_BUILD_DIR/QA/testoutputs/dft_he2+.out
-       tail -40 $TRAVIS_BUILD_DIR/QA/testoutputs/dft_he2+.out
-       tail -40 $TRAVIS_BUILD_DIR/QA/testoutputs/prop_mep_gcube.out
-     fi
      cd $TRAVIS_BUILD_DIR/QA && USE_SLEEPLOOP=1 ./runtests.mpi.unix procs $nprocs cosmo_h2o_dft  
      if [[ "$USE_SIMINT" != "1" ]] ; then
 	cd $TRAVIS_BUILD_DIR/QA && USE_SLEEPLOOP=1 ./runtests.mpi.unix procs $nprocs pspw
@@ -72,19 +61,7 @@ fi
      fi
      if  [[ "$do_largeqas" == 1 ]]; then
        cd $TRAVIS_BUILD_DIR/QA && USE_SLEEPLOOP=1 ./runtests.mpi.unix procs $nprocs dft_siosi3 h2o_opt
-       if [ $? -ne 0 ]; then
-           tail -60 $TRAVIS_BUILD_DIR/QA/testoutputs/dft_siosi3.out
-           tail -60 $TRAVIS_BUILD_DIR/QA/testoutputs/h2o_opt.out
-       fi
        cd $TRAVIS_BUILD_DIR/QA && USE_SLEEPLOOP=1 ./runtests.mpi.unix procs $nprocs tddft_h2o h2o2-response
-       if [ $? -ne 0 ]; then
-           tail -60 $TRAVIS_BUILD_DIR/QA/testoutputs/tddft_h2o.out
-           tail -60 $TRAVIS_BUILD_DIR/QA/testoutputs/h2o2-response.out
-       fi
        cd $TRAVIS_BUILD_DIR/QA && USE_SLEEPLOOP=1 ./runtests.mpi.unix procs $nprocs pspw_md
-       if [ $? -ne 0 ]; then
-	   tail -60 $TRAVIS_BUILD_DIR/QA/testoutputs/pspw_md.out
-	   grep 'Total PSPW energy' $TRAVIS_BUILD_DIR/QA/testoutputs/pspw_md.out
-       fi
      fi
  fi