diff options
| author | Daiki Ueno <dueno@redhat.com> | 2016-08-09 19:14:27 +0200 |
|---|---|---|
| committer | Daiki Ueno <dueno@redhat.com> | 2016-08-09 19:14:27 +0200 |
| commit | 45f3a3ede3434540797b5605122f87ebf1119d61 (patch) | |
| tree | 84734eec8aef3e4043f7afe12758eb4e1ce7ca56 /tests/ec | |
| parent | 477420f346be4864ca2eda92491d97a883e2f2c5 (diff) | |
| download | nss-hg-45f3a3ede3434540797b5605122f87ebf1119d61.tar.gz | |
Bug 1293944 - Make EC test programs only depend on softoken libs, r=franziskus
Diffstat (limited to 'tests/ec')
| -rwxr-xr-x | tests/ec/ecperf.sh | 7 | ||||
| -rw-r--r-- | tests/ec/ectest.sh | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/tests/ec/ecperf.sh b/tests/ec/ecperf.sh index 9dddc3959..c6723da66 100755 --- a/tests/ec/ecperf.sh +++ b/tests/ec/ecperf.sh @@ -36,17 +36,16 @@ ecperf_cleanup() { html "</TABLE><BR>" cd ${QADIR} - chmod a+rw $RONLY_DIR . common/cleanup.sh } ecperf_init -ECPERF_OUT=`ecperf` -ECPERF_OUT=`echo $ECPERF_OUT | grep -i "failed"` +ECPERF_OUT=$(ecperf 2>&1) +ECPERF_OUT=`echo $ECPERF_OUT | grep -i 'failed\|Assertion failure'` # TODO: this is a perf test we don't check for performance here but only failed if [ -n "$ECPERF_OUT" ] ; then html_failed "ec(perf) test" else html_passed "ec(perf) test" fi -ecperf_cleanup
\ No newline at end of file +ecperf_cleanup diff --git a/tests/ec/ectest.sh b/tests/ec/ectest.sh index fa2397059..70ec638b0 100644 --- a/tests/ec/ectest.sh +++ b/tests/ec/ectest.sh @@ -36,13 +36,12 @@ ectest_cleanup() { html "</TABLE><BR>" cd ${QADIR} - chmod a+rw $RONLY_DIR . common/cleanup.sh } ectest_init -ECTEST_OUT=`ectest` -ECTEST_OUT=`echo $ECTEST_OUT | grep -i "not okay"` +ECTEST_OUT=$(ectest 2>&1) +ECTEST_OUT=`echo $ECTEST_OUT | grep -i 'not okay\|Assertion failure'` # TODO: expose individual tests and failures instead of overall if [ -n "$ECTEST_OUT" ] ; then html_failed "ec(test) test" |