ish: Trim down the release branchstabilize-wristpin-14469.59.B-ishstabilize-voshyr-14637.B-ishstabilize-quickfix-14695.187.B-ishstabilize-quickfix-14695.124.B-ishstabilize-quickfix-14526.91.B-ishstabilize-14695.85.B-ishstabilize-14695.107.B-ishstabilize-14682.B-ishstabilize-14633.B-ishstabilize-14616.B-ishstabilize-14589.B-ishstabilize-14588.98.B-ishstabilize-14588.14.B-ishstabilize-14588.123.B-ishstabilize-14536.B-ishstabilize-14532.B-ishstabilize-14528.B-ishstabilize-14526.89.B-ishstabilize-14526.84.B-ishstabilize-14526.73.B-ishstabilize-14526.67.B-ishstabilize-14526.57.B-ishstabilize-14498.B-ishstabilize-14496.B-ishstabilize-14477.B-ishstabilize-14469.9.B-ishstabilize-14469.8.B-ishstabilize-14469.58.B-ishstabilize-14469.41.B-ishstabilize-14442.B-ishstabilize-14438.B-ishstabilize-14411.B-ishstabilize-14396.B-ishstabilize-14395.B-ishstabilize-14388.62.B-ishstabilize-14388.61.B-ishstabilize-14388.52.B-ishstabilize-14385.B-ishstabilize-14345.B-ishstabilize-14336.B-ishstabilize-14333.B-ishrelease-R99-14469.B-ishrelease-R98-14388.B-ishrelease-R102-14695.B-ishrelease-R101-14588.B-ishrelease-R100-14526.B-ishfirmware-cherry-14454.B-ishfirmware-brya-14505.B-ishfirmware-brya-14505.71.B-ishfactory-kukui-14374.B-ishfactory-guybrush-14600.B-ishfactory-cherry-14455.B-ishfactory-brya-14517.B-ish

In the interest of making long-term branch maintenance incur as little
technical debt on us as possible, we should not maintain any files on
the branch we are not actually using.

This has the added effect of making it extremely clear when merging CLs
from the main branch when changes have the possibility to affect us.

The follow-on CL adds a convenience script to actually pull updates from
the main branch and generate a CL for the update.

BUG=b:204206272
BRANCH=ish
TEST=make BOARD=arcada_ish && make BOARD=drallion_ish

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I17e4694c38219b5a0823e0a3e55a28d1348f4b18
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3262038
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>

1 files changed, 0 insertions, 131 deletions

diff --git a/test/cec.c b/test/cec.c
deleted file mode 100644
index 9377e4fcd3..0000000000
--- a/test/cec.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Copyright 2018 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Test the buffer handling of HDMI CEC
- */
-
-#include <string.h>
-
-#include "cec.h"
-#include "test_util.h"
-
-struct overflow_msg {
-	struct cec_msg_transfer transfer;
-	uint8_t overflow_detector;
-} overflow_msg;
-/* Ensure the overflow detector is located directly after the buffer */
-BUILD_ASSERT(offsetof(struct overflow_msg, overflow_detector) ==
-	     offsetof(struct cec_msg_transfer, buf) + MAX_CEC_MSG_LEN);
-
-
-struct overflow_queue {
-	struct cec_rx_queue queue;
-	uint8_t overflow_detector[CEC_RX_BUFFER_SIZE];
-} overflow_queue;
-/* Ensure the overflow detector is located directly after the buffer */
-BUILD_ASSERT(offsetof(struct overflow_queue, overflow_detector) ==
-	     offsetof(struct cec_rx_queue, buf) + CEC_RX_BUFFER_SIZE);
-
-static struct cec_rx_queue *queue;
-
-/* Tests */
-static int test_msg_overflow(void)
-{
-	int i;
-
-	/* Overwrite the buffer by 1 byte */
-	for (i = 0; i < (MAX_CEC_MSG_LEN+1)*8; i++) {
-		cec_transfer_set_bit(&overflow_msg.transfer, 1);
-		cec_transfer_inc_bit(&overflow_msg.transfer);
-	}
-
-	/* Make sure we actually wrote the whole buffer with ones */
-	for (i = 0; i < MAX_CEC_MSG_LEN; i++)
-		TEST_ASSERT(overflow_msg.transfer.buf[i] == 0xff);
-
-	/* Verify that the attempt to overflow the buffer did not succeed */
-	TEST_ASSERT(overflow_msg.overflow_detector == 0);
-
-	/* The full indicator is when byte reaches MAX_CEC_MSG_LEN */
-	TEST_ASSERT(overflow_msg.transfer.byte == MAX_CEC_MSG_LEN);
-
-	/* Check that the indicator stays the same if we write another byte */
-	for (i = 0; i < 8; i++) {
-		cec_transfer_set_bit(&overflow_msg.transfer, 1);
-		cec_transfer_inc_bit(&overflow_msg.transfer);
-	}
-	TEST_ASSERT(overflow_msg.transfer.byte == MAX_CEC_MSG_LEN);
-
-	return EC_SUCCESS;
-}
-
-
-
-static int verify_no_queue_overflow(void)
-{
-	int i;
-
-	for (i = 0; i < CEC_RX_BUFFER_SIZE; i++) {
-		if (overflow_queue.overflow_detector[i] != 0)
-			return EC_ERROR_OVERFLOW;
-	}
-	return EC_SUCCESS;
-}
-
-
-static void clear_queue(void)
-{
-	memset(queue, 0, sizeof(struct cec_rx_queue));
-
-}
-
-static int fill_queue(uint8_t *msg, int msg_size)
-{
-	int i;
-
-	/*
-	 * Fill the queue. Every push adds the message and one extra byte for
-	 * the length field. The maximum data we can add is one less than
-	 * CEC_RX_BUFFER_SIZE since write_pointer==read_pointer is used to
-	 * indicate an empty buffer
-	 */
-	clear_queue();
-
-	for (i = 0; i < (CEC_RX_BUFFER_SIZE - 1)/(msg_size + 1); i++)
-		TEST_ASSERT(cec_rx_queue_push(queue, msg, msg_size) == 0);
-
-	/* Now the queue should be full */
-	TEST_ASSERT(cec_rx_queue_push(queue, msg, msg_size) ==
-							EC_ERROR_OVERFLOW);
-
-	/* Verify nothing was written outside of the queue */
-	TEST_ASSERT(verify_no_queue_overflow() == EC_SUCCESS);
-
-	return EC_SUCCESS;
-}
-
-static int test_queue_overflow(void)
-{
-	uint8_t msg[CEC_RX_BUFFER_SIZE];
-
-	memset(msg, 0xff, sizeof(msg));
-
-	TEST_ASSERT(fill_queue(msg, 1) == EC_SUCCESS);
-	TEST_ASSERT(fill_queue(msg, 2) == EC_SUCCESS);
-	TEST_ASSERT(fill_queue(msg, 3) == EC_SUCCESS);
-	TEST_ASSERT(fill_queue(msg, MAX_CEC_MSG_LEN) == EC_SUCCESS);
-
-	return EC_SUCCESS;
-}
-
-void run_test(int argc, char **argv)
-{
-	queue = &overflow_queue.queue;
-
-	RUN_TEST(test_msg_overflow);
-
-	RUN_TEST(test_queue_overflow);
-
-	test_print_result();
-}