Merge 4.16

Change-Id: I11db70a8e25a6656c5ec640a703e7b06d5a3672e

payloads/libpayload/tests/mocks/cbfs_file_mock.c

@@ -0,0 +1,95 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <mocks/cbfs_util.h>
+
+
+const u8 test_data_1[TEST_DATA_1_SIZE] = { TEST_DATA_1 };
+const u8 test_data_2[TEST_DATA_2_SIZE] = { TEST_DATA_2 };
+const u8 test_data_int_1[TEST_DATA_INT_1_SIZE] = { LE64(TEST_DATA_INT_1) };
+const u8 test_data_int_2[TEST_DATA_INT_2_SIZE] = { LE64(TEST_DATA_INT_2) };
+const u8 test_data_int_3[TEST_DATA_INT_3_SIZE] = { LE64(TEST_DATA_INT_3) };
+
+const u8 good_hash[VB2_SHA256_DIGEST_SIZE] = { TEST_SHA256 };
+const u8 bad_hash[VB2_SHA256_DIGEST_SIZE] = { INVALID_SHA256 };
+
+const struct cbfs_test_file file_no_hash = {
+	.header = HEADER_INITIALIZER(CBFS_TYPE_RAW, 0, TEST_DATA_1_SIZE),
+	.filename = TEST_DATA_1_FILENAME,
+	.attrs_and_data = {
+		TEST_DATA_1,
+	},
+};
+
+const struct cbfs_test_file file_valid_hash = {
+	.header = HEADER_INITIALIZER(CBFS_TYPE_RAW, HASH_ATTR_SIZE, TEST_DATA_1_SIZE),
+	.filename = TEST_DATA_1_FILENAME,
+	.attrs_and_data = {
+		BE32(CBFS_FILE_ATTR_TAG_HASH),
+		BE32(HASH_ATTR_SIZE),
+		BE32(VB2_HASH_SHA256),
+		TEST_SHA256,
+		TEST_DATA_1,
+	},
+};
+
+const struct cbfs_test_file file_broken_hash = {
+	.header = HEADER_INITIALIZER(CBFS_TYPE_RAW, HASH_ATTR_SIZE, TEST_DATA_1_SIZE),
+	.filename = TEST_DATA_1_FILENAME,
+	.attrs_and_data = {
+		BE32(CBFS_FILE_ATTR_TAG_HASH),
+		BE32(HASH_ATTR_SIZE),
+		BE32(VB2_HASH_SHA256),
+		INVALID_SHA256,
+		TEST_DATA_1,
+	},
+};
+
+const struct cbfs_test_file test_file_1 = {
+	.header = HEADER_INITIALIZER(CBFS_TYPE_RAW, 0, TEST_DATA_1_SIZE),
+	.filename = TEST_DATA_1_FILENAME,
+	.attrs_and_data = {
+		TEST_DATA_1,
+	},
+};
+
+const struct cbfs_test_file test_file_2 = {
+	.header = HEADER_INITIALIZER(CBFS_TYPE_RAW, sizeof(struct cbfs_file_attr_compression),
+				     TEST_DATA_2_SIZE),
+	.filename = TEST_DATA_2_FILENAME,
+	.attrs_and_data = {
+		BE32(CBFS_FILE_ATTR_TAG_COMPRESSION),
+		BE32(sizeof(struct cbfs_file_attr_compression)),
+		BE32(CBFS_COMPRESS_LZMA),
+		BE32(TEST_DATA_2_SIZE),
+		TEST_DATA_2,
+	},
+};
+
+const struct cbfs_test_file test_file_int_1 = {
+	.header = HEADER_INITIALIZER(CBFS_TYPE_RAW, 0, TEST_DATA_INT_1_SIZE),
+	.filename = TEST_DATA_INT_1_FILENAME,
+	.attrs_and_data = {
+		LE64(TEST_DATA_INT_1),
+	},
+};
+
+const struct cbfs_test_file test_file_int_2 = {
+	.header = HEADER_INITIALIZER(CBFS_TYPE_RAW, 0, TEST_DATA_INT_2_SIZE),
+	.filename = TEST_DATA_INT_2_FILENAME,
+	.attrs_and_data = {
+		LE64(TEST_DATA_INT_2),
+	},
+};
+
+const struct cbfs_test_file test_file_int_3 = {
+	.header = HEADER_INITIALIZER(CBFS_TYPE_RAW, sizeof(struct cbfs_file_attr_compression),
+				     TEST_DATA_INT_3_SIZE),
+	.filename = TEST_DATA_INT_3_FILENAME,
+	.attrs_and_data = {
+		BE32(CBFS_FILE_ATTR_TAG_COMPRESSION),
+		BE32(sizeof(struct cbfs_file_attr_compression)),
+		BE32(CBFS_COMPRESS_LZ4),
+		BE32(TEST_DATA_INT_3_SIZE),
+		LE64(TEST_DATA_INT_3),
+	},
+};

payloads/libpayload/tests/mocks/die.c

@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <tests/test.h>
+#include <stdbool.h>
+
+void die_work(const char *file, const char *func, int line, const char *fmt, ...)
+{
+	/* Failing asserts are jumping to the user code (test) if expect_assert_failed() was
+	   previously called. Otherwise it jumps to the cmocka code and fails the test. */
+	mock_assert(false, "Mock assetion called", file, line);
+
+	/* Should never be reached */
+	print_error("%s() called...\n", __func__);
+	while (1)
+		;
+}