From 8383eeeec82b9db7212fa5108806e2a3e5dd2ec0 Mon Sep 17 00:00:00 2001 From: edoapra Date: Wed, 22 Nov 2017 23:37:39 -0800 Subject: [PATCH] bash arguments --- .travis.yml | 7 ++++--- travis/sleep_loop.sh | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5f9d6642c8..bfb7c6d4f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,16 +36,17 @@ script: - cd $NWCHEM_TOP/src && ../travis/sleep_loop.sh make -j3 - tail -2 $NWCHEM_TOP/src/6log - tail -2 $NWCHEM_TOP/src/tce/6log + - head -2 $NWCHEM_TOP/src/tools/build/config.log - tail -2 $NWCHEM_TOP/src/tools/build/config.log - - cat $NWCHEM_TOP/src/tools/build/config.h - tail -10 $NWCHEM_TOP/src/make.log - cd $NWCHEM_TOP/src && make nwchem_config NWCHEM_MODULES="nwdft driver stepper property hessian vib mp2_grad ccsd solvation python tce" - - cd $NWCHEM_TOP/src/tce && head -30 dependencies && rm -f dependencies + - cd $NWCHEM_TOP/src/tce && head -2 dependencies && rm -f dependencies - grep -i dot $NWCHEM_TOP/src/tce/tce_residual_t1.F - make include_stamp dependencies >& dep.log && tail -2 dep.log - wait + - tail -2 $NWCHEM_TOP/src/tce/6log - grep -i dot $NWCHEM_TOP/src/tce/tce_residual_t1.F - - cd $NWCHEM_TOP/src/tce && ../../travis/sleep_loop.sh make FDEBUG="-O0 -g" FOPTIMIZE="-O0 -g" -j4 + - cd $NWCHEM_TOP/src/tce && ../../travis/sleep_loop.sh make FDEBUG=-O0 FOPTIMIZE=-O0 -j3 - tail -4 $NWCHEM_TOP/src/make.log - cd $NWCHEM_TOP/src && make link - cd $NWCHEM_TOP/QA && ./runtests.mpi.unix procs 2 dft_siosi3 diff --git a/travis/sleep_loop.sh b/travis/sleep_loop.sh index 61d2cabf0f..2c0f4c13f4 100755 --- a/travis/sleep_loop.sh +++ b/travis/sleep_loop.sh @@ -1,11 +1,11 @@ #!/bin/bash -echo "starting sleep_loop.sh for command: " $* -$* >& make.log & +echo "starting sleep_loop.sh for command: " ${@} +${@} >& make.log & pid=$! echo "sleep_loop got pid" $pid while : do - sleep 60 + sleep 60s if kill -0 "$pid" 2>/dev/null; then echo ' ==== ' `date` ' ==== ' tail -1 make.log