From 3098707188ac162a0b15dcca218f9b6597890065 Mon Sep 17 00:00:00 2001 From: Peter Kolbus Date: Fri, 1 Feb 2019 17:19:08 -0600 Subject: [PATCH 1/2] all.sh: Fix check_headers_in_cpp When all.sh invokes check_headers_in_cpp, a backup config.h exists. This causes a stray difference vs cpp_dummy_build.cpp. Fix by only collecting the *.h files in include/mbedtls. Change-Id: Ifd415027e856858579a6699538f06fc49c793570 --- tests/scripts/all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 039b1b887..10353904f 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -295,7 +295,7 @@ check_tools() } check_headers_in_cpp () { - ls include/mbedtls >headers.txt + ls include/mbedtls | grep "\.h$" >headers.txt Date: Sun, 3 Feb 2019 08:41:41 -0600 Subject: [PATCH 2/2] Add ChangeLog entry --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9b1230e20..81928d187 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,8 @@ Bugfix * Remove the mbedtls namespacing from the header file, to fix a "file not found" build error. Fixed by Haijun Gu #2319. * Fix returning the value 1 when mbedtls_ecdsa_genkey failed. + * Fix false failure in all.sh when backup files exist in include/mbedtls + (e.g. config.h.bak). Fixed by Peter Kolbus (Garmin) #2407. Changes * Include configuration file in all header files that use configuration,