diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-09 00:20:57 -0500 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-09 00:20:57 -0500 |
commit | 19fa46346c440c00b9f4a6509784928232c136e2 (patch) | |
tree | f8944a393bef886913f8f17df1f25d1e6f828acf | |
parent | 628c8a3d093598a4ee58b37902e7328c48c337b3 (diff) | |
download | cbt-19fa46346c440c00b9f4a6509784928232c136e2.tar.gz cbt-19fa46346c440c00b9f4a6509784928232c136e2.tar.bz2 cbt-19fa46346c440c00b9f4a6509784928232c136e2.zip |
fix some quite noisy behavior regarding exit codes in the bash runner. The interaction with nailgun probably needs more low level debugging to get flawless
-rwxr-xr-x | cbt | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -212,17 +212,18 @@ stage1 () { log "Checking if nailgun is up yet." $* $NG cbt.NailgunLauncher cbt.CheckAlive $CP "$CWD" $* >> $nailgun_out 2>> $nailgun_err alive=$? - if [ $alive -eq 131 ]; then - echo "Nailgun call failed. Try 'cbt kill' and check the error log cbt/nailgun_launcher/target/nailgun.stderr.log" 1>&2 - elif [ $alive -eq 33 ]; then + if [ $alive -eq 131 ] || [ $alive -eq 33 ]; then + # the 33 is not working right now + # echo "Nailgun call failed. Try 'cbt kill' and check the error log cbt/nailgun_launcher/target/nailgun.stderr.log" 1>&2 + #elif [ $alive -eq 33 ]; then break else log "Nope. Sleeping for 0.5 seconds" $* if [ "$i" -gt "1" ]; then echo "Waiting for nailgun to start... (For problems try -Dlog=nailgun or check logs in cbt/nailgun_launcher/target/*.log)" 1>&2 fi - sleep 0.5 fi + sleep 0.5 done log "Running $mainClass via Nailgun." $* $NG cbt.NailgunLauncher $mainClass $CP "$CWD" $* |