From 477466e517e81dc9374919a76bb3bf62760d2fc8 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 26 Aug 2008 15:01:47 +0000 Subject: [PATCH] Windows runs more tests because it outputs 3 digit exponents. Fix tests and test plan to accommodate this. --- src/libCom/test/epicsStdioTest.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/libCom/test/epicsStdioTest.c b/src/libCom/test/epicsStdioTest.c index 2ed810c5b..011e67023 100644 --- a/src/libCom/test/epicsStdioTest.c +++ b/src/libCom/test/epicsStdioTest.c @@ -30,14 +30,17 @@ #define LINE_2 "# This is second and last line of sample report\n" static void testEpicsSnprintf() { + char exbuffer[80], buffer[80]; const int ivalue = 1234; const float fvalue = 1.23e4; const char *svalue = "OneTwoThreeFour"; const char *format = "int %d float %8.2e string %s"; - const char *expected = "int 1234 float 1.23e+04 string OneTwoThreeFour"; - char buffer[80]; - int size, rtn; - int rlen = strlen(expected)+1; + const char *expected = exbuffer; + size_t size; + int rtn, rlen; + + sprintf(exbuffer, format, ivalue, fvalue, svalue); + rlen = strlen(expected)+1; strcpy(buffer, "AAAA"); @@ -112,7 +115,11 @@ void testStdoutRedir (const char *report) MAIN(epicsStdioTest) { +#ifdef _WIN32 + testPlan(166); +#else testPlan(163); +#endif testEpicsSnprintf(); testStdoutRedir("report"); return testDone();