Skip to content

Commit

Permalink
Merge pull request #17 from ggtakec/master
Browse files Browse the repository at this point in the history 
Reflected the spelling check result for all sources(2)
  • Loading branch information
@ggtakec
ggtakec authored Jan 15, 2019
2 parents d51f9e4 + efe8072 commit 9995e9a
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 97 deletions.
25 changes: 0 additions & 25 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,31 +139,6 @@ tests/results.xml
tests/k2htpdtorserver
tests/k2htpdtorclient

#
# buildutils
#
buildutils/custom/*_Makefile
buildutils/custom/*.yicf

#
# yahoo build
#
x86_64-linux-gcc
x86_64-linux-gcc/*
x86_64-linux-gcc.gcov
x86_64-linux-gcc.gcov/*
*/x86_64-linux-gcc
*/x86_64-linux-gcc/*
*/x86_64-linux-gcc.gcov
*/x86_64-linux-gcc.gcov/*
*.gcov
*.gcno
*.gcov.html
rhel.*.depend
rhel.*.package
coverage
coverage/*

#
# VIM modelines
#
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ k2htp_dtor
k2htpdtor is for K2HASH TRANSACTION PLUGIN.

### Overview
K2HASH TRANSACTION PLUGIN is programable I/F for processing transaction
K2HASH TRANSACTION PLUGIN is programmable I/F for processing transaction
data from modifying K2HASH data.
This k2htp_dtor project is the base templates for building K2HASH
TRANSACTION PLUGIN.
Expand Down
71 changes: 0 additions & 71 deletions tests/dtor_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,53 +15,6 @@
# REVISION:
#

##############################################################
### Make result xml function
###
### Usage: put_result_xml <result:OK/NG> <output file path>
###
put_result_xml_func()
{
if [ $# -ne 2 ]; then
return 1
fi
TESTRESULT=$1
XMLOUTPUTFILE=$2

if [ "X$XMLOUTPUTFILE" != "X" ]; then
echo "<?xml version=\"1.0\" encoding='ISO-8859-1' standalone='yes' ?>" > $XMLOUTPUTFILE
echo "<TestRun>" >> $XMLOUTPUTFILE

if [ "X$TESTRESULT" != "XOK" ]; then
echo " <FailedTests>" >> $XMLOUTPUTFILE
echo " <Test id=\"1\">" >> $XMLOUTPUTFILE
echo " <Name>Test Script</Name>" >> $XMLOUTPUTFILE
echo " </Test>" >> $XMLOUTPUTFILE
echo " </FailedTests>" >> $XMLOUTPUTFILE
echo " <Statistics>" >> $XMLOUTPUTFILE
echo " <Tests>1</Tests>" >> $XMLOUTPUTFILE
echo " <FailuresTotal>1</FailuresTotal>" >> $XMLOUTPUTFILE
echo " <Errors>1</Errors>" >> $XMLOUTPUTFILE
echo " <Failures>1</Failures>" >> $XMLOUTPUTFILE
echo " </Statistics>" >> $XMLOUTPUTFILE
else
echo " <SuccessfulTests>" >> $XMLOUTPUTFILE
echo " <Test id=\"1\">" >> $XMLOUTPUTFILE
echo " <Name>TestScript</Name>" >> $XMLOUTPUTFILE
echo " </Test>" >> $XMLOUTPUTFILE
echo " </SuccessfulTests>" >> $XMLOUTPUTFILE
echo " <Statistics>" >> $XMLOUTPUTFILE
echo " <Tests>1</Tests>" >> $XMLOUTPUTFILE
echo " <FailuresTotal>0</FailuresTotal>" >> $XMLOUTPUTFILE
echo " <Errors>0</Errors>" >> $XMLOUTPUTFILE
echo " <Failures>0</Failures>" >> $XMLOUTPUTFILE
echo " </Statistics>" >> $XMLOUTPUTFILE
fi

echo "</TestRun>" >> $XMLOUTPUTFILE
fi
}

##############################################################
## library path & programs path
##############################################################
Expand Down Expand Up @@ -92,7 +45,6 @@ elif [ -f ${K2HTPBINDIR}/k2htpdtorsvr ]; then
else
echo "ERROR: there is no k2htpdtorsvr binary"
echo "RESULT --> FAILED"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi
if [ -f ${K2HTPSCRIPTDIR}/${OBJDIR}/k2htpdtorclient ]; then
Expand All @@ -102,7 +54,6 @@ elif [ -f ${K2HTPSCRIPTDIR}/k2htpdtorclient ]; then
else
echo "ERROR: there is no k2htpdtorclient binary"
echo "RESULT --> FAILED"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi
if [ -f ${K2HTPLIBDIR}/${OBJDIR}/libk2htpdtor.so.1 ]; then
Expand All @@ -114,7 +65,6 @@ elif [ -f ${K2HTPLIBDIR}/libk2htpdtor.so.1 ]; then
else
echo "ERROR: there is no libk2htpdtor.so.1 binary"
echo "RESULT --> FAILED"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

Expand Down Expand Up @@ -305,23 +255,20 @@ if [ "X${DO_INI_CONF}" = "Xyes" ]; then
if [ $? -ne 0 ]; then
echo "RESULT --> FAILED"
echo "(compare dtor_test_trans_slave_archive.log and dtor_test_slave_archive.log)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

cmp /tmp/k2hftdtorsvr_trans_archive.log /tmp/k2hftdtorsvr_archive.log > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo "RESULT --> FAILED"
echo "(compare k2hftdtorsvr_trans_archive.log and k2hftdtorsvr_archive.log)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

diff /tmp/k2hftdtorsvr_trans_plugin.log /tmp/k2hftdtorsvr_plugin.log > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo "RESULT --> FAILED"
echo "(compare k2hftdtorsvr_trans_plugin.log and k2hftdtorsvr_plugin.log)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

Expand All @@ -332,7 +279,6 @@ if [ "X${DO_INI_CONF}" = "Xyes" ]; then
if [ $DTOR_AR_LOGCNT -ne $SVR_AR_LOGCNT -o $DTOR_AR_LOGCNT -ne $PLUGIN_LOGCNT ]; then
echo "RESULT --> FAILED"
echo "(archive log line count is different)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

Expand Down Expand Up @@ -456,23 +402,20 @@ if [ "X${DO_YAML_CONF}" = "Xyes" ]; then
if [ $? -ne 0 ]; then
echo "RESULT --> FAILED"
echo "(compare dtor_test_trans_slave_archive.log and dtor_test_slave_archive.log)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

cmp /tmp/k2hftdtorsvr_trans_archive.log /tmp/k2hftdtorsvr_archive.log > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo "RESULT --> FAILED"
echo "(compare k2hftdtorsvr_trans_archive.log and k2hftdtorsvr_archive.log)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

diff /tmp/k2hftdtorsvr_trans_plugin.log /tmp/k2hftdtorsvr_plugin.log > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo "RESULT --> FAILED"
echo "(compare k2hftdtorsvr_trans_plugin.log and k2hftdtorsvr_plugin.log)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

Expand All @@ -483,7 +426,6 @@ if [ "X${DO_YAML_CONF}" = "Xyes" ]; then
if [ $DTOR_AR_LOGCNT -ne $SVR_AR_LOGCNT -o $DTOR_AR_LOGCNT -ne $PLUGIN_LOGCNT ]; then
echo "RESULT --> FAILED"
echo "(archive log line count is different)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

Expand Down Expand Up @@ -607,23 +549,20 @@ if [ "X${DO_JSON_CONF}" = "Xyes" ]; then
if [ $? -ne 0 ]; then
echo "RESULT --> FAILED"
echo "(compare dtor_test_trans_slave_archive.log and dtor_test_slave_archive.log)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

cmp /tmp/k2hftdtorsvr_trans_archive.log /tmp/k2hftdtorsvr_archive.log > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo "RESULT --> FAILED"
echo "(compare k2hftdtorsvr_trans_archive.log and k2hftdtorsvr_archive.log)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

diff /tmp/k2hftdtorsvr_trans_plugin.log /tmp/k2hftdtorsvr_plugin.log > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo "RESULT --> FAILED"
echo "(compare k2hftdtorsvr_trans_plugin.log and k2hftdtorsvr_plugin.log)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

Expand All @@ -634,7 +573,6 @@ if [ "X${DO_JSON_CONF}" = "Xyes" ]; then
if [ $DTOR_AR_LOGCNT -ne $SVR_AR_LOGCNT -o $DTOR_AR_LOGCNT -ne $PLUGIN_LOGCNT ]; then
echo "RESULT --> FAILED"
echo "(archive log line count is different)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

Expand Down Expand Up @@ -757,23 +695,20 @@ if [ "X${DO_JSON_STRING}" = "Xyes" ]; then
if [ $? -ne 0 ]; then
echo "RESULT --> FAILED"
echo "(compare dtor_test_trans_slave_archive.log and dtor_test_slave_archive.log)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

cmp /tmp/k2hftdtorsvr_trans_archive.log /tmp/k2hftdtorsvr_archive.log > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo "RESULT --> FAILED"
echo "(compare k2hftdtorsvr_trans_archive.log and k2hftdtorsvr_archive.log)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

diff /tmp/k2hftdtorsvr_trans_plugin.log /tmp/k2hftdtorsvr_plugin.log > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo "RESULT --> FAILED"
echo "(compare k2hftdtorsvr_trans_plugin.log and k2hftdtorsvr_plugin.log)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

Expand All @@ -784,7 +719,6 @@ if [ "X${DO_JSON_STRING}" = "Xyes" ]; then
if [ $DTOR_AR_LOGCNT -ne $SVR_AR_LOGCNT -o $DTOR_AR_LOGCNT -ne $PLUGIN_LOGCNT ]; then
echo "RESULT --> FAILED"
echo "(archive log line count is different)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

Expand Down Expand Up @@ -907,23 +841,20 @@ if [ "X${DO_JSON_ENV}" = "Xyes" ]; then
if [ $? -ne 0 ]; then
echo "RESULT --> FAILED"
echo "(compare dtor_test_trans_slave_archive.log and dtor_test_slave_archive.log)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

cmp /tmp/k2hftdtorsvr_trans_archive.log /tmp/k2hftdtorsvr_archive.log > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo "RESULT --> FAILED"
echo "(compare k2hftdtorsvr_trans_archive.log and k2hftdtorsvr_archive.log)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

diff /tmp/k2hftdtorsvr_trans_plugin.log /tmp/k2hftdtorsvr_plugin.log > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo "RESULT --> FAILED"
echo "(compare k2hftdtorsvr_trans_plugin.log and k2hftdtorsvr_plugin.log)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

Expand All @@ -934,7 +865,6 @@ if [ "X${DO_JSON_ENV}" = "Xyes" ]; then
if [ $DTOR_AR_LOGCNT -ne $SVR_AR_LOGCNT -o $DTOR_AR_LOGCNT -ne $PLUGIN_LOGCNT ]; then
echo "RESULT --> FAILED"
echo "(archive log line count is different)"
put_result_xml_func NG ${XMLRESULTSFILE}
exit 1
fi

Expand All @@ -961,7 +891,6 @@ rm -f /tmp/k2htpdtorsvr_np_*

echo ""
echo "====== Finish all =========================================="
put_result_xml_func OK ${XMLRESULTSFILE}
exit 0

#
Expand Down

0 comments on commit 9995e9a

Please sign in to comment.