denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use log_action function in do-tests script

Browse Source
This commit is contained in:
Reto Buerki
2013-01-17 16:54:53 +01:00
committed by Tobias Brunner
parent 1102a8c1cc
commit 8cb4628ff9
2 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/do-tests
+27 -38
View File
@@ -16,20 +16,11 @@
DIR=`dirname $0` DIR=`dirname $0`
source $DIR/scripts/function.sh . $PWD/scripts/function.sh
[ -f $DIR/testing.conf ] || die "Configuration file 'testing.conf' not found" [ -d $PWD/hosts ] || die "Directory 'hosts' not found"
[ -d $DIR/hosts ] || die "Directory 'hosts' not found" [ -d $PWD/tests ] || die "Directory 'tests' not found"
[ -d $DIR/tests ] || die "Directory 'tests' not found" [ -d $BUILDDIR ] || die "Directory '$BUILDDIR' does not exist, please run make-testing first"
source $DIR/testing.conf
##############################################################################
# test if UMLs have been built at all
#
[ -d $BUILDDIR ] || die "Directory '$BUILDDIR' does not exist. Please run 'make-testing'first."
############################################################################## ##############################################################################
@@ -121,7 +112,7 @@ ENVIRONMENT_HEADER=$(cat <<@EOF
<td colspan="3">`uname -a`</td> <td colspan="3">`uname -a`</td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td><b>UML kernel</b></td> <td><b>Guest kernel</b></td>
<td colspan="3">$KERNELVERSION</td> <td colspan="3">$KERNELVERSION</td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
@@ -167,10 +158,10 @@ cat > $TESTRESULTSHTML <<@EOF
</tr> </tr>
@EOF @EOF
cecho "UML kernel : $KERNELVERSION" echo "Guest kernel : $KERNELVERSION"
cecho "strongSwan : $SWANVERSION" echo "strongSwan : $SWANVERSION"
cecho "Date : $TESTDATE" echo "Date : $TESTDATE"
cecho "" echo
############################################################################## ##############################################################################
@@ -255,11 +246,11 @@ do
do do
let "testnumber += 1" let "testnumber += 1"
testname=$SUBDIR/$name testname=$SUBDIR/$name
cecho-n " $testnumber $testname.." log_action " $testnumber $testname:"
if [ ! -d $DEFAULTTESTSDIR/${testname} ] if [ ! -d $DEFAULTTESTSDIR/${testname} ]
then then
cecho "is missing..skipped" echo "is missing..skipped"
continue continue
fi fi
@@ -387,7 +378,7 @@ do
# execute pre-test commands # execute pre-test commands
# #
cecho-n "pre.." echo -n "pre.."
echo -e "\nPRE-TEST\n" >> $CONSOLE_LOG 2>&1 echo -e "\nPRE-TEST\n" >> $CONSOLE_LOG 2>&1
eval `awk -F "::" '{ eval `awk -F "::" '{
@@ -416,7 +407,7 @@ do
# get and evaluate test results # get and evaluate test results
# #
cecho-n "test.." echo -n "test.."
echo -e "\nTEST\n" >> $CONSOLE_LOG 2>&1 echo -e "\nTEST\n" >> $CONSOLE_LOG 2>&1
STATUS="passed" STATUS="passed"
@@ -629,7 +620,7 @@ do
# execute post-test commands # execute post-test commands
# #
cecho-n "post.." echo -n "post"
echo -e "\nPOST-TEST\n" >> $CONSOLE_LOG 2>&1 echo -e "\nPOST-TEST\n" >> $CONSOLE_LOG 2>&1
eval `awk -F "::" '{ eval `awk -F "::" '{
@@ -694,11 +685,11 @@ do
if [ $STATUS = "passed" ] if [ $STATUS = "passed" ]
then then
COLOR="green" COLOR="green"
cecho "\033[1;32m$STATUS" log_status 0
else else
COLOR="red" COLOR="red"
cecho "$STATUS" log_status 1
fi fi
cat >> $TESTRESULTSHTML << @EOF cat >> $TESTRESULTSHTML << @EOF
@@ -773,10 +764,10 @@ cat >> $INDEX << @EOF
</html> </html>
@EOF @EOF
cecho "" echo
cecho "\033[1;32mPassed: $passed_cnt" echo_ok "Passed : $passed_cnt"
cecho "Failed: $failed_cnt" echo_failed "Failed : $failed_cnt"
cecho "" echo
############################################################################## ##############################################################################
@@ -785,18 +776,16 @@ cecho ""
HTDOCS="/var/www" HTDOCS="/var/www"
cecho-n "Copying test results to winnetou.."
ssh $SSHCONF root@${ipv4_winnetou} mkdir -p $HTDOCS/testresults > /dev/null 2>&1 ssh $SSHCONF root@${ipv4_winnetou} mkdir -p $HTDOCS/testresults > /dev/null 2>&1
scp $SSHCONF -r $TODAYDIR root@${ipv4_winnetou}:$HTDOCS/testresults > /dev/null 2>&1 scp $SSHCONF -r $TODAYDIR root@${ipv4_winnetou}:$HTDOCS/testresults > /dev/null 2>&1
ssh $SSHCONF root@${ipv4_winnetou} ln -s $HTDOCS/images $HTDOCS/testresults/$TESTDATE/images > /dev/null 2>&1 ssh $SSHCONF root@${ipv4_winnetou} ln -s $HTDOCS/images $HTDOCS/testresults/$TESTDATE/images > /dev/null 2>&1
cgecho "done" echo
cecho "" echo "The results are available in $TODAYDIR"
cecho "The results are available in $TODAYDIR" echo "or via the link http://$ipv4_winnetou/testresults/$TESTDATE"
cecho "or via the link http://$ipv4_winnetou/testresults/$TESTDATE"
ENDDATE=`date +%Y%m%d-%H%M` ENDDATE=`date +%Y%m%d-%H%M`
cecho "" echo
cecho "Finished: $ENDDATE" echo "Finished : $ENDDATE"
########################################################################## ##########################################################################
# close ssh sessions # close ssh sessions
testing/scripts/function.sh
+14
View File
@@ -55,6 +55,20 @@ execute_chroot()
execute "chroot $LOOPDIR $@" execute "chroot $LOOPDIR $@"
} }
# write green status message to console
# $1 - msg
echo_ok()
{
echo -e "${GREEN}$1${NORMAL}"
}
# write red status message to console
# $1 - msg
echo_failed()
{
echo -e "${RED}$1${NORMAL}"
}
function cecho { function cecho {
echo -e "\033[1;31m$1\033[0m" echo -e "\033[1;31m$1\033[0m"
} }