From 73c4896cce9db791cad6a421338609dc50b9c2fd Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Fri, 31 Oct 2014 17:49:10 -0400 Subject: [PATCH] tests: VxWorks tests are now ready to be run --- testApp/Makefile | 6 ++++-- testApp/pvDataAllTests.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/testApp/Makefile b/testApp/Makefile index 3dd7a46..59bf634 100644 --- a/testApp/Makefile +++ b/testApp/Makefile @@ -12,9 +12,11 @@ include $(PVDATA_TEST)/pv/Makefile include $(PVDATA_TEST)/property/Makefile include $(PVDATA_TEST)/copy/Makefile +# The testHarness runs all the test programs in a known working order. +testHarness_SRCS += pvDataAllTests.c + PROD_vxWorks = vxTestHarness -vxTestHarness_SRCS += pvDataAllTests -vxTestHarness_OBJS += misc/ +vxTestHarness_SRCS += $(testHarness_SRCS) TESTSPEC_vxWorks = vxTestHarness.$(MUNCH_SUFFIX); pvDataAllTests TESTSCRIPTS_HOST += $(TESTS:%=%.t) diff --git a/testApp/pvDataAllTests.c b/testApp/pvDataAllTests.c index 94660f8..1abbaa7 100644 --- a/testApp/pvDataAllTests.c +++ b/testApp/pvDataAllTests.c @@ -44,7 +44,7 @@ int testPVUnion(void); int testStandardField(void); int testStandardPVField(void); -void epicsRunPVDataTests(void) +void pvDataAllTests(void) { testHarness();