vxWork tests for all subtests; still need to combine them all to one
This commit is contained in:
+16
-4
@@ -2,20 +2,32 @@ TOP=../..
|
||||
|
||||
include $(TOP)/configure/CONFIG
|
||||
|
||||
PROD_LIBS += pvData Com
|
||||
|
||||
TESTPROD_HOST += testCreateRequest
|
||||
testCreateRequest_SRCS = testCreateRequest.cpp
|
||||
testCreateRequest_LIBS = pvData Com
|
||||
testHarness_SRCS += testCreateRequest.cpp
|
||||
TESTS += testCreateRequest
|
||||
|
||||
TESTPROD_HOST += testPVCopy
|
||||
testPVCopy_SRCS += testPVCopy.cpp
|
||||
testPVCopy_LIBS += pvData Com
|
||||
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
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
/*
|
||||
* 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 testCreateRequest(void);
|
||||
int testPVCopy(void);
|
||||
|
||||
void epicsRunPVDataTests(void)
|
||||
{
|
||||
testHarness();
|
||||
|
||||
runTest(testCreateRequest);
|
||||
runTest(testPVCopy);
|
||||
|
||||
}
|
||||
@@ -20,7 +20,7 @@ using std::endl;
|
||||
|
||||
static bool debug = false;
|
||||
|
||||
static void testCreateRequest() {
|
||||
static void testCreateRequestInternal() {
|
||||
printf("testCreateRequest... \n");
|
||||
CreateRequest::shared_pointer createRequest = CreateRequest::create();
|
||||
PVStringPtr pvString;
|
||||
@@ -307,7 +307,7 @@ static void testCreateRequest() {
|
||||
MAIN(testCreateRequest)
|
||||
{
|
||||
testPlan(117);
|
||||
testCreateRequest();
|
||||
testCreateRequestInternal();
|
||||
return testDone();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user