run-and-email tweaks

This commit is contained in:
rocky
2020-02-16 17:35:57 -05:00
parent 201635de7b
commit 5a6a41a608

View File

@@ -28,7 +28,7 @@ MAIN="test_pyenvlib.py"
USER=${USER:-rocky} USER=${USER:-rocky}
EMAIL=${EMAIL:-rb@dustyfeet.com} EMAIL=${EMAIL:-rb@dustyfeet.com}
SUBJECT_PREFIX="${MAIN} for" WHAT_PREFIX="uncompyle6 ${MAIN}"
MAX_TESTS=${MAX_TESTS:-800} MAX_TESTS=${MAX_TESTS:-800}
export BATCH=1 export BATCH=1
@@ -79,6 +79,7 @@ for VERSION in $PYVERSIONS ; do
if ! pyenv local $VERSION ; then if ! pyenv local $VERSION ; then
rc=1 rc=1
mailbody_line="pyenv local $VERSION not installed" mailbody_line="pyenv local $VERSION not installed"
echo $mailbody_line >> $MAILBODY
else else
echo Python Version $(pyenv local) > $LOGFILE echo Python Version $(pyenv local) > $LOGFILE
echo "" >> $LOGFILE echo "" >> $LOGFILE
@@ -93,16 +94,16 @@ for VERSION in $PYVERSIONS ; do
typeset -i ALL_FILES_ENDTIME=$(date +%s) typeset -i ALL_FILES_ENDTIME=$(date +%s)
(( time_diff = ALL_FILES_ENDTIME - ALL_FILES_STARTTIME)) (( time_diff = ALL_FILES_ENDTIME - ALL_FILES_STARTTIME))
displaytime $time_diff >> $LOGFILE time_str=$(displaytime $time_diff)
echo ${time_str}. >> $LOGFILE
fi fi
SUBJECT_PREFIX="pyenv weak verify (max $MAX_TESTS) for" SUBJECT_PREFIX="$WHAT (max $MAX_TESTS) for"
if ((rc == 0)); then if ((rc == 0)); then
mailbody_line="Python $VERSION ok; ran in $time_diff seconds" mailbody_line="Python $VERSION ok; ${time_str}."
tail -v $LOGFILE | mail -s "$SUBJECT_PREFIX $VERSION ok" ${USER}@localhost tail -v $LOGFILE | mail -s "$SUBJECT_PREFIX $VERSION ok" ${USER}@localhost
else else
mailbody_line="Python $VERSION failed; ran in $time_diff seconds" mailbody_line="Python $VERSION failed; ${time_str}."
actual_versions="$actual_versions failed;"
tail -v $LOGFILE | mail -s "$SUBJECT_PREFIX $VERSION not ok" ${USER}@localhost tail -v $LOGFILE | mail -s "$SUBJECT_PREFIX $VERSION not ok" ${USER}@localhost
tail -v $LOGFILE | mail -s "$HOST $SUBJECT_PREFIX $VERSION not ok" ${EMAIL} tail -v $LOGFILE | mail -s "$HOST $SUBJECT_PREFIX $VERSION not ok" ${EMAIL}
fi fi
@@ -113,5 +114,5 @@ done
typeset -i RUN_ENDTIME=$(date +%s) typeset -i RUN_ENDTIME=$(date +%s)
(( time_diff = RUN_ENDTIME - RUN_STARTTIME)) (( time_diff = RUN_ENDTIME - RUN_STARTTIME))
elapsed_time=$(displaytime $time_diff) elapsed_time=$(displaytime $time_diff)
echo "Run complete in $elapsed_time" >> $MAILBODY echo "${WHAT} complete; ${elapsed_time}." >> $MAILBODY
cat $MAILBODY | mail -s "$HOST $MAIN weak verify in $elapsed_time" ${EMAIL} cat $MAILBODY | mail -s "$HOST $WHAT ${elapsed_time}." ${EMAIL}