From: Dmitry Belyavskiy Date: Sat, 15 Sep 2018 13:18:05 +0000 (+0300) Subject: Merge pull request #85 from vt-alt/in-places X-Git-Tag: v3.0.0~343 X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=commitdiff_plain;h=dbfdf19ffa3f102b5861a158dbbbbbe8cd571d98;hp=4072a0c4e2d8a81a068b000c538f762b792ef8a6;p=openssl-gost%2Fengine.git Merge pull request #85 from vt-alt/in-places test_context: make tests return values affect overall test result --- diff --git a/test_context.c b/test_context.c index ba54784..72e1057 100644 --- a/test_context.c +++ b/test_context.c @@ -134,16 +134,16 @@ int main(int argc, char **argv) { int ret = 0; - test_contexts(cipher_gost_grasshopper_ecb(), 1, "grasshopper ecb", 0); - test_contexts(cipher_gost_grasshopper_ecb(), 0, "grasshopper ecb", 0); - test_contexts(cipher_gost_grasshopper_cbc(), 1, "grasshopper cbc", 0); - test_contexts(cipher_gost_grasshopper_cbc(), 0, "grasshopper cbc", 0); - test_contexts(cipher_gost_grasshopper_ctr(), 1, "grasshopper ctr", 0); - test_contexts(cipher_gost_grasshopper_ctr(), 0, "grasshopper ctr", 0); - test_contexts(cipher_gost_grasshopper_ofb(), 1, "grasshopper ofb", 0); - test_contexts(cipher_gost_grasshopper_ofb(), 0, "grasshopper ofb", 0); - test_contexts(cipher_gost_grasshopper_ctracpkm(), 1, "grasshopper ctracpkm", 256 / 8); - test_contexts(cipher_gost_grasshopper_ctracpkm(), 0, "grasshopper ctracpkm", 256 / 8); + ret |= test_contexts(cipher_gost_grasshopper_ecb(), 1, "grasshopper ecb", 0); + ret |= test_contexts(cipher_gost_grasshopper_ecb(), 0, "grasshopper ecb", 0); + ret |= test_contexts(cipher_gost_grasshopper_cbc(), 1, "grasshopper cbc", 0); + ret |= test_contexts(cipher_gost_grasshopper_cbc(), 0, "grasshopper cbc", 0); + ret |= test_contexts(cipher_gost_grasshopper_ctr(), 1, "grasshopper ctr", 0); + ret |= test_contexts(cipher_gost_grasshopper_ctr(), 0, "grasshopper ctr", 0); + ret |= test_contexts(cipher_gost_grasshopper_ofb(), 1, "grasshopper ofb", 0); + ret |= test_contexts(cipher_gost_grasshopper_ofb(), 0, "grasshopper ofb", 0); + ret |= test_contexts(cipher_gost_grasshopper_ctracpkm(), 1, "grasshopper ctracpkm", 256 / 8); + ret |= test_contexts(cipher_gost_grasshopper_ctracpkm(), 0, "grasshopper ctracpkm", 256 / 8); if (ret) printf(cDRED "= Some tests FAILED!\n" cNORM);