Skip to content

Commit

Permalink
Merge pull request aws#1998 from aws/hygiene/remove-arm-gcc-warnings-…
Browse files Browse the repository at this point in the history 
…from-http

Resolve gcc warnings in mqtt agent and ggd tests (aws#1980)
  • Loading branch information
@aggarw13
aggarw13 authored May 12, 2020
2 parents c530795 + e8532c5 commit b580dd2
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
23 changes: 13 additions & 10 deletions libraries/c_sdk/standard/mqtt/test/iot_test_mqtt_agent.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,9 @@ static MQTTBool_t prvMultiTaskTestMQTTCallback( void * pvUserData,
static MQTTBool_t prvMQTTCallback( void * pvUserData,
const MQTTPublishData_t * const pxPublishParameters )
{
/* Disable unused parameter warning. */
( void ) pxPublishParameters;

/* Give the semaphore to signal message receipt. */
xSemaphoreGive( ( SemaphoreHandle_t ) pvUserData );

Expand Down Expand Up @@ -713,7 +716,7 @@ static void prvMultiTaskTest_Rx_Task( void * pvParameters )
if( xEventGroupSync( *pxSyncEventRx, /* The event group used for the rendezvous. */
( 1 << usTaskTag ),
( 1 << usTaskTag ) | mqttagenttestMULTI_TASK_TEST_TX_EVENT_MASK,
mqttagenttestMULTI_TASK_TEST_SYNC_TIMEOUT_TICKS ) != ( ( 1 << usTaskTag ) | mqttagenttestMULTI_TASK_TEST_TX_EVENT_MASK ) )
mqttagenttestMULTI_TASK_TEST_SYNC_TIMEOUT_TICKS ) != ( ( 1u << usTaskTag ) | mqttagenttestMULTI_TASK_TEST_TX_EVENT_MASK ) )
{
mqttagenttestFAILUREPRINTF( ( "%s: Timed out waiting for Transmit tasks.\r\n", __FUNCTION__ ) );
xStatus = pdFAIL;
Expand Down Expand Up @@ -750,7 +753,7 @@ static void prvMultiTaskTest_Rx_Task( void * pvParameters )
if( xEventGroupSync( *pxSyncEventRx, /* The event group used for the rendezvous. */
( 1 << usTaskTag ),
( 1 << usTaskTag ) | mqttagenttestMULTI_TASK_TEST_TX_EVENT_MASK,
mqttagenttestMULTI_TASK_TEST_SYNC_TIMEOUT_TICKS ) != ( ( 1 << usTaskTag ) | mqttagenttestMULTI_TASK_TEST_TX_EVENT_MASK ) )
mqttagenttestMULTI_TASK_TEST_SYNC_TIMEOUT_TICKS ) != ( ( 1u << usTaskTag ) | mqttagenttestMULTI_TASK_TEST_TX_EVENT_MASK ) )
{
mqttagenttestFAILUREPRINTF( ( "%s: Timed out waiting for Transmit tasks.\r\n", __FUNCTION__ ) );
xStatus = pdFAIL;
Expand Down Expand Up @@ -840,10 +843,10 @@ static void prvMultiTaskTest_Tx_Task( void * pvParameters )

for( usIndex = 0; usIndex < mqttagenttestMULTI_TASK_TEST_NUM_RX_TASKS; usIndex++ )
{
if( xEventGroupSync( MQTTtestAgentMultiTestRxParam[ usIndex ].xSyncEventRx, /* The event group used for the rendezvous. */
( 1 << xTcptestEchoClientsTaskParams->usTaskTag ), /* The bit representing the Transmit task reaching the rendezvous. */
( mqttagenttestMULTI_TASK_TEST_TX_EVENT_MASK | ( 1 << usIndex ) ), /* Also wait for the Receive tasks. */
mqttagenttestMULTI_TASK_TEST_SYNC_TIMEOUT_TICKS ) != ( mqttagenttestMULTI_TASK_TEST_TX_EVENT_MASK | ( 1 << usIndex ) ) )
if( xEventGroupSync( MQTTtestAgentMultiTestRxParam[ usIndex ].xSyncEventRx, /* The event group used for the rendezvous. */
( 1 << xTcptestEchoClientsTaskParams->usTaskTag ), /* The bit representing the Transmit task reaching the rendezvous. */
( mqttagenttestMULTI_TASK_TEST_TX_EVENT_MASK | ( 1u << usIndex ) ), /* Also wait for the Receive tasks. */
mqttagenttestMULTI_TASK_TEST_SYNC_TIMEOUT_TICKS ) != ( mqttagenttestMULTI_TASK_TEST_TX_EVENT_MASK | ( 1u << usIndex ) ) )
{
mqttagenttestFAILUREPRINTF( ( "%s: Failed synching with Transmit and Receive tasks.\r\n", __FUNCTION__ ) );
xStatus = pdFAIL;
Expand Down Expand Up @@ -894,10 +897,10 @@ static void prvMultiTaskTest_Tx_Task( void * pvParameters )

for( usIndex = 0; usIndex < mqttagenttestMULTI_TASK_TEST_NUM_RX_TASKS; usIndex++ )
{
if( xEventGroupSync( MQTTtestAgentMultiTestRxParam[ usIndex ].xSyncEventRx, /* The event group used for the rendezvous. */
( 1 << xTcptestEchoClientsTaskParams->usTaskTag ), /* The bit representing the Transmit task reaching the rendezvous. */
( mqttagenttestMULTI_TASK_TEST_TX_EVENT_MASK | ( 1 << usIndex ) ), /* Also wait for the Receive tasks. */
mqttagenttestMULTI_TASK_TEST_SYNC_TIMEOUT_TICKS ) != ( mqttagenttestMULTI_TASK_TEST_TX_EVENT_MASK | ( 1 << usIndex ) ) )
if( xEventGroupSync( MQTTtestAgentMultiTestRxParam[ usIndex ].xSyncEventRx, /* The event group used for the rendezvous. */
( 1u << xTcptestEchoClientsTaskParams->usTaskTag ), /* The bit representing the Transmit task reaching the rendezvous. */
( mqttagenttestMULTI_TASK_TEST_TX_EVENT_MASK | ( 1u << usIndex ) ), /* Also wait for the Receive tasks. */
mqttagenttestMULTI_TASK_TEST_SYNC_TIMEOUT_TICKS ) != ( mqttagenttestMULTI_TASK_TEST_TX_EVENT_MASK | ( 1u << usIndex ) ) )
{
mqttagenttestFAILUREPRINTF( ( "%s: Failed synching with Transmit and Receive tasks.\r\n", __FUNCTION__ ) );
xStatus = pdFAIL;
Expand Down
1 change: 0 additions & 1 deletion libraries/freertos_plus/aws/greengrass/test/aws_test_ggd_system.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ static const char cJSON_FILE[] = ggdJSON_FILE;
static const char cCERTIFICATE[] = "-----BEGIN CERTIFICATE-----\nMIIEFTCCAv2gAwIBAgIVAPRru+NqCDr0r6oD6PnTG05rWuY+MA0GCSqGSIb3DQEB\nCwUAMIGoMQswCQYDVQQGEwJVUzEYMBYGA1UECgwPQW1hem9uLmNvbSBJbmMuMRww\nGgYDVQQLDBNBbWF6b24gV2ViIFNlcnZpY2VzMRMwEQYDVQQIDApXYXNoaW5ndG9u\nMRAwDgYDVQQHDAdTZWF0dGxlMTowOAYDVQQDDDE5NDI5MjczNzY5NjU6ZDk3ZmZl\nZmUtNTI4MS00ZWM5LTk4NDYtYjNlZTQxMDRjMjAxMCAXDTE3MDcwNjIwMDczOFoY\nDzIwOTcwNzA2MjAwNzM3WjCBqDELMAkGA1UEBhMCVVMxGDAWBgNVBAoMD0FtYXpv\nbi5jb20gSW5jLjEcMBoGA1UECwwTQW1hem9uIFdlYiBTZXJ2aWNlczETMBEGA1UE\nCAwKV2FzaGluZ3RvbjEQMA4GA1UEBwwHU2VhdHRsZTE6MDgGA1UEAwwxOTQyOTI3\nMzc2OTY1OmQ5N2ZmZWZlLTUyODEtNGVjOS05ODQ2LWIzZWU0MTA0YzIwMTCCASIw\nDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKxzJpXU2DZDEglh/FT01epAWby6\np4Ymw76icyMzBUJzafibABJ3cTyjDQE6ZqbSl1ryBxGwQBsveIgj8SVVtv927wk7\nlncgD+EghfTZgSfscND653AJeVFQlCeHipZI32wzXyPmwglFrWp9vsrY/8BO1Kjk\nSAs4o8fDVVMAaZCJDMuc5csc3CQ2OJYLOl+SZisGNM1h0xHpWieM38KDDrp99x8Q\nTwDmgaMjtdIJR7Y9Nzm0N78gTf3gTazEO9iUKojVCNubxK/lQ6KjJ0JcvsljPpVp\nuzjOmn91xmNoHEQCboa7YoYNNbdAbftGeUl16wFdTgbuUS9vakk5idVoC2ECAwEA\nAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUmcz4OlH9+mlpnTKG3taI\nw+6FSk0wDQYJKoZIhvcNAQELBQADggEBACeiQ6MxiktsU0sLNmP1cNbiuBuutjoq\nymk476Bhr4E2WSE0B9W1TFOSLIYx9oN63T3lXzsGHP/MznueIbqbwFf/o5aXI7th\n+J+i9LgBrViNvzkze7G0GiPuEQ7ox4XnPBJAFtTZxa8gXL95QfcypERpQs28lg7W\nQpdNhiBN+c4o1aSOzJ474sjXnjtI1G2jRTKucm0buYYeAeVT7kpBq9YL7gGfOcyj\nsPxQEgyQV2Mk+b1q7lYDS4tnzoRkUfNLgAtDKSh8S8iVhAR6wRR2G3aMySKrOxbg\nalghO3OqfeuTwIj9w17JTAyYAME22RJQ6oxEJ8rHp/9PaYnOmiSkP7M=\n-----END CERTIFICATE-----\n";
static const char cMyGroupID[] = "myGroupID";
static const char cIP_ADDRESS_3[] = "01.23.456.789";
static const char cIP_ADDRESS_1[] = "44.44.44.44";
static const char cMY_CORE_ARN[] = "myGreenGrassCoreArn";

static Socket_t xSocket;
Expand Down

0 comments on commit b580dd2

Please sign in to comment.