epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Fixes for testConveyor on RTEMS

Browse Source
This commit is contained in:
Andrew Johnson
2021-01-03 21:41:35 -06:00
committed by mdavidsaver
parent f3486211f5
commit 6d19349a5d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
testCa/Makefile
View File

@@ -17,7 +17,7 @@ PROD_LIBS += pvAccess pvAccessCA pvData $(EPICS_BASE_IOC_LIBS)
PROD_SYS_LIBS_WIN32 += netapi32 ws2_32 PROD_SYS_LIBS_WIN32 += netapi32 ws2_32
ifdef BASE_3_16 ifdef BASE_3_16
testCaProvider_SRCS_RTEMS += rtemsTestData.c PROD_SRCS_RTEMS += rtemsTestData.c
testCaProvider_SRCS += testIoc_registerRecordDeviceDriver.cpp testCaProvider_SRCS += testIoc_registerRecordDeviceDriver.cpp
REGRDDFLAGS = -l REGRDDFLAGS = -l

2
testCa/testConveyor.cpp
View File

@@ -130,7 +130,7 @@ void testOperation(void)
testFail("Client's notify() not called"); testFail("Client's notify() not called");
c1.reset(); // Clean up c1 c1.reset(); // Clean up c1
if (!cgone.tryWait()) if (!cgone.wait(TIMEOUT))
testFail("Client's destructor not called"); testFail("Client's destructor not called");
testDiag("2. Queue accepts notification while conveyor is busy."); testDiag("2. Queue accepts notification while conveyor is busy.");