aboutsummaryrefslogtreecommitdiff
path: root/contrib/mysql
diff options
context:
space:
mode:
authorBen Elliston <bje@gnu.org>2018-07-20 13:48:33 +1000
committerBen Elliston <bje@gnu.org>2018-07-20 13:48:33 +1000
commitde9a1cae6716032501e87fc6d80a527f21c786ca (patch)
treeccaa0b8c833ec289ed388491c42f7b88d939c207 /contrib/mysql
parent4fe160b03cf9023360ec88b764d0fd8596bf0969 (diff)
downloaddejagnu-de9a1cae6716032501e87fc6d80a527f21c786ca.zip
dejagnu-de9a1cae6716032501e87fc6d80a527f21c786ca.tar.gz
dejagnu-de9a1cae6716032501e87fc6d80a527f21c786ca.tar.bz2
* contrib/compare_tests: Eliminate Shellcheck warnings.
* contrib/mysql/sum2xml.sh: Likewise. Warnings fixed: Use single quotes, otherwise this expands now rather than when signalled. [SC2064] Trapping signals by number is not well defined. Prefer signal names. [SC2172] SIGKILL/SIGSTOP can not be trapped. [SC2173] Trapping signals by number is not well defined. Prefer signal names. [SC2172] Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. [SC2181] read without -r will mangle backslashes. [SC2162] egrep is non-standard and deprecated. Use grep -E instead. [SC2196]
Diffstat (limited to 'contrib/mysql')
-rw-r--r--contrib/mysql/sum2xml.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/mysql/sum2xml.sh b/contrib/mysql/sum2xml.sh
index f642a48..e8f49ee 100644
--- a/contrib/mysql/sum2xml.sh
+++ b/contrib/mysql/sum2xml.sh
@@ -70,7 +70,7 @@ echo "<testsuite>" >> "$outfile"
${decomp} "$infile"
infile=$(echo "$infile" | sed -e 's:\.xz::' -e 's:\.gz::')
-while read line
+while read -r line
do
# ignore blank lines
if test x"${line}" = x; then
@@ -84,7 +84,7 @@ do
if test "$(echo "$line" | grep -c Summary)" -gt 0; then
break
fi
- valid=$(echo "$line" | egrep -c 'PASS|FAIL|UNTESTED|UNSUPPORTED|UNRESOLVED')
+ valid=$(echo "$line" | grep -E -c 'PASS|FAIL|UNTESTED|UNSUPPORTED|UNRESOLVED')
if test "$valid" -eq 0; then
continue
fi