Enable the Win32 comprehensive test/demo build and run when configUSE_QUEUE_SETS is set to 0.

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

1 files changed, 26 insertions, 14 deletions

diff --git a/FreeRTOS/Demo/WIN32-MSVC/main_full.c b/FreeRTOS/Demo/WIN32-MSVC/main_full.c
index 3a601fed0..fddd40303 100644
--- 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();

 	vStartCountingSemaphoreTasks();

 	vStartDynamicPriorityTasks();

-	vStartQueueSetTasks();

 	vStartQueueOverwriteTask( mainQUEUE_OVERWRITE_PRIORITY );

 	vStartEventGroupTasks();

 	vStartInterruptSemaphoreTasks();

-	vStartQueueSetPollingTask();

 	vCreateBlockTimeTasks();

 	vCreateAbortDelayTasks();

 	xTaskCreate( prvDemoQueueSpaceFunctions, "QSpace", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );

@@ -209,6 +207,13 @@ int main_full( void )
 	vStartStreamBufferInterruptDemo();

 	vStartMessageBufferAMPTasks( configMINIMAL_STACK_SIZE );

 

+	#if( configUSE_QUEUE_SETS == 1 )

+	{

+		vStartQueueSetTasks();

+		vStartQueueSetPollingTask();

+	}

+	#endif

+

 	#if( configSUPPORT_STATIC_ALLOCATION == 1 )

 	{

 		vStartStaticallyAllocatedTasks();

@@ -333,18 +338,10 @@ HeapStats_t xHeapStats;
 		{

 			pcStatusMessage = "Error: Dynamic";

 		}

-		else if( xAreQueueSetTasksStillRunning() != pdPASS )

-		{

-			pcStatusMessage = "Error: Queue set";

-		}

 		else if( xIsQueueOverwriteTaskStillRunning() != pdPASS )

 		{

 			pcStatusMessage = "Error: Queue overwrite";

 		}

-		else if( xAreQueueSetPollTasksStillRunning() != pdPASS )

-		{

-			pcStatusMessage = "Error: Queue set polling";

-		}

 		else if( xAreBlockTimeTestTasksStillRunning() != pdPASS )

 		{

 			pcStatusMessage = "Error: Block time";

@@ -362,6 +359,17 @@ HeapStats_t xHeapStats;
 			pcStatusMessage = "Error: Message buffer AMP";

 		}

 

+		#if( configUSE_QUEUE_SETS == 1 )

+			else if( xAreQueueSetTasksStillRunning() != pdPASS )

+			{

+				pcStatusMessage = "Error: Queue set";

+			}

+			else if( xAreQueueSetPollTasksStillRunning() != pdPASS )

+			{

+				pcStatusMessage = "Error: Queue set polling";

+			}

+		#endif

+

 		#if( configSUPPORT_STATIC_ALLOCATION == 1 )

 			else if( xAreStaticAllocationTasksStillRunning() != pdPASS )

 			{

@@ -471,10 +479,14 @@ TaskHandle_t xTimerTask;
 	/* Call the periodic queue overwrite from ISR demo. */

 	vQueueOverwritePeriodicISRDemo();

 

-	/* Write to a queue that is in use as part of the queue set demo to

-	demonstrate using queue sets from an ISR. */

-	vQueueSetAccessQueueSetFromISR();

-	vQueueSetPollingInterruptAccess();

+	#if( configUSE_QUEUE_SETS == 1 ) /* Remove the tests if queue sets are not defined. */

+	{

+		/* Write to a queue that is in use as part of the queue set demo to

+		demonstrate using queue sets from an ISR. */

+		vQueueSetAccessQueueSetFromISR();

+		vQueueSetPollingInterruptAccess();

+	}

+	#endif

 

 	/* Exercise event groups from interrupts. */

 	vPeriodicEventGroupsProcessing();