Enable the Win32 comprehensive test/demo build and run when configUSE_QUEUE_SETS...

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2776 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Demo/WIN32-MSVC/main_full.c b/FreeRTOS/Demo/WIN32-MSVC/main_full.c
index 3a601fed041c1b9d5b58cce155f28bdcdf6afaf6..fddd40303bbf4b528daef36a5da5519ada688845 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MSVC/main_full.c
+++ b/FreeRTOS/Demo/WIN32-MSVC/main_full.c
@@ -193,11 +193,9 @@ int main_full( void )
        vStartRecursiveMutexTasks();\r
        vStartCountingSemaphoreTasks();\r
        vStartDynamicPriorityTasks();\r
-       vStartQueueSetTasks();\r
        vStartQueueOverwriteTask( mainQUEUE_OVERWRITE_PRIORITY );\r
        vStartEventGroupTasks();\r
        vStartInterruptSemaphoreTasks();\r
-       vStartQueueSetPollingTask();\r
        vCreateBlockTimeTasks();\r
        vCreateAbortDelayTasks();\r
        xTaskCreate( prvDemoQueueSpaceFunctions, "QSpace", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );\r
@@ -209,6 +207,13 @@ int main_full( void )
        vStartStreamBufferInterruptDemo();\r
        vStartMessageBufferAMPTasks( configMINIMAL_STACK_SIZE );\r
 \r
+       #if( configUSE_QUEUE_SETS == 1 )\r
+       {\r
+               vStartQueueSetTasks();\r
+               vStartQueueSetPollingTask();\r
+       }\r
+       #endif\r
+\r
        #if( configSUPPORT_STATIC_ALLOCATION == 1 )\r
        {\r
                vStartStaticallyAllocatedTasks();\r
@@ -333,18 +338,10 @@ HeapStats_t xHeapStats;
                {\r
                        pcStatusMessage = "Error: Dynamic";\r
                }\r
-               else if( xAreQueueSetTasksStillRunning() != pdPASS )\r
-               {\r
-                       pcStatusMessage = "Error: Queue set";\r
-               }\r
                else if( xIsQueueOverwriteTaskStillRunning() != pdPASS )\r
                {\r
                        pcStatusMessage = "Error: Queue overwrite";\r
                }\r
-               else if( xAreQueueSetPollTasksStillRunning() != pdPASS )\r
-               {\r
-                       pcStatusMessage = "Error: Queue set polling";\r
-               }\r
                else if( xAreBlockTimeTestTasksStillRunning() != pdPASS )\r
                {\r
                        pcStatusMessage = "Error: Block time";\r
@@ -362,6 +359,17 @@ HeapStats_t xHeapStats;
                        pcStatusMessage = "Error: Message buffer AMP";\r
                }\r
 \r
+               #if( configUSE_QUEUE_SETS == 1 )\r
+                       else if( xAreQueueSetTasksStillRunning() != pdPASS )\r
+                       {\r
+                               pcStatusMessage = "Error: Queue set";\r
+                       }\r
+                       else if( xAreQueueSetPollTasksStillRunning() != pdPASS )\r
+                       {\r
+                               pcStatusMessage = "Error: Queue set polling";\r
+                       }\r
+               #endif\r
+\r
                #if( configSUPPORT_STATIC_ALLOCATION == 1 )\r
                        else if( xAreStaticAllocationTasksStillRunning() != pdPASS )\r
                        {\r
@@ -471,10 +479,14 @@ TaskHandle_t xTimerTask;
        /* Call the periodic queue overwrite from ISR demo. */\r
        vQueueOverwritePeriodicISRDemo();\r
 \r
-       /* Write to a queue that is in use as part of the queue set demo to\r
-       demonstrate using queue sets from an ISR. */\r
-       vQueueSetAccessQueueSetFromISR();\r
-       vQueueSetPollingInterruptAccess();\r
+       #if( configUSE_QUEUE_SETS == 1 ) /* Remove the tests if queue sets are not defined. */\r
+       {\r
+               /* Write to a queue that is in use as part of the queue set demo to\r
+               demonstrate using queue sets from an ISR. */\r
+               vQueueSetAccessQueueSetFromISR();\r
+               vQueueSetPollingInterruptAccess();\r
+       }\r
+       #endif\r
 \r
        /* Exercise event groups from interrupts. */\r
        vPeriodicEventGroupsProcessing();\r