Merge pull request #13247 from jamesbeyond/greentea_fix

0xc0170 · web-flow · commit a2b79803af08 · 2020-07-09T10:50:03.000+02:00
GreenTea: Fix inconsistency of  Greentea KV message
diff --git a/features/frameworks/greentea-client/source/greentea_test_env.cpp b/features/frameworks/greentea-client/source/greentea_test_env.cpp
@@ -740,6 +740,7 @@ static int gettok(char *out_str, const int str_size) {
 	if (LastChar == '}') {
 		LastChar = greentea_getc();
 		if (LastChar == '}') {
+			greentea_getc(); //offset the extra '\n' send by Greentea python tool
 			LastChar = '!';
 			return tok_close;
 		}

Original file line number	Diff line number	Diff line change
`@@ -740,6 +740,7 @@ static int gettok(char *out_str, const int str_size) {`
`740`	`740`	`if (LastChar == '}') {`
`741`	`741`	`LastChar = greentea_getc();`
`742`	`742`	`if (LastChar == '}') {`
	`743`	`+ greentea_getc(); //offset the extra '\n' send by Greentea python tool`
`743`	`744`	`LastChar = '!';`
`744`	`745`	`return tok_close;`
`745`	`746`	`}`