From 2b951c920bd48aed0e49dffbf7515acfe91e2b8d Mon Sep 17 00:00:00 2001
From: David Brown <david.brown@linaro.org>
Date: Wed, 4 Dec 2019 17:31:38 -0700
Subject: [PATCH] samples: zephyr: Remove redundant extra chip erase

Remove a redundant chip erase from run-tests.go.  The '-e chip' should
tell pyocd to perform a chip erase.  There seem to be some combinations
of daplink and pyocd that if an invalid image is loaded into the device,
it can no longer be flashed by pyocd.  Performing the chip erase as a
separate command easily gets it into this state.  It can be recovered by
using the DAP filesystem to write the image.

Signed-off-by: David Brown <david.brown@linaro.org>
---
 samples/zephyr/run-tests.go | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/samples/zephyr/run-tests.go b/samples/zephyr/run-tests.go
index 1b1fd769..88160b4a 100644
--- a/samples/zephyr/run-tests.go
+++ b/samples/zephyr/run-tests.go
@@ -51,7 +51,6 @@ var tests = []struct {
 			{
 				commands: [][]string{
 					{"make", "test-good-rsa"},
-					{"pyocd", "erase", "--chip"},
 					{"make", "flash_boot"},
 				},
 				expect: "Unable to find bootable image",
@@ -82,7 +81,6 @@ var tests = []struct {
 			{
 				commands: [][]string{
 					{"make", "test-good-ecdsa"},
-					{"pyocd", "erase", "--chip"},
 					{"make", "flash_boot"},
 				},
 				expect: "Unable to find bootable image",
@@ -113,7 +111,6 @@ var tests = []struct {
 			{
 				commands: [][]string{
 					{"make", "test-overwrite"},
-					{"pyocd", "erase", "--chip"},
 					{"make", "flash_boot"},
 				},
 				expect: "Unable to find bootable image",
@@ -144,7 +141,6 @@ var tests = []struct {
 			{
 				commands: [][]string{
 					{"make", "test-bad-rsa-upgrade"},
-					{"pyocd", "erase", "--chip"},
 					{"make", "flash_boot"},
 				},
 				expect: "Unable to find bootable image",
@@ -175,7 +171,6 @@ var tests = []struct {
 			{
 				commands: [][]string{
 					{"make", "test-bad-ecdsa-upgrade"},
-					{"pyocd", "erase", "--chip"},
 					{"make", "flash_boot"},
 				},
 				expect: "Unable to find bootable image",
@@ -206,7 +201,6 @@ var tests = []struct {
 			{
 				commands: [][]string{
 					{"make", "test-no-bootcheck"},
-					{"pyocd", "erase", "--chip"},
 					{"make", "flash_boot"},
 				},
 				expect: "Unable to find bootable image",
@@ -237,7 +231,6 @@ var tests = []struct {
 			{
 				commands: [][]string{
 					{"make", "test-wrong-rsa"},
-					{"pyocd", "erase", "--chip"},
 					{"make", "flash_boot"},
 				},
 				expect: "Unable to find bootable image",
@@ -268,7 +261,6 @@ var tests = []struct {
 			{
 				commands: [][]string{
 					{"make", "test-wrong-ecdsa"},
-					{"pyocd", "erase", "--chip"},
 					{"make", "flash_boot"},
 				},
 				expect: "Unable to find bootable image",