Added more files to the Rowley and IAR LM3S demos to test building the newer files...

[freertos] / FreeRTOS / Demo / Common / Minimal / QueueSet.c

diff --git a/FreeRTOS/Demo/Common/Minimal/QueueSet.c b/FreeRTOS/Demo/Common/Minimal/QueueSet.c
index b7e37c008b6baa7acee1e28596c2383d0aab0887..d5f44e3ca4bb1ab97be685bbfc351b2d23e9d2e8 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/QueueSet.c
+++ b/FreeRTOS/Demo/Common/Minimal/QueueSet.c
@@ -562,7 +562,6 @@ static portBASE_TYPE xQueueToWriteTo = 0;
 static void prvSetupTest( xTaskHandle xQueueSetSendingTask )\r
 {\r
 portBASE_TYPE x;\r
-xQueueSetMemberHandle xActivatedQueue;\r
 \r
        /* Ensure the queues are created and the queue set configured before the\r
        sending task is unsuspended.\r
@@ -618,10 +617,11 @@ xQueueSetMemberHandle xActivatedQueue;
        }\r
 \r
        /* The task that sends to the queues is not running yet, so attempting to\r
-       read from the queue set should fail, resulting in xActivatedQueue being set\r
-       to NULL. */\r
-       xActivatedQueue = xQueueSelectFromSet( xQueueSet, queuesetSHORT_DELAY );\r
-       configASSERT( xActivatedQueue == NULL );\r
+       read from the queue set should fail. */\r
+       if( xQueueSelectFromSet( xQueueSet, queuesetSHORT_DELAY ) != NULL )\r
+       {\r
+               xQueueSetTasksStatus = pdFAIL;\r
+       }\r
 \r
        /* Resume the task that writes to the queues. */\r
        vTaskResume( xQueueSetSendingTask );\r