|
From: Chris B. <buc...@us...> - 2013-01-23 21:43:07
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCB - Small Footprint CIM Broker".
The branch, master has been updated
via 5cf6c002667121d5ecf9d5036c682582e4e16dee (commit)
via ff90f07e9874e2d412a21f710ea3ab031a6a93a3 (commit)
from e7f1871e88f39d84971a24ac3050581fdb793789 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5cf6c002667121d5ecf9d5036c682582e4e16dee
Merge: ff90f07 e7f1871
Author: buccella <buc...@li...>
Date: Wed Jan 23 16:42:33 2013 -0500
Merge branch 'master' of ssh://sblim.git.sourceforge.net/gitroot/sblim/sfcb
commit ff90f07e9874e2d412a21f710ea3ab031a6a93a3
Author: buccella <buc...@li...>
Date: Wed Jan 23 16:42:15 2013 -0500
mark "FAILED" messages as red on the console
-----------------------------------------------------------------------
Summary of changes:
diff --git a/test/TestProviders/tests/xmltest.sh b/test/TestProviders/tests/xmltest.sh
index b023e9d..52d3601 100755
--- a/test/TestProviders/tests/xmltest.sh
+++ b/test/TestProviders/tests/xmltest.sh
@@ -23,6 +23,8 @@
_RC=0
TESTDIR=.
+red='\e[0;31m' # red, to change FAILED output color
+unred='\e[0m' # no color
# Check for wbemcat utility
if ! which wbemcat > /dev/null; then
@@ -62,7 +64,9 @@ do
fi
if [ $? -ne 0 ]; then
+ echo -ne $red
echo "FAILED to send CIM-XML request"
+ echo -ne $unred
_RC=1
continue
fi
@@ -71,7 +75,9 @@ do
# Either using a full copy of the expected output (testname.OK)
if [ -f $_TESTOK ] ; then
if ! diff --brief $_TESTOK $_TESTRESULT > /dev/null; then
+ echo -ne $red
echo "FAILED output not as expected"
+ echo -ne $unred
_RC=1;
continue
@@ -93,7 +99,9 @@ do
text=$(echo $line | awk '{ line=substr($line, 2); print line; }' )
if grep --q "$text" $_TESTRESULT ; then
if [ $passed -eq 0 ] ; then
+ echo -ne $red
echo "FAILED disallowed line found"
+ echo -ne $unred
passed=1
_RC=1;
fi
@@ -104,7 +112,9 @@ do
# Check for required lines
if ! grep --q "$line" $_TESTRESULT ; then
if [ $passed -eq 0 ] ; then
+ echo -ne $red
echo "FAILED required line not found"
+ echo -ne $unred
passed=1
_RC=1;
fi
diff --git a/test/xmltest/xmltest.sh b/test/xmltest/xmltest.sh
index 105c378..d4a0e15 100755
--- a/test/xmltest/xmltest.sh
+++ b/test/xmltest/xmltest.sh
@@ -23,6 +23,8 @@
_RC=0
TESTDIR=.
+red='\e[0;31m' # red, to change FAILED output color
+unred='\e[0m' # no color
# Check for wbemcat utility
if ! which wbemcat > /dev/null; then
@@ -67,7 +69,9 @@ do
fi
if [ $? -ne 0 ]; then
+ echo -ne $red
echo "FAILED to send CIM-XML request"
+ echo -ne $unred
trc=1
continue
fi
@@ -76,7 +80,9 @@ do
# Either using a full copy of the expected output (testname.OK)
if [ -f $_TESTOK ] ; then
if ! diff --brief $_TESTOK $_TESTRESULT > /dev/null; then
+ echo -ne $red
echo -n "FAILED output not as expected"
+ echo -ne $unred
trc=1;
# We got the expected response XML
else
@@ -107,7 +113,9 @@ do
# Check for required lines
if ! grep --q "$line" $_TESTRESULT ; then
if [ $passed -eq 0 ] ; then
+ echo -ne $red
echo -n "FAILED required line not found"
+ echo -ne $unred
passed=1
trc=1;
fi
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|