Update: Internal Cmocka version to 1.1.7.

diff --git a/build/scripts/test.sh b/build/scripts/test.sh
index a2d1e705d70e20a95a7da83eb1a1effe6e0c3cb3..07f8bf6dea6f8cb575d2b1324c394dfe54359aad 100644 (file)
--- a/build/scripts/test.sh
+++ b/build/scripts/test.sh
@@ -736,9 +736,10 @@ test_operate_ci_pretest_cmocka() {
   local cmocka_path="${path_test}cmocka/"
   local cmocka_build="${cmocka_path}build/"
   local cmocka_data="${cmocka_path}data/build/"
-  local cmocka_settings="${path_original}level_3/fake/data/projects/cmocka/1.1.5/settings"
+  local cmocka_version="1.1.7"
+  local cmocka_settings="${path_original}level_3/fake/data/projects/cmocka/${cmocka_version}/settings"
   local cmocka_uri="https://github.com/coreboot/cmocka.git"
-  local cmocka_branch="cmocka-1.1.5"
+  local cmocka_branch="cmocka-${cmocka_version}"
 
   if [[ -d ${cmocka_path} ]] ; then
     if [[ ${verbosity} != "quiet" && ${verbosity} != "error" ]] ; then
@@ -752,7 +753,7 @@ test_operate_ci_pretest_cmocka() {
     echo "git clone ${clone_quiet} --single-branch -b ${cmocka_branch} \"${cmocka_uri}\" ${cmocka_path}"
   fi
 
-  git clone ${clone_quiet} --single-branch -b ${cmocka_branch} "${cmocka_uri}" ${cmocka_path}
+  git clone ${clone_quiet} --single-branch -b ${cmocka_branch} ${cmocka_uri} ${cmocka_path}
 
   if [[ ${?} -ne 0 ]] ; then
     if [[ ${verbosity} != "quiet" ]] ; then

diff --git a/level_3/fake/data/projects/cmocka/1.1.7/settings b/level_3/fake/data/projects/cmocka/1.1.7/settings
new file mode 100644 (file)
index 0000000..6ec3367
--- /dev/null
+++ b/level_3/fake/data/projects/cmocka/1.1.7/settings
@@ -0,0 +1,53 @@
+# fss-0001
+#
+# This is designed for compiling cmocka-1.1.7.
+#
+# To use this do the following:
+#   1) Download and extract cmocka-1.1.7.
+#   2) Change into the extracted cmocka-1.1.7 directory.
+#   3) Create the directory path "data/build/" within this cmocka-1.1.7 directory.
+#   4) Copy this file (settings) into the created directory path "data/build/".
+#   5) Use the featureless make build operation to build, such as: "fake build".
+#
+# This depends on a c-library with realtime and pthread support.
+
+build_name cmocka
+
+version_major 1
+version_minor 1
+version_micro 7
+version_file micro
+version_target major
+
+modes gcc clang
+modes_default gcc
+
+build_compiler gcc
+build_compiler-clang clang
+build_indexer ar
+build_indexer_arguments rcs
+build_language c
+
+build_libraries -pthread -lrt -lc
+
+build_sources_library src/cmocka.c
+build_sources_headers include/cmocka.h include/cmocka_pbc.h
+
+build_script no
+build_shared yes
+build_static no
+
+path_sources
+has_path_standard no
+preserve_path_headers no
+
+environment PATH LD_LIBRARY_PATH
+
+defines -DHAVE_MALLOC_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_SIGNAL_H=1 -DHAVE_STRINGS_H=1 -DHAVE_GCC_THREAD_LOCAL_STORAGE=1 -DHAVE_CLOCK_REALTIME=1 -DHAVE_SIGLONGJMP=1 -DHAVE_STRSIGNAL=1
+
+flags -z now -g -fdiagnostics-color=always -Wall -Winline -O2 -Iinclude/ -std=gnu99
+flags -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align -Werror=address -Wstrict-prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write-strings -Werror-implicit-function-declaration -Wpointer-arith -Werror=pointer-arith -Wdeclaration-after-statement -Werror=declaration-after-statement -Wreturn-type -Werror=return-type -Wuninitialized -Werror=uninitialized -Wimplicit-fallthrough -Werror=strict-overflow -Wstrict-overflow=2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat -Wformat-security -Werror=format-security
+flags -fno-common -fstack-protector-strong -fstack-clash-protection
+flags-clang -Wno-logical-op-parentheses
+
+flags_library -fPIC