tests: PROD_HOST to TESTPROD_HOST; VxWorks tests for testApp/pv PASSES

testApp/copy/Makefile

@@ -2,12 +2,12 @@ TOP=../..
 
 include $(TOP)/configure/CONFIG
 
-PROD_HOST += testCreateRequest
+TESTPROD_HOST += testCreateRequest
 testCreateRequest_SRCS = testCreateRequest.cpp
 testCreateRequest_LIBS = pvData Com
 TESTS += testCreateRequest
 
-PROD_HOST += testPVCopy
+TESTPROD_HOST += testPVCopy
 testPVCopy_SRCS += testPVCopy.cpp
 testPVCopy_LIBS += pvData Com
 TESTS += testPVCopy

testApp/misc/Makefile

@@ -4,54 +4,54 @@ include $(TOP)/configure/CONFIG
 
 PROD_LIBS += pvData Com
 
-PROD_HOST += testThread
+TESTPROD_HOST += testThread
 testThread_SRCS += testThread.cpp
 TESTS += testThread
 
-PROD_HOST += testTimer
+TESTPROD_HOST += testTimer
 testTimer_SRCS += testTimer.cpp
 TESTS += testTimer
 
-PROD_HOST += testBitSet
+TESTPROD_HOST += testBitSet
 testBitSet_SRCS += testBitSet.cpp
 TESTS += testBitSet
 
-PROD_HOST += testOverrunBitSet
+TESTPROD_HOST += testOverrunBitSet
 testOverrunBitSet_SRCS += testOverrunBitSet.cpp
 TESTS += testOverrunBitSet
 
-PROD_HOST += testByteOrder
+TESTPROD_HOST += testByteOrder
 testByteOrder_SRCS += testByteOrder.cpp
 
-PROD_HOST += testByteBuffer
+TESTPROD_HOST += testByteBuffer
 testByteBuffer_SRCS += testByteBuffer.cpp
 TESTS += testByteBuffer
 
-PROD_HOST += testBaseException
+TESTPROD_HOST += testBaseException
 testBaseException_SRCS += testBaseException.cpp
 TESTS += testBaseException
 
-PROD_HOST += testSharedVector
+TESTPROD_HOST += testSharedVector
 testSharedVector_SRCS += testSharedVector.cpp
 TESTS += testSharedVector
 
-PROD_HOST += testSerialization
+TESTPROD_HOST += testSerialization
 testSerialization_SRCS += testSerialization.cpp
 TESTS += testSerialization
 
-PROD_HOST += testTimeStamp
+TESTPROD_HOST += testTimeStamp
 testTimeStamp_SRCS += testTimeStamp.cpp
 TESTS += testTimeStamp
 
-PROD_HOST += testQueue
+TESTPROD_HOST += testQueue
 testQueue_SRCS += testQueue.cpp
 TESTS += testQueue
 
-PROD_HOST += testMessageQueue
+TESTPROD_HOST += testMessageQueue
 testMessageQueue_SRCS += testMessageQueue.cpp
 TESTS += testMessageQueue
 
-PROD_HOST += testTypeCast
+TESTPROD_HOST += testTypeCast
 testTypeCast_SRCS += testTypeCast.cpp
 TESTS += testTypeCast
 

testApp/pv/Makefile

@@ -2,66 +2,80 @@ TOP=../..
 
 include $(TOP)/configure/CONFIG
 
-PROD_HOST += testBitSetUtil
+PROD_LIBS += pvData Com
+
+TESTPROD_HOST += testBitSetUtil
 testBitSetUtil_SRCS += testBitSetUtil.cpp
-testBitSetUtil_LIBS += pvData Com
+testHarness_SRCS += testBitSetUtil.cpp
 TESTS += testBitSetUtil
 
-PROD_HOST += testIntrospect
+TESTPROD_HOST += testIntrospect
 testIntrospect_SRCS += testIntrospect.cpp
-testIntrospect_LIBS += pvData Com
+testHarness_SRCS += testIntrospect.cpp
 TESTS += testIntrospect
 
-PROD_HOST += testPVType
+TESTPROD_HOST += testPVType
 testPVType_SRCS += testPVType.cpp
-testPVType_LIBS += pvData Com
+testHarness_SRCS += testPVType.cpp
 TESTS += testPVType
 
-PROD_HOST += testStandardField
+TESTPROD_HOST += testStandardField
 testStandardField_SRCS += testStandardField.cpp
-testStandardField_LIBS += pvData Com
+testHarness_SRCS += testStandardField.cpp
 TESTS += testStandardField
 
-PROD_HOST += testStandardPVField
+TESTPROD_HOST += testStandardPVField
 testStandardPVField_SRCS += testStandardPVField.cpp
-testStandardPVField_LIBS += pvData Com
+testHarness_SRCS += testStandardPVField.cpp
 TESTS += testStandardPVField
 
-PROD_HOST += testPVData
+TESTPROD_HOST += testPVData
 testPVData_SRCS += testPVData.cpp
-testPVData_LIBS += pvData Com
+testHarness_SRCS += testPVData.cpp
 TESTS += testPVData
 
-PROD_HOST += testPVUnion
+TESTPROD_HOST += testPVUnion
 testPVUnion_SRCS += testPVUnion.cpp
-testPVUnion_LIBS += pvData Com
+testHarness_SRCS += testPVUnion.cpp
 TESTS += testPVUnion
 
-PROD_HOST += testConvert
+TESTPROD_HOST += testConvert
 testConvert_SRCS += testConvert.cpp
-testConvert_LIBS += pvData Com
+testHarness_SRCS += testConvert.cpp
 TESTS += testConvert
 
-PROD_HOST += testPVScalarArray
+TESTPROD_HOST += testPVScalarArray
 testPVScalarArray_SRCS += testPVScalarArray.cpp
-testPVScalarArray_LIBS += pvData Com
+testHarness_SRCS += testPVScalarArray.cpp
 TESTS += testPVScalarArray
 
-PROD_HOST += testPVStructureArray
+TESTPROD_HOST += testPVStructureArray
 testPVStructureArray_SRCS += testPVStructureArray.cpp
-testPVStructureArray_LIBS += pvData Com
+testHarness_SRCS += testPVStructureArray.cpp
 TESTS += testPVStructureArray
 
-PROD_HOST += testOperators
+TESTPROD_HOST += testOperators
 testOperators_SRCS += testOperators.cpp
-testOperators_LIBS += pvData Com
+testHarness_SRCS += testOperators.cpp
 TESTS += testOperators
 
-PROD_HOST += testFieldBuilder
+TESTPROD_HOST += testFieldBuilder
 testFieldBuilder_SRCS += testFieldBuilder.cpp
-testFieldBuilder_LIBS += pvData Com
+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

testApp/pv/epicsRunPVDataTests.c

@@ -0,0 +1,42 @@
+/*
+ * 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 <stdio.h>
+#include <epicsThread.h>
+#include <epicsUnitTest.h>
+
+int testBitSetUtil(int);
+int testConvert(int);
+int testFieldBuilder(int);
+int testIntrospect(int);
+int testOperators(int);
+int testPVData(int);
+int testPVScalarArray(int);
+int testPVStructureArray(int);
+int testPVType(int);
+int testPVUnion(int);
+int testStandardField(int);
+int testStandardPVField(int);
+
+void epicsRunPVDataTests(void)
+{
+    testHarness();
+
+    runTest(testBitSetUtil);
+    runTest(testConvert);
+    runTest(testFieldBuilder);
+    runTest(testIntrospect);
+    runTest(testOperators);
+    runTest(testPVData);
+    runTest(testPVScalarArray);
+    runTest(testPVStructureArray);
+    runTest(testPVType);
+    runTest(testPVUnion);
+    runTest(testStandardField);
+    runTest(testStandardPVField);
+
+}

testApp/pv/testPVUnion.cpp

@@ -37,7 +37,7 @@ static StandardFieldPtr standardField = getStandardField();
 static StandardPVFieldPtr standardPVField = getStandardPVField();
 static ConvertPtr convert = getConvert();
 
-static void testPVUnion()
+static void testPVUnionType()
 {
     if(debug) 
         std::cout << std::endl << "testPVUnion" << std::endl;
@@ -115,10 +115,10 @@ static void testPVUnionArray()
 }
 
 
-MAIN(testPVData)
+MAIN(testPVUnion)
 {
     testPlan(6);
-    testPVUnion();
+    testPVUnionType();
     testPVUnionArray();
     return testDone();
 }