Whitespace characters during grep operation
diff --git a/buildMilestoneList-cron.sh b/buildMilestoneList-cron.sh
index 2a89763..befe894 100755
--- a/buildMilestoneList-cron.sh
+++ b/buildMilestoneList-cron.sh
@@ -40,18 +40,18 @@
file=`ls | sort -r | grep -m1 ${pattern}`
prev=`ls ${BaseDownloadNFSDir}/milestones/${version}/${last}/${hostdir} | sort -r | grep -m1 ${pattern}`
if [ "${prev}" != "" ] ; then
- expected=`cat ${BaseDownloadNFSDir}/milestones/${version}/${last}/${hostdir}/${prev} | grep -m1 "^<td>[0-9]" | cut -d">" -f2 | cut -d"<" -f1`
+ expected=`cat ${BaseDownloadNFSDir}/milestones/${version}/${last}/${hostdir}/${prev} | grep -m1 "^[[:space:]]*<td>[0-9]" | cut -d">" -f2 | cut -d"<" -f1`
else
# If the previous run didn't have this file, then expected result is 0
expected=0
fi
if [ "${file}" != "" ] ; then
- actual=`cat ${file} | grep -m1 "^<td>[0-9]" | cut -d">" -f2 | cut -d"<" -f1`
+ actual=`cat ${file} | grep -m1 "^[[:space:]]*<td>[0-9]" | cut -d">" -f2 | cut -d"<" -f1`
if [ ${expected} -eq 0 ] ; then
expected=${actual}
fi
- failures=`cat ${file} | grep -m1 "^<td>[0-9]" | cut -d">" -f4 | cut -d"<" -f1`
- errors=`cat ${file} | grep -m1 "^<td>[0-9]" | cut -d">" -f6 | cut -d"<" -f1`
+ failures=`cat ${file} | grep -m1 "^[[:space:]]*<td>[0-9]" | cut -d">" -f4 | cut -d"<" -f1`
+ errors=`cat ${file} | grep -m1 "^[[:space:]]*<td>[0-9]" | cut -d">" -f6 | cut -d"<" -f1`
test_result=`expr ${failures} + ${errors}`
else
# If the file doesn't exist (tests weren't run yet) then all values should be zero
diff --git a/buildNightlyList-cron.sh b/buildNightlyList-cron.sh
index c6dfc54..906ce8a 100755
--- a/buildNightlyList-cron.sh
+++ b/buildNightlyList-cron.sh
@@ -42,18 +42,18 @@
file=`ls | sort -r | grep -m1 ${pattern}`
prev=`ls ${BaseDownloadNFSDir}/nightly/${version}/${last}/${hostdir} | sort -r | grep -m1 ${pattern}`
if [ "${prev}" != "" ] ; then
- expected=`cat ${BaseDownloadNFSDir}/nightly/${version}/${last}/${hostdir}/${prev} | grep -m1 "^<td>[0-9]" | cut -d">" -f2 | cut -d"<" -f1`
+ expected=`cat ${BaseDownloadNFSDir}/nightly/${version}/${last}/${hostdir}/${prev} | grep -m1 "^[[:space:]]*<td>[0-9]" | cut -d">" -f2 | cut -d"<" -f1`
else
# If the previous run didn't have this file, then expected result is 0
expected=0
fi
if [ "${file}" != "" ] ; then
- actual=`cat ${file} | grep -m1 "^<td>[0-9]" | cut -d">" -f2 | cut -d"<" -f1`
+ actual=`cat ${file} | grep -m1 "^[[:space:]]*<td>[0-9]" | cut -d">" -f2 | cut -d"<" -f1`
if [ ${expected} -eq 0 ] ; then
expected=${actual}
fi
- failures=`cat ${file} | grep -m1 "^<td>[0-9]" | cut -d">" -f4 | cut -d"<" -f1`
- errors=`cat ${file} | grep -m1 "^<td>[0-9]" | cut -d">" -f6 | cut -d"<" -f1`
+ failures=`cat ${file} | grep -m1 "^[[:space:]]*<td>[0-9]" | cut -d">" -f4 | cut -d"<" -f1`
+ errors=`cat ${file} | grep -m1 "^[[:space:]]*<td>[0-9]" | cut -d">" -f6 | cut -d"<" -f1`
test_result=`expr ${failures} + ${errors}`
else
# If the file doesn't exist (tests weren't run yet) then all values should be zero
diff --git a/buildResultsSummaries.sh b/buildResultsSummaries.sh
index 5848943..6846cc2 100755
--- a/buildResultsSummaries.sh
+++ b/buildResultsSummaries.sh
@@ -29,18 +29,18 @@
file=`ls | sort -r | grep -m1 ${pattern}`
prev=`ls ${BaseDownloadNFSDir}/nightly/${version}/${last}/${hostdir} | sort -r | grep -m1 ${pattern}`
if [ "${prev}" != "" ] ; then
- expected=`cat ${BaseDownloadNFSDir}/nightly/${version}/${last}/${hostdir}/${prev} | grep -m1 "^<td>[0-9]" | cut -d">" -f2 | cut -d"<" -f1`
+ expected=`cat ${BaseDownloadNFSDir}/nightly/${version}/${last}/${hostdir}/${prev} | grep -m1 "^[[:space:]]*<td>[0-9]" | cut -d">" -f2 | cut -d"<" -f1`
else
# If the previous run didn't have this file, then expected result is 0
expected=0
fi
if [ "${file}" != "" ] ; then
- actual=`cat ${file} | grep -m1 "^<td>[0-9]" | cut -d">" -f2 | cut -d"<" -f1`
+ actual=`cat ${file} | grep -m1 "^[[:space:]]*<td>[0-9]" | cut -d">" -f2 | cut -d"<" -f1`
if [ ${expected} -eq 0 ] ; then
expected=${actual}
fi
- failures=`cat ${file} | grep -m1 "^<td>[0-9]" | cut -d">" -f4 | cut -d"<" -f1`
- errors=`cat ${file} | grep -m1 "^<td>[0-9]" | cut -d">" -f6 | cut -d"<" -f1`
+ failures=`cat ${file} | grep -m1 "^[[:space:]]*<td>[0-9]" | cut -d">" -f4 | cut -d"<" -f1`
+ errors=`cat ${file} | grep -m1 "^[[:space:]]*<td>[0-9]" | cut -d">" -f6 | cut -d"<" -f1`
test_result=`expr ${failures} + ${errors}`
else
# If the file doesn't exist (tests weren't run yet) then all values should be zero
