Index: /issm/trunk-jpl/externalpackages/shell2junit/README =================================================================== --- /issm/trunk-jpl/externalpackages/shell2junit/README (revision 25978) +++ /issm/trunk-jpl/externalpackages/shell2junit/README (revision 25978) @@ -0,0 +1,9 @@ +http://code.google.com/p/shell2junit/ + +Shell2junit + +Shell2junit is a simple utility which facilitates to generate junit reports for batch processes executed in shell scripts. + +The reports can be easily parsed in Hudson and other CI software in order to monitor and generate trends and alerts. + +This page teaches how to do it in Hudson. Index: /issm/trunk-jpl/externalpackages/shell2junit/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/shell2junit/install.sh (revision 25977) +++ /issm/trunk-jpl/externalpackages/shell2junit/install.sh (revision 25978) @@ -3,23 +3,7 @@ -## Constants -# -VER="1.0.0" +#Some cleanup +rm -rf install +mkdir install -PREFIX="${ISSM_DIR}/externalpackages/shell2junit/install" # Set to location where external package should be installed - -# Cleanup -rm -rf ${PREFIX} -mkdir -p ${PREFIX}/bin - -# Download source -$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/shell2junit-${VER}.zip" "shell2junit-${VER}.zip" - -# Unpack source -unzip -q shell2junit-${VER}.zip - -# Install -mv shell2junit-${VER}/sh2ju.sh ${PREFIX}/bin - -# Cleanup -rm -rf shell2junit-${VER} +cp patch/sh2ju.sh install/ Index: /issm/trunk-jpl/externalpackages/shell2junit/install.sh.old =================================================================== --- /issm/trunk-jpl/externalpackages/shell2junit/install.sh.old (revision 25978) +++ /issm/trunk-jpl/externalpackages/shell2junit/install.sh.old (revision 25978) @@ -0,0 +1,20 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf install src +rm -rf shell2junit +mkdir install src + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/shell2junit-1.0.0.zip' 'shell2junit-1.0.0.zip' + +#Untar +unzip shell2junit-1.0.0.zip + +#Move shell2junit into install directory +mv shell2junit/* src +rm -rf shell2junit + +#Copy executable: +cp src/sh2ju.sh install Index: /issm/trunk-jpl/externalpackages/shell2junit/patch/sh2ju.sh =================================================================== --- /issm/trunk-jpl/externalpackages/shell2junit/patch/sh2ju.sh (revision 25978) +++ /issm/trunk-jpl/externalpackages/shell2junit/patch/sh2ju.sh (revision 25978) @@ -0,0 +1,131 @@ +#!/bin/sh +### Copyright 2010 Manuel Carrasco Moñino. (manolo at apache.org) +### +### Licensed under the Apache License, Version 2.0. +### You may obtain a copy of it at +### http://www.apache.org/licenses/LICENSE-2.0 + +### +### A library for shell scripts which creates reports in jUnit format. +### These reports can be used in Hudson, or any other CI. +### +### Usage: +### - Include this file in your shell script +### - Use juLog to call your command any time you want to produce a new report +### Usage: juLog command arguments +### options: +### -name="TestName" : the test name which will be shown in the junit report +### -error="RegExp" : a regexp which sets the test as failure when the output matches it +### -ierror="RegExp" : same as -error but case insensitive +### - Junit reports are left in the folder 'result' under the directory where the script is executed. +### - Configure hudson to parse junit files from the generated folder +### + +asserts=00; errors=0; total=0; content="" + +# create output folder +juDIR=`pwd`/results +mkdir -p $juDIR || exit + +# The name of the suite is calculated based in your script name +suite=`basename $0 | sed -e 's/.sh$//' | tr "." "_"` + +# A wrapper for the eval method witch allows catching seg-faults and use tee +errfile=/tmp/evErr.$$.log +eVal() { + eval "$1" + echo $? | tr -d "\n" >$errfile +} + +# Method to clean old tests +juLogClean() { + echo "+++ Removing old junit reports from: $juDIR " + rm -f $juDIR/TEST-* +} + +# Execute a command and record its results +juLog() { + + # parse arguments + ya=""; icase=""; testname=""; + while [ -z "$ya" ]; do + case "$1" in + -name=*) name=$asserts-`echo "$1" | sed -e 's/-name=//'`; shift;; + -ierror=*) ereg=`echo "$1" | sed -e 's/-ierror=//'`; icase="-i"; shift;; + -error=*) ereg=`echo "$1" | sed -e 's/-error=//'`; shift;; + -test=*) testname=`echo "$1" | sed -e 's/-test=//'`; shift;; + *) ya=1;; + esac + done + + # use first arg as name if it was not given + if [ -z "$name" ]; then + name="$asserts-$1" + shift + fi + + # calculate command to eval + [ -z "$1" ] && return + cmd="$1"; shift + while [ -n "$1" ] + do + cmd="$cmd \"$1\"" + shift + done + + # eval the command sending output to a file + outf=/var/tmp/ju$$.txt + >$outf + echo "" | tee -a $outf + echo "+++ Running case: $testname " | tee -a $outf + echo "+++ working dir: "`pwd` | tee -a $outf + #echo "+++ command: $cmd" | tee -a $outf + ini=`date +%s` + eVal "$cmd" 2>&1 | tee -a $outf + evErr=`cat $errfile` + rm -f $errfile + end=`date +%s` + echo "+++ exit code: $evErr" | tee -a $outf + + # set the appropriate error, based in the exit code and the regex + [ $evErr != 0 ] && err=1 || err=0 + out=`cat $outf | sed -e 's/^\([^+]\)/| \1/g'` + if [ $err = 0 -a -n "$ereg" ]; then + H=`echo "$out" | egrep $icase "$ereg"` + [ -n "$H" ] && err=1 + fi + echo "+++ error: $err" | tee -a $outf + rm -f $outf + + # calculate vars + asserts=`expr $asserts + 1` + asserts=`printf "%.2d" $asserts` + errors=`expr $errors + $err` + time=`expr $end - $ini` + total=`expr $total + $time` + + # write the junit xml report + ## failure tag + [ $err = 0 ] && failure="" || failure=" + + " + ## testcase tag + content="$content + + $failure + + + + + " + ## testsuite block + cat <$juDIR/TEST-$suite.xml + + $content + +EOF + +} +