diff --git a/pvDataCPP.files b/pvDataCPP.files index 10cd1dc..abca695 100644 --- a/pvDataCPP.files +++ b/pvDataCPP.files @@ -234,3 +234,226 @@ testApp/pv/testPVType.cpp testApp/pv/testStandardField.cpp testApp/pv/testStandardPVField.cpp src/factory/printer.cpp +configure/O.darwin-x86/Makefile +configure/Makefile +include/pv/alarm.h +include/pv/bitSet.h +include/pv/bitSetUtil.h +include/pv/byteBuffer.h +include/pv/control.h +include/pv/convert.h +include/pv/createRequest.h +include/pv/current_function.h +include/pv/destroyable.h +include/pv/display.h +include/pv/epicsException.h +include/pv/event.h +include/pv/executor.h +include/pv/factory.h +include/pv/localStaticLock.h +include/pv/lock.h +include/pv/messageQueue.h +include/pv/monitor.h +include/pv/monitorPlugin.h +include/pv/noDefaultMethods.h +include/pv/printer.h +include/pv/pvAlarm.h +include/pv/pvControl.h +include/pv/pvCopy.h +include/pv/pvData.h +include/pv/pvDisplay.h +include/pv/pvEnumerated.h +include/pv/pvIntrospect.h +include/pv/pvSubArrayCopy.h +include/pv/pvTimeStamp.h +include/pv/pvType.h +include/pv/queue.h +include/pv/requester.h +include/pv/serialize.h +include/pv/serializeHelper.h +include/pv/sharedPtr.h +include/pv/sharedVector.h +include/pv/standardField.h +include/pv/standardPVField.h +include/pv/status.h +include/pv/templateMeta.h +include/pv/thread.h +include/pv/timeFunction.h +include/pv/timer.h +include/pv/timeStamp.h +include/pv/typeCast.h +src/copy/createRequest.cpp +src/copy/createRequest.h +src/copy/Makefile +src/copy/pvCopy.cpp +src/copy/pvCopy.h +src/factory/Compare.cpp +src/factory/Convert.cpp +src/factory/factory.h +src/factory/FieldCreateFactory.cpp +src/factory/Makefile +src/factory/printer.cpp +src/factory/PVArray.cpp +src/factory/PVDataCreateFactory.cpp +src/factory/PVField.cpp +src/factory/PVScalar.cpp +src/factory/PVScalarArray.cpp +src/factory/PVStructure.cpp +src/factory/PVStructureArray.cpp +src/factory/pvSubArrayCopy.cpp +src/factory/PVUnion.cpp +src/factory/PVUnionArray.cpp +src/factory/StandardField.cpp +src/factory/StandardPVField.cpp +src/factory/TypeFunc.cpp +src/misc/bitSet.cpp +src/misc/bitSet.h +src/misc/byteBuffer.cpp +src/misc/byteBuffer.h +src/misc/current_function.h +src/misc/destroyable.h +src/misc/epicsException.cpp +src/misc/epicsException.h +src/misc/event.cpp +src/misc/event.h +src/misc/executor.cpp +src/misc/executor.h +src/misc/localStaticLock.cpp +src/misc/localStaticLock.h +src/misc/lock.h +src/misc/Makefile +src/misc/messageQueue.cpp +src/misc/messageQueue.h +src/misc/noDefaultMethods.h +src/misc/parseToPOD.cpp +src/misc/queue.h +src/misc/requester.cpp +src/misc/requester.h +src/misc/serialize.h +src/misc/serializeHelper.cpp +src/misc/serializeHelper.h +src/misc/sharedPtr.h +src/misc/sharedVector.h +src/misc/status.cpp +src/misc/status.h +src/misc/templateMeta.h +src/misc/thread.h +src/misc/timeFunction.cpp +src/misc/timeFunction.h +src/misc/timer.cpp +src/misc/timer.h +src/misc/typeCast.cpp +src/misc/typeCast.h +src/monitor/Makefile +src/monitor/monitor.cpp +src/monitor/monitor.h +src/monitor/monitorPlugin.cpp +src/monitor/monitorPlugin.h +src/O.darwin-x86/Makefile +src/property/alarm.cpp +src/property/alarm.h +src/property/control.h +src/property/display.h +src/property/Makefile +src/property/pvAlarm.cpp +src/property/pvAlarm.h +src/property/pvControl.cpp +src/property/pvControl.h +src/property/pvDisplay.cpp +src/property/pvDisplay.h +src/property/pvEnumerated.cpp +src/property/pvEnumerated.h +src/property/pvTimeStamp.cpp +src/property/pvTimeStamp.h +src/property/timeStamp.cpp +src/property/timeStamp.h +src/pv/convert.h +src/pv/Makefile +src/pv/printer.h +src/pv/pvData.h +src/pv/pvIntrospect.h +src/pv/pvSubArrayCopy.h +src/pv/pvType.h +src/pv/standardField.h +src/pv/standardPVField.h +src/pvMisc/bitSetUtil.cpp +src/pvMisc/bitSetUtil.h +src/pvMisc/Makefile +src/Makefile +testApp/copy/epicsRunPVDataTests.c +testApp/copy/Makefile +testApp/copy/testCreateRequest.cpp +testApp/copy/testPVCopy.cpp +testApp/misc/epicsRunPVDataTests.c +testApp/misc/Makefile +testApp/misc/testBaseException.cpp +testApp/misc/testBitSet.cpp +testApp/misc/testByteBuffer.cpp +testApp/misc/testByteOrder.cpp +testApp/misc/testMessageQueue.cpp +testApp/misc/testOverrunBitSet.cpp +testApp/misc/testQueue.cpp +testApp/misc/testSerialization.cpp +testApp/misc/testSharedVector.cpp +testApp/misc/testThread.cpp +testApp/misc/testTimer.cpp +testApp/misc/testTimeStamp.cpp +testApp/misc/testTypeCast.cpp +testApp/property/epicsRunPVDataTests.c +testApp/property/Makefile +testApp/property/testProperty.cpp +testApp/pv/epicsRunPVDataTests.c +testApp/pv/Makefile +testApp/pv/testBitSetUtil.cpp +testApp/pv/testConvert.cpp +testApp/pv/testFieldBuilder.cpp +testApp/pv/testIntrospect.cpp +testApp/pv/testOperators.cpp +testApp/pv/testPVData.cpp +testApp/pv/testPVScalarArray.cpp +testApp/pv/testPVStructureArray.cpp +testApp/pv/testPVType.cpp +testApp/pv/testPVUnion.cpp +testApp/pv/testStandardField.cpp +testApp/pv/testStandardPVField.cpp +testApp/Makefile +Makefile +testApp/copy/epicsRunPVDataTests.c +testApp/copy/Makefile +testApp/copy/testCreateRequest.cpp +testApp/copy/testPVCopy.cpp +testApp/misc/epicsRunPVDataTests.c +testApp/misc/Makefile +testApp/misc/testBaseException.cpp +testApp/misc/testBitSet.cpp +testApp/misc/testByteBuffer.cpp +testApp/misc/testByteOrder.cpp +testApp/misc/testMessageQueue.cpp +testApp/misc/testOverrunBitSet.cpp +testApp/misc/testQueue.cpp +testApp/misc/testSerialization.cpp +testApp/misc/testSharedVector.cpp +testApp/misc/testThread.cpp +testApp/misc/testTimer.cpp +testApp/misc/testTimeStamp.cpp +testApp/misc/testTypeCast.cpp +testApp/O.darwin-x86/Makefile +testApp/property/epicsRunPVDataTests.c +testApp/property/Makefile +testApp/property/testProperty.cpp +testApp/pv/epicsRunPVDataTests.c +testApp/pv/Makefile +testApp/pv/testBitSetUtil.cpp +testApp/pv/testConvert.cpp +testApp/pv/testFieldBuilder.cpp +testApp/pv/testIntrospect.cpp +testApp/pv/testOperators.cpp +testApp/pv/testPVData.cpp +testApp/pv/testPVScalarArray.cpp +testApp/pv/testPVStructureArray.cpp +testApp/pv/testPVType.cpp +testApp/pv/testPVUnion.cpp +testApp/pv/testStandardField.cpp +testApp/pv/testStandardPVField.cpp +testApp/Makefile +testApp/pvDataAllTests.c diff --git a/testApp/Makefile b/testApp/Makefile index fa71872..3dd7a46 100644 --- a/testApp/Makefile +++ b/testApp/Makefile @@ -1,16 +1,24 @@ +# Makefile for the pvData tests + TOP = .. include $(TOP)/configure/CONFIG -DIRS += misc -DIRS += pv -DIRS += property -DIRS += copy -# TODO combined test vxTestHarness -#PROD_vxWorks = vxTestHarness -#vxTestHarness_SRCS += pvDataAllTests -#vxTestHarness_OBJS += misc/ -#TESTSPEC_vxWorks = vxTestHarness.$(MUNCH_SUFFIX); pvDataAllTests +PVDATA_TEST = $(TOP)/testApp -include $(TOP)/configure/RULES_DIRS +PROD_LIBS += pvData Com + +include $(PVDATA_TEST)/misc/Makefile +include $(PVDATA_TEST)/pv/Makefile +include $(PVDATA_TEST)/property/Makefile +include $(PVDATA_TEST)/copy/Makefile + +PROD_vxWorks = vxTestHarness +vxTestHarness_SRCS += pvDataAllTests +vxTestHarness_OBJS += misc/ +TESTSPEC_vxWorks = vxTestHarness.$(MUNCH_SUFFIX); pvDataAllTests + +TESTSCRIPTS_HOST += $(TESTS:%=%.t) + +include $(TOP)/configure/RULES diff --git a/testApp/copy/Makefile b/testApp/copy/Makefile index 21e998b..bee2227 100644 --- a/testApp/copy/Makefile +++ b/testApp/copy/Makefile @@ -1,8 +1,6 @@ -TOP=../.. +# This is a Makefile fragment, see ../Makefile -include $(TOP)/configure/CONFIG - -PROD_LIBS += pvData Com +SRC_DIRS += $(PVDATA_TEST)/copy TESTPROD_HOST += testCreateRequest testCreateRequest_SRCS = testCreateRequest.cpp @@ -13,22 +11,3 @@ TESTPROD_HOST += testPVCopy testPVCopy_SRCS += testPVCopy.cpp testHarness_SRCS += testPVCopy.cpp TESTS += testPVCopy - -# The testHarness runs all the test programs in a known working order. -testHarness_SRCS += epicsRunPVDataTests.c - -PROD_vxWorks = vxTestHarness -vxTestHarness_SRCS += $(testHarness_SRCS) -TESTSPEC_vxWorks = vxTestHarness.$(MUNCH_SUFFIX); epicsRunPVDataTests.c - -#PROD_RTEMS += rtemsTestHarness -#rtemsTestHarness_SRCS += rtemsTestHarness.c -#rtemsTestHarness_SRCS += $(testHarness_SRCS) -#TESTSPEC_RTEMS = rtemsTestHarness.boot; epicsRunPVDataTests.c - -TESTSCRIPTS_HOST += $(TESTS:%=%.t) - -include $(TOP)/configure/RULES -#---------------------------------------- -# ADD RULES AFTER THIS LINE - diff --git a/testApp/copy/epicsRunPVDataTests.c b/testApp/copy/epicsRunPVDataTests.c deleted file mode 100644 index 0530a6e..0000000 --- a/testApp/copy/epicsRunPVDataTests.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Run pvData tests as a batch. - * - * Do *not* include performance measurements here, they don't help to - * prove functionality (which is the point of this convenience routine). - */ - -#include -#include -#include - -int testCreateRequest(void); -int testPVCopy(void); - -void epicsRunPVDataTests(void) -{ - testHarness(); - - runTest(testCreateRequest); - runTest(testPVCopy); - -} diff --git a/testApp/misc/Makefile b/testApp/misc/Makefile index d4e4004..06b95ed 100644 --- a/testApp/misc/Makefile +++ b/testApp/misc/Makefile @@ -1,8 +1,6 @@ -TOP=../.. +# This is a Makefile fragment, see ../Makefile -include $(TOP)/configure/CONFIG - -PROD_LIBS += pvData Com +SRC_DIRS += $(PVDATA_TEST)/misc TESTPROD_HOST += testThread testThread_SRCS += testThread.cpp @@ -66,22 +64,3 @@ TESTPROD_HOST += testTypeCast testTypeCast_SRCS += testTypeCast.cpp testHarness_SRCS += testTypeCast.cpp TESTS += testTypeCast - -# The testHarness runs all the test programs in a known working order. -testHarness_SRCS += epicsRunPVDataTests.c - -PROD_vxWorks = vxTestHarness -vxTestHarness_SRCS += $(testHarness_SRCS) -TESTSPEC_vxWorks = vxTestHarness.$(MUNCH_SUFFIX); epicsRunPVDataTests - -#PROD_RTEMS += rtemsTestHarness -#rtemsTestHarness_SRCS += rtemsTestHarness.c -#rtemsTestHarness_SRCS += $(testHarness_SRCS) -#TESTSPEC_RTEMS = rtemsTestHarness.boot; epicsRunPVDataTests - -TESTSCRIPTS_HOST += $(TESTS:%=%.t) - -include $(TOP)/configure/RULES -#---------------------------------------- -# ADD RULES AFTER THIS LINE - diff --git a/testApp/misc/epicsRunPVDataTests.c b/testApp/misc/epicsRunPVDataTests.c deleted file mode 100644 index 8871bb1..0000000 --- a/testApp/misc/epicsRunPVDataTests.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Run pvData tests as a batch. - * - * Do *not* include performance measurements here, they don't help to - * prove functionality (which is the point of this convenience routine). - */ - -#include -#include -#include - -int testBaseException(void); -int testBitSet(void); -int testByteBuffer(void); -int testMessageQueue(void); -int testOverrunBitSet(void); -int testQueue(void); -int testSerialization(void); -int testSharedVector(void); -int testThread(void); -int testTimeStamp(void); -int testTimer(void); -int testTypeCast(void); - -void epicsRunPVDataTests(void) -{ - testHarness(); - - runTest(testBaseException); - runTest(testBitSet); - runTest(testByteBuffer); - runTest(testMessageQueue); - runTest(testOverrunBitSet); - runTest(testQueue); - runTest(testSerialization); - runTest(testSharedVector); - runTest(testThread); - runTest(testTimeStamp); - runTest(testTimer); - runTest(testTypeCast); -} diff --git a/testApp/property/Makefile b/testApp/property/Makefile index 67c1aec..c468d79 100644 --- a/testApp/property/Makefile +++ b/testApp/property/Makefile @@ -1,29 +1,8 @@ -TOP=../.. +# This is a Makefile fragment, see ../Makefile -include $(TOP)/configure/CONFIG - -PROD_LIBS = pvData Com +SRC_DIRS += $(PVDATA_TEST)/property TESTPROD_HOST += testProperty testProperty_SRCS += testProperty.cpp testHarness_SRCS += testProperty.cpp TESTS += testProperty - -# The testHarness runs all the test programs in a known working order. -testHarness_SRCS += epicsRunPVDataTests.c - -PROD_vxWorks = vxTestHarness -vxTestHarness_SRCS += $(testHarness_SRCS) -TESTSPEC_vxWorks = vxTestHarness.$(MUNCH_SUFFIX); epicsRunPVDataTests - -#PROD_RTEMS += rtemsTestHarness -#rtemsTestHarness_SRCS += rtemsTestHarness.c -#rtemsTestHarness_SRCS += $(testHarness_SRCS) -#TESTSPEC_RTEMS = rtemsTestHarness.boot; epicsRunPVDataTests - -TESTSCRIPTS_HOST += $(TESTS:%=%.t) - -include $(TOP)/configure/RULES -#---------------------------------------- -# ADD RULES AFTER THIS LINE - diff --git a/testApp/property/epicsRunPVDataTests.c b/testApp/property/epicsRunPVDataTests.c deleted file mode 100644 index e9946dc..0000000 --- a/testApp/property/epicsRunPVDataTests.c +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Run pvData tests as a batch. - * - * Do *not* include performance measurements here, they don't help to - * prove functionality (which is the point of this convenience routine). - */ - -#include -#include -#include - -int testCreateRequest(void); - -void epicsRunPVDataTests(void) -{ - testHarness(); - - runTest(testCreateRequest); - -} diff --git a/testApp/pv/Makefile b/testApp/pv/Makefile index cfa5e3a..a32dedd 100644 --- a/testApp/pv/Makefile +++ b/testApp/pv/Makefile @@ -1,8 +1,6 @@ -TOP=../.. +# This is a Makefile fragment, see ../Makefile -include $(TOP)/configure/CONFIG - -PROD_LIBS += pvData Com +SRC_DIRS += $(PVDATA_TEST)/pv TESTPROD_HOST += testBitSetUtil testBitSetUtil_SRCS += testBitSetUtil.cpp @@ -63,22 +61,3 @@ TESTPROD_HOST += testFieldBuilder testFieldBuilder_SRCS += testFieldBuilder.cpp testHarness_SRCS += testFieldBuilder.cpp TESTS += testFieldBuilder - -# The testHarness runs all the test programs in a known working order. -testHarness_SRCS += epicsRunPVDataTests.c - -PROD_vxWorks = vxTestHarness -vxTestHarness_SRCS += $(testHarness_SRCS) -TESTSPEC_vxWorks = vxTestHarness.$(MUNCH_SUFFIX); epicsRunPVDataTests - -#PROD_RTEMS += rtemsTestHarness -#rtemsTestHarness_SRCS += rtemsTestHarness.c -#rtemsTestHarness_SRCS += $(testHarness_SRCS) -#TESTSPEC_RTEMS = rtemsTestHarness.boot; epicsRunPVDataTests - -TESTSCRIPTS_HOST += $(TESTS:%=%.t) - -include $(TOP)/configure/RULES -#---------------------------------------- -# ADD RULES AFTER THIS LINE - diff --git a/testApp/pv/epicsRunPVDataTests.c b/testApp/pvDataAllTests.c similarity index 51% rename from testApp/pv/epicsRunPVDataTests.c rename to testApp/pvDataAllTests.c index d79fc72..94660f8 100644 --- a/testApp/pv/epicsRunPVDataTests.c +++ b/testApp/pvDataAllTests.c @@ -9,6 +9,28 @@ #include #include +/* copy */ +int testCreateRequest(void); +int testPVCopy(void); + +/* misc */ +int testBaseException(void); +int testBitSet(void); +int testByteBuffer(void); +int testMessageQueue(void); +int testOverrunBitSet(void); +int testQueue(void); +int testSerialization(void); +int testSharedVector(void); +int testThread(void); +int testTimeStamp(void); +int testTimer(void); +int testTypeCast(void); + +/* property */ +int testCreateRequest(void); + +/* pv */ int testBitSetUtil(void); int testConvert(void); int testFieldBuilder(void); @@ -26,6 +48,28 @@ void epicsRunPVDataTests(void) { testHarness(); + /* copy */ + runTest(testCreateRequest); + runTest(testPVCopy); + + /* misc */ + runTest(testBaseException); + runTest(testBitSet); + runTest(testByteBuffer); + runTest(testMessageQueue); + runTest(testOverrunBitSet); + runTest(testQueue); + runTest(testSerialization); + runTest(testSharedVector); + runTest(testThread); + runTest(testTimeStamp); + runTest(testTimer); + runTest(testTypeCast); + + /* property */ + runTest(testCreateRequest); + + /* pv */ runTest(testBitSetUtil); runTest(testConvert); runTest(testFieldBuilder); @@ -40,3 +84,4 @@ void epicsRunPVDataTests(void) runTest(testStandardPVField); } +