From 6d0c49a4256a40996112f425296fe2348fb8e4d6 Mon Sep 17 00:00:00 2001 From: Quinn Miller Date: Thu, 19 Jul 2018 15:34:28 -0600 Subject: [PATCH] Added support for Jenkins testing in Rowley Crossworks --- IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c | 14 ++++++++++++-- IDE/ROWLEY-CROSSWORKS-ARM/test_main.c | 19 ++++++++++--------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c b/IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c index e443c408c..25f50ae7e 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c +++ b/IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c @@ -46,18 +46,28 @@ void main(void) { /* Used for testing, must have a delay so no data is missed while serial is initializing */ #ifdef WOLFSSL_FRDM_K64_JENKINS - if(test_num == 2){ + /* run once */ + if(test_num == 1){ + printf("\n&&&&&&&&&&&&& done &&&&&&&&&&&&&&&"); + delay_us(1000000); break; } - delay_us(1000000); + delay_us(1000000); /* 1 second */ #endif + printf("\nBenchmark Test %d:\n", test_num); benchmark_test(&args); printf("Benchmark Test %d: Return code %d\n", test_num, args.return_code); test_num++; } while(args.return_code == 0); + + /*Print this again for redundancy*/ + #ifdef WOLFSSL_FRDM_K64_JENKINS + printf("\n&&&&&&&&&&&&&& done &&&&&&&&&&&&&\n"); + delay_us(1000000); + #endif } /* diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/test_main.c b/IDE/ROWLEY-CROSSWORKS-ARM/test_main.c index 416479d48..2b1e76fde 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/test_main.c +++ b/IDE/ROWLEY-CROSSWORKS-ARM/test_main.c @@ -46,15 +46,15 @@ void main(void) do { /* Used for testing, must have a delay so no data is missed while serial is initializing */ - #ifdef WOLFSSL_FRDM_K64_JENKINS - /* run twice */ - if(test_num == 2){ - printf("\n&&&&&&&&&&&&& done &&&&&&&&&&&&&&&"); - delay_us(1000000); - break; - } - delay_us(1000000); /* 1 second */ - #endif + #ifdef WOLFSSL_FRDM_K64_JENKINS + /* run twice */ + if(test_num == 2){ + printf("\n&&&&&&&&&&&&& done &&&&&&&&&&&&&&&"); + delay_us(1000000); + break; + } + delay_us(1000000); /* 1 second */ + #endif printf("\nCrypt Test %d:\n", test_num); wolfcrypt_test(&args); @@ -63,6 +63,7 @@ void main(void) test_num++; } while(args.return_code == 0); + /*Print this again for redundancy*/ #ifdef WOLFSSL_FRDM_K64_JENKINS printf("\n&&&&&&&&&&&&&& done &&&&&&&&&&&&&\n"); delay_us(1000000);