From 26d60bc516b83720f6863d105ae8e7541bd50ab2 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 13 Feb 2015 15:29:08 -0600 Subject: [PATCH] Attempt to fix Windows test failures epicsMessageQueue test wasn't printing the last test result. --- src/libCom/test/epicsMessageQueueTest.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libCom/test/epicsMessageQueueTest.cpp b/src/libCom/test/epicsMessageQueueTest.cpp index f9c1d98fa..5b0f46490 100644 --- a/src/libCom/test/epicsMessageQueueTest.cpp +++ b/src/libCom/test/epicsMessageQueueTest.cpp @@ -10,8 +10,6 @@ * $Revision-Id$ * * Author W. Eric Norum - * norume@aps.anl.gov - * 630 252 4793 */ #include #include @@ -109,6 +107,7 @@ receiver(void *arg) testDiag("Sender %d -- %d messages", sender, expectmsg[sender-1]-1); } testOk1(errors == 0); + testDiag("Receiver finished"); epicsEventSignal(finished); } @@ -126,6 +125,7 @@ sender(void *arg) epicsThreadSleep(0.005 * (randBelow(5))); epicsThreadSleep(0.005 * (randBelow(20))); } + testDiag("%s exiting, sent %d messages", epicsThreadGetNameSelf(), i-1); } extern "C" void messageQueueTest(void *parm) @@ -273,13 +273,13 @@ extern "C" void messageQueueTest(void *parm) * Single receiver, multiple sender tests */ testDiag("Single receiver, multiple sender tests:"); - testDiag("This test takes 5 minutes..."); + testDiag("This test lasts 60 seconds..."); epicsThreadCreate("Sender 1", epicsThreadPriorityLow, epicsThreadGetStackSize(epicsThreadStackMedium), sender, q1); epicsThreadCreate("Sender 2", epicsThreadPriorityMedium, epicsThreadGetStackSize(epicsThreadStackMedium), sender, q1); epicsThreadCreate("Sender 3", epicsThreadPriorityHigh, epicsThreadGetStackSize(epicsThreadStackMedium), sender, q1); epicsThreadCreate("Sender 4", epicsThreadPriorityHigh, epicsThreadGetStackSize(epicsThreadStackMedium), sender, q1); - epicsThreadSleep(300.0); + epicsThreadSleep(60.0); testExit = 1; } @@ -295,6 +295,7 @@ MAIN(epicsMessageQueueTest) messageQueueTest, NULL); epicsEventWait(finished); + epicsThreadSleep(1.0); return testDone(); }