зеркало из https://github.com/mozilla/pjs.git
Bug 193055: the "cat ${file} | while read ...do ... done" construct does
not work under MKS Korn shell on Windows XP. Replaced it by the equivalent construct "while read ... do ... done < ${file}".
This commit is contained in:
Родитель
fdb4a6ca04
Коммит
43ac537225
|
@ -200,7 +200,7 @@ ssl_cov()
|
||||||
|
|
||||||
p=""
|
p=""
|
||||||
|
|
||||||
cat ${SSLCOV} | while read tls param testname
|
while read tls param testname
|
||||||
do
|
do
|
||||||
p=`echo "$testname" | sed -e "s/ .*//"` #sonmi, only run extended test on SSL3 and TLS
|
p=`echo "$testname" | sed -e "s/ .*//"` #sonmi, only run extended test on SSL3 and TLS
|
||||||
|
|
||||||
|
@ -226,7 +226,7 @@ ssl_cov()
|
||||||
rm ${TMP}/$HOST.tmp.$$ 2>/dev/null
|
rm ${TMP}/$HOST.tmp.$$ 2>/dev/null
|
||||||
html_msg $ret 0 "${testname}"
|
html_msg $ret 0 "${testname}"
|
||||||
fi
|
fi
|
||||||
done
|
done < ${SSLCOV}
|
||||||
|
|
||||||
kill_selfserv
|
kill_selfserv
|
||||||
html "</TABLE><BR>"
|
html "</TABLE><BR>"
|
||||||
|
@ -239,7 +239,7 @@ ssl_auth()
|
||||||
{
|
{
|
||||||
html_head "SSL Client Authentication $NORM_EXT"
|
html_head "SSL Client Authentication $NORM_EXT"
|
||||||
|
|
||||||
cat ${SSLAUTH} | while read value sparam cparam testname
|
while read value sparam cparam testname
|
||||||
do
|
do
|
||||||
if [ $value != "#" ]; then
|
if [ $value != "#" ]; then
|
||||||
cparam=`echo $cparam | sed -e 's;_; ;g' -e "s/TestUser/$USER_NICKNAME/g" `
|
cparam=`echo $cparam | sed -e 's;_; ;g' -e "s/TestUser/$USER_NICKNAME/g" `
|
||||||
|
@ -259,7 +259,7 @@ ssl_auth()
|
||||||
"produced a returncode of $ret, expected is $value"
|
"produced a returncode of $ret, expected is $value"
|
||||||
kill_selfserv
|
kill_selfserv
|
||||||
fi
|
fi
|
||||||
done
|
done < ${SSLAUTH}
|
||||||
|
|
||||||
html "</TABLE><BR>"
|
html "</TABLE><BR>"
|
||||||
}
|
}
|
||||||
|
@ -272,7 +272,7 @@ ssl_stress()
|
||||||
{
|
{
|
||||||
html_head "SSL Stress Test $NORM_EXT"
|
html_head "SSL Stress Test $NORM_EXT"
|
||||||
|
|
||||||
cat ${SSLSTRESS} | while read value sparam cparam testname
|
while read value sparam cparam testname
|
||||||
do
|
do
|
||||||
p=`echo "$testname" | sed -e "s/Stress //" -e "s/ .*//"` #sonmi, only run extended test on SSL3 and TLS
|
p=`echo "$testname" | sed -e "s/Stress //" -e "s/ .*//"` #sonmi, only run extended test on SSL3 and TLS
|
||||||
if [ "$p" = "SSL2" -a "$NORM_EXT" = "Extended test" ] ; then
|
if [ "$p" = "SSL2" -a "$NORM_EXT" = "Extended test" ] ; then
|
||||||
|
@ -299,7 +299,7 @@ ssl_stress()
|
||||||
fi
|
fi
|
||||||
kill_selfserv
|
kill_selfserv
|
||||||
fi
|
fi
|
||||||
done
|
done < ${SSLSTRESS}
|
||||||
|
|
||||||
html "</TABLE><BR>"
|
html "</TABLE><BR>"
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче