Merge pull request #9835 from orenc17/no_greentea

Cruz Monrreal · web-flow · commit 024cae5442c3 · 2019-02-28T18:24:09.000-06:00
Add define to skip greentea sync
diff --git a/features/frameworks/greentea-client/source/greentea_test_env.cpp b/features/frameworks/greentea-client/source/greentea_test_env.cpp
@@ -94,8 +94,10 @@ void _GREENTEA_SETUP_COMMON(const int timeout, const char *host_test_name, char
  *           This function is blocking.
  */
 extern "C" void GREENTEA_SETUP(const int timeout, const char *host_test_name) {
+#if ! defined(NO_GREENTEA)
     char _value[GREENTEA_UUID_LENGTH] = {0};
     _GREENTEA_SETUP_COMMON(timeout, host_test_name, _value, GREENTEA_UUID_LENGTH);
+#endif
 }
 
 /** \brief Handshake with host and send setup data (timeout and host test name). Allows you to preserve sync UUID.

Original file line number	Original file line	Diff line number	Diff line change
`@@ -94,8 +94,10 @@ void _GREENTEA_SETUP_COMMON(const int timeout, const char *host_test_name, char`
`94`	`* This function is blocking.`	`94`	`* This function is blocking.`
`95`	`*/`	`95`	`*/`
`96`	`extern "C" void GREENTEA_SETUP(const int timeout, const char *host_test_name) {`	`96`	`extern "C" void GREENTEA_SETUP(const int timeout, const char *host_test_name) {`
		`97`	`+#if ! defined(NO_GREENTEA)`
`97`	`char _value[GREENTEA_UUID_LENGTH] = {0};`	`98`	`char _value[GREENTEA_UUID_LENGTH] = {0};`
`98`	`_GREENTEA_SETUP_COMMON(timeout, host_test_name, _value, GREENTEA_UUID_LENGTH);`	`99`	`_GREENTEA_SETUP_COMMON(timeout, host_test_name, _value, GREENTEA_UUID_LENGTH);`
		`100`	`+#endif`
`99`	`}`	`101`	`}`
`100`		`102`
`101`	`/** \brief Handshake with host and send setup data (timeout and host test name). Allows you to preserve sync UUID.`	`103`	`/** \brief Handshake with host and send setup data (timeout and host test name). Allows you to preserve sync UUID.`