From 498e3eb6fea0f235ee108d0529bf59897192c1cc Mon Sep 17 00:00:00 2001 From: WKJay <1931048074@qq.com> Date: Thu, 17 Dec 2020 08:42:53 +0800 Subject: [PATCH] Add include.am --- IDE/ECLIPSE/RTTHREAD/include.am | 8 ++++++++ IDE/ECLIPSE/RTTHREAD/user_settings.h | 2 +- IDE/ECLIPSE/RTTHREAD/wolfssl_test.c | 13 ++++++++----- IDE/include.am | 1 + 4 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 IDE/ECLIPSE/RTTHREAD/include.am diff --git a/IDE/ECLIPSE/RTTHREAD/include.am b/IDE/ECLIPSE/RTTHREAD/include.am new file mode 100644 index 000000000..13b8657e7 --- /dev/null +++ b/IDE/ECLIPSE/RTTHREAD/include.am @@ -0,0 +1,8 @@ +# vim:ft=automake +# included from Top Level Makefile.am +# All paths should be given relative to the root + +EXTRA_DIST += \ + IDE/ECLIPSE/RTTHREAD/README.md \ + IDE/ECLIPSE/RTTHREAD/user_settings.h \ + IDE/ECLIPSE/RTTHREAD/wolfssl_test.c diff --git a/IDE/ECLIPSE/RTTHREAD/user_settings.h b/IDE/ECLIPSE/RTTHREAD/user_settings.h index ce12cc192..f28c968c6 100644 --- a/IDE/ECLIPSE/RTTHREAD/user_settings.h +++ b/IDE/ECLIPSE/RTTHREAD/user_settings.h @@ -42,7 +42,7 @@ /* adjust CURRENT_UNIX_TS to seconds since Jan 01 1970. (UTC) You can get the current time from https://www.unixtimestamp.com/ */ -#define CURRENT_UNIX_TS 1542605837 +#define CURRENT_UNIX_TS 1542605837UL /* When using Windows simulator, you must define USE_WINDOWS_API for test.h to build */ #ifdef _WIN32 diff --git a/IDE/ECLIPSE/RTTHREAD/wolfssl_test.c b/IDE/ECLIPSE/RTTHREAD/wolfssl_test.c index 23a23d648..0dce7d0d0 100644 --- a/IDE/ECLIPSE/RTTHREAD/wolfssl_test.c +++ b/IDE/ECLIPSE/RTTHREAD/wolfssl_test.c @@ -22,9 +22,12 @@ #include #include -int wolfssl_test(void){ - wolfcrypt_test(NULL); - benchmark_test(NULL); - return 0; +int wolfssl_test(void) { +#if !defined(NO_CRYPT_TEST) + wolfcrypt_test(NULL); +#endif +#if !defined(NO_CRYPT_BENCHMARK) + benchmark_test(NULL); +#endif + return 0; } - diff --git a/IDE/include.am b/IDE/include.am index 5af057d6b..3814a1f63 100644 --- a/IDE/include.am +++ b/IDE/include.am @@ -20,6 +20,7 @@ include IDE/CSBENCH/include.am include IDE/ECLIPSE/DEOS/include.am include IDE/ECLIPSE/MICRIUM/include.am include IDE/ECLIPSE/SIFIVE/include.am +include IDE/ECLIPSE/RTTHREAD/include.am include IDE/mynewt/include.am include IDE/Renesas/e2studio/DK-S7G2/include.am include IDE/Renesas/cs+/Projects/include.am