diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-09-30 08:32:32 +0200 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-09-30 08:32:32 +0200 |
| commit | 4c2a30d582d4de9dcadde77a4b1dd167817a2bd1 (patch) | |
| tree | 6c79c34e936621cd818bc9bf72ab78ff1ec0422d /tests/ec | |
| parent | 44d3245eef6347ff365b096154c026b77a55d395 (diff) | |
| download | nss-hg-4c2a30d582d4de9dcadde77a4b1dd167817a2bd1.tar.gz | |
Bug 1306319 - Fix layer violations, r=kaie,ueno
try: -b do -p linux,linux64-gyp -u all -t all -e all
Diffstat (limited to 'tests/ec')
| -rw-r--r-- | tests/ec/ectest.sh | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/tests/ec/ectest.sh b/tests/ec/ectest.sh index e8bd9ecea..e10760565 100644 --- a/tests/ec/ectest.sh +++ b/tests/ec/ectest.sh @@ -29,7 +29,7 @@ ectest_init() . ./init.sh fi SCRIPTNAME="ectest.sh" - html_head "ectest test" + html_head "freebl and pk11 ectest tests" } ectest_cleanup() @@ -71,12 +71,23 @@ ectest_genkeydb_test() ectest_init ectest_genkeydb_test -ECTEST_OUT=$(ectest -f -p -n -d 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 freebl and pk11 test" -else - html_passed "ec freebl and pk11 test" +if [ -f ${BINDIR}/fbectest ]; then + FB_ECTEST_OUT=$(fbectest -n -d 2>&1) + FB_ECTEST_OUT=`echo $FB_ECTEST_OUT | grep -i 'not okay\|Assertion failure'` + if [ -n "$FB_ECTEST_OUT" ] ; then + html_failed "freebl ec tests" + else + html_passed "freebl ec tests" + fi +fi +if [ -f ${BINDIR}/pk11ectest ]; then + PK11_ECTEST_OUT=$(pk11ectest -n -d 2>&1) + PK11_ECTEST_OUT=`echo $PK11_ECTEST_OUT | grep -i 'not okay\|Assertion failure'` + if [ -n "$PK11_ECTEST_OUT" ] ; then + html_failed "pk11 ec tests" + else + html_passed "pk11 ec tests" + fi fi ectest_cleanup |