From b4be72853907a2235098abeaf6329507063b0f8c Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 26 Apr 2010 17:19:10 -0500 Subject: [PATCH] cvtFastPerform measures performance, it doesn't do functional testing. * Cleaned up some warning messages in it on darwin * Removed it from the epicsRunLibComTests function. --- src/libCom/test/Makefile | 3 ++- src/libCom/test/cvtFastPerform.cpp | 5 +++++ src/libCom/test/epicsRunLibComTests.c | 9 +++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/libCom/test/Makefile b/src/libCom/test/Makefile index 255d07fd1..6989542b2 100644 --- a/src/libCom/test/Makefile +++ b/src/libCom/test/Makefile @@ -151,7 +151,8 @@ rtemsTestHarness_SRCS += $(testHarness_SRCS) TESTSCRIPTS_HOST += $(TESTS:%=%.t) -# The following are not test programs, they measure performance +# The following are not test programs, they measure performance. +# They should not be added to TESTS or to epicsRunLibComTests.c TESTPROD_HOST += epicsThreadPerform epicsThreadPerform_SRCS += epicsThreadPerform.cpp diff --git a/src/libCom/test/cvtFastPerform.cpp b/src/libCom/test/cvtFastPerform.cpp index a8338c688..5b1ab4c38 100644 --- a/src/libCom/test/cvtFastPerform.cpp +++ b/src/libCom/test/cvtFastPerform.cpp @@ -18,6 +18,7 @@ typedef void ( * PTestFunc ) ( const double &, char * pBug, size_t bufSize ); class Test { public: Test (); + virtual ~Test (); void execute (); protected: char _pDst[128]; @@ -48,6 +49,10 @@ Test :: { } +Test :: ~Test () +{ +} + void Test :: execute () { static const unsigned lowPrecision = 2; diff --git a/src/libCom/test/epicsRunLibComTests.c b/src/libCom/test/epicsRunLibComTests.c index 9445c99cb..77c06e673 100644 --- a/src/libCom/test/epicsRunLibComTests.c +++ b/src/libCom/test/epicsRunLibComTests.c @@ -6,8 +6,12 @@ \*************************************************************************/ /* - * Run libCom tests as a batch + * Run libCom 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 @@ -34,7 +38,6 @@ int ringPointerTest(void); int ringBytesTest(void); int blockingSockTest(void); int taskwdTest(void); -int cvtFastPerform(void); int epicsExitTest(void); void epicsRunLibComTests(void) @@ -91,8 +94,6 @@ void epicsRunLibComTests(void) runTest(taskwdTest); - runTest(cvtFastPerform); - /* * Exit must come last as it never returns */