Commit 76b7259e authored by wwalkowski's avatar wwalkowski

No commit message

No commit message
parent 36eacb20
......@@ -11,46 +11,52 @@ export LOGFILE=$BASEDIR/CTTController.log
while [ 1 ]
do
# delete sikuli log prior to each run
rm -f /cygdrive/c/sikuliLog.txt
# Sleep until it is time to launch the tool
sh ./sleep.sh
# bash ./sleep.sh
rm -f $LOGFILE
#####################################################################################
echo "---------------------------------------------------------------------------------"
echo "Waiting for Ready from RI Controller to launch DLNA CTT at `date`" | tee -a $LOGFILE
sh ./getReady.sh $LOGFILE
bash ./getReady.sh $LOGFILE
echo "Launching DLNA CTT at `date`" | tee -a $LOGFILE
sh ./dlnaCttLauncher.sh $LOGFILE
bash ./dlnaCttLauncher.sh $LOGFILE
#####################################################################################
# MCVT can be launched using the DLNA RI config, without restart
echo "---------------------------------------------------------------------------------"
echo "Launching MCVT CTT at `date`" | tee -a $LOGFILE
sh ./mcvtCttLauncher.sh $LOGFILE
bash ./mcvtCttLauncher.sh $LOGFILE
#####################################################################################
echo "---------------------------------------------------------------------------------"
echo "Sending Ready to RI Controller to restart for UPnP CTT at `date`" | tee -a $LOGFILE
sh ./sendReady.sh $LOGFILE
bash ./sendReady.sh $LOGFILE
echo "Getting Ready from RI Controller to launch UPnP CTT at `date`" | tee -a $LOGFILE
sh ./getReady.sh $LOGFILE
bash ./getReady.sh $LOGFILE
echo "Launching UPnP CTT at `date`" | tee -a $LOGFILE
sh ./upnpCttLauncher.sh $LOGFILE
bash ./upnpCttLauncher.sh $LOGFILE
#####################################################################################
echo "Sending Ready to RI Controller to restart for LPTT CTT at `date`" | tee -a $LOGFILE
sh ./sendReady.sh $LOGFILE
# echo "Sending Ready to RI Controller to restart for LPTT CTT at `date`" | tee -a $LOGFILE
# bash ./sendReady.sh $LOGFILE
echo "Getting Ready from RI Controller to launch LPTT CTT at `date`" | tee -a $LOGFILE
sh ./getReady.sh $LOGFILE
# echo "Getting Ready from RI Controller to launch LPTT CTT at `date`" | tee -a $LOGFILE
# bash ./getReady.sh $LOGFILE
echo "Launching LPTT CTT at `date`" | tee -a $LOGFILE
sh ./lpttCttLauncher.sh $LOGFILE
# echo "Launching LPTT CTT at `date`" | tee -a $LOGFILE
# bash ./lpttCttLauncher.sh $LOGFILE
#####################################################################################
......@@ -58,6 +64,7 @@ do
# and use the sleep.sh to fine tune the sleep once we
# get close. This will prevent large amounts of emails
# if something went wrong.
echo "---------------------------------------------------------------------------------"
echo "Sleeping 12 hours at `date`" | tee -a $LOGFILE
sleep 12h
......
......@@ -13,6 +13,9 @@ echo o
# Remove any existing result files in case the CTT was run manually.
rm -f /cygdrive/c/bamboo/xml-data/build-dir/OCDLNA-DLNAUPNP-RDLNA/test-reports/source/*.trf
# Remove diffs file before running
rm -f /cygdrive/c/diffs.txt
# Run CTT/Sikuli
cd /cygdrive/c/bamboo/xml-data/build-dir/OCDLNA-DLNAUPNP-RDLNA
ant dlna.ctt.runREAL
......@@ -46,9 +49,22 @@ then
mv /cygdrive/c/outputResults.csv /cygdrive/c/dlnaCttTestResultsSummary.csv
cd "/cygdrive/c/Subversion/QA/dlna_ctt/MarketDMS Automated Results/"
# diff last 2 CSV files
mv dlnaCttTestResultsSummary.csv dlnaCttTestResultsSummary_last.csv
# Copy csv file to SVN directory for checking in
cp /cygdrive/c/dlnaCttTestResultsSummary.csv .
diff -u <(sed 's/,201.*//g' dlnaCttTestResultsSummary_last.csv) <(sed 's/,201.*//g' dlnaCttTestResultsSummary.csv) | grep "^+PASSED\|^+FAILED\|^+WARNING" > /cygdrive/c/diffs.txt
cd - >/dev/null 2>&1
email All < /cygdrive/c/outputCount.txt \
-s "Automated DLNA CTT test results" \
-a /cygdrive/c/dlnaCttTestResults.zip \
-a /cygdrive/c/diffs.txt \
-a /cygdrive/c/dlnaCttTestResultsSummary.csv
# Copy csv file to SVN directory for checking in
......
......@@ -14,6 +14,9 @@ echo o
rm -f /cygdrive/c/*.trf
rm -f "/cygdrive/c/Users/dlna_build/Documents/Digital Living Network Alliance/MCVT/Logs/"*.trf
# Remove diffs file before running
rm -f /cygdrive/c/diffs.txt
# Run MCVT/Sikuli
cd /cygdrive/c/bamboo/xml-data/build-dir/OCDLNA-DLNAUPNP-RDLNA
ant mcvt.ctt.runREAL
......@@ -43,7 +46,19 @@ then
echo o
mv /cygdrive/c/outputResults.csv /cygdrive/c/mcvtCttTestResultsSummary.csv
cd "/cygdrive/c/Subversion/QA/mcvt_ctt/MarketDMS Automated Results/"
# diff last 2 CSV files
mv mcvtCttTestResultsSummary.csv mcvtCttTestResultsSummary_last.csv
# Copy csv file to SVN directory for checking in
cp /cygdrive/c/mcvtCttTestResultsSummary.csv .
diff -u <(sed 's/,201.*//g' mcvtCttTestResultsSummary_last.csv) <(sed 's/,201.*//g' mcvtCttTestResultsSummary.csv) | grep "^+PASSED\|^+FAILED\|^+WARNING" > /cygdrive/c/diffs.txt
cd - >/dev/null 2>&1
# The java code adds a message that the files can be found in SVN,
# but we need to change that message to refer to mcvt directory
# instead of dlna directory
......@@ -52,6 +67,7 @@ then
email All < /cygdrive/c/mcvtOutputCount.txt \
-s "Automated MCVT CTT test results" \
-a /cygdrive/c/mcvtCttTestResults.zip \
-a /cygdrive/c/diffs.txt \
-a /cygdrive/c/mcvtCttTestResultsSummary.csv
rm -f /cygdrive/c/mcvtOutputCount.txt
......
......@@ -13,9 +13,14 @@ echo o
rm -f /cygdrive/c/upnpCttTestResults.uctt
rm -f /cygdrive/c/upnpCttTestResultsSummary.csv
# Remove diffs file before running
rm -f /cygdrive/c/diffs.txt
# Run CTT/Sikuli
echo "UPnP CTT Launcher launching Sikuli at `date`" | tee -a $LOGFILE
cd /cygdrive/c/bamboo/xml-data/build-dir/OCDLNA-DLNAUPNP-RDLNA
ant upnp.ctt.runREAL
echo "UPnP CTT Launcher Sikuli is complete at `date`" | tee -a $LOGFILE
cd - > /dev/null 2>&1
# Zip and email the results file
......@@ -39,16 +44,27 @@ then
echo o
echo o UPnP CTT test run succeeded, emailing results
echo o
mv /cygdrive/c/outputResults.csv /cygdrive/c/upnpCttTestResultsSummary.csv
cd "/cygdrive/c/Subversion/QA/upnp_ctt/MarketDMS Automated Results/"
# diff last 2 CSV files
mv upnpCttTestResultsSummary.csv upnpCttTestResultsSummary_last.csv
# Copy csv file to SVN directory for checking in
cp /cygdrive/c/upnpCttTestResultsSummary.csv .
diff -u <(sed 's/,201.*//g' upnpCttTestResultsSummary_last.csv) <(sed 's/,201.*//g' upnpCttTestResultsSummary.csv) | grep "^+PASSED\|^+FAILED\|^+WARNING" > /cygdrive/c/diffs.txt
cd - >/dev/null 2>&1
email All < /cygdrive/c/outputCount.txt \
-s "Automated UPnP CTT test results" \
-a /cygdrive/c/upnpCttTestResults.zip \
-a /cygdrive/c/diffs.txt \
-a /cygdrive/c/upnpCttTestResultsSummary.csv
# Copy csv file to SVN directory for checking in
mv /cygdrive/c/upnpCttTestResultsSummary.csv "/cygdrive/c/Subversion/QA/upnp_ctt/MarketDMS Automated Results/"
# Copy uctt file to SVN directory for checking in
mv /cygdrive/c/upnpCttTestResults.uctt "/cygdrive/c/Subversion/QA/upnp_ctt/MarketDMS Automated Results/"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment