On 09/02/2013 01:19 PM, Lennart Lund wrote: > Hi, > > Changes are already separated into two patches. The first patch implements > the fix for hardcoded root path and does > not affect the test framework. The second patch implements the new > "test_validate2()" function in the test framework > and the usage of this function. However this is not reflected by the first > line in the commit message (shall be > fixed) but can be seen if all lines in the commit messages is read.
I mean that the second patch (as discussed in the mail) should be split into two since it changes both the framework and a test case. Logically independent parts... > > I agree with Hans that the naming could be better. The reason for the naming > is that I didn't want to change the > original name (test_validate()) in the unit_test_fw since it is widely used > (probably by most test cases for all > components). The new function name (test_validate2()) is used to emphasize > that this function is just a variant of > the first one. If I change the name of the original function most test code > has to be refactored accordingly. I will > do if this is OK. A change of function names has to be done by updating the > second patch (see above) and this must > include the refactoring. What I suggest is add both aisrc_validate() and rc_validate() now, change your test case to use rc_validate(). Mark the test_validate() deprecated and then we can do a refactor of all testcases in one big sweep (in a separate changeset). Thanks, Hans > > Thanks' Lennart > >> -----Original Message----- From: Hans Feldt Sent: den 2 september 2013 10:25 >> To: Lennart Lund Cc: >> [email protected]; [email protected] Subject: >> Re: [PATCH 2 of 2] logsv test: Testcases >> must work with different system configurations (#541) part 02 >> >> Hi, >> >> I think we should wait with this patch. First changes should be separated >> into more than one patch, one for the >> framework and one for log. And second the naming is not good. The original >> test_validate() function should have a >> better name like "aisrc_validate" and the new one could be "rc_validate". >> >> Thanks, Hans >> >> >> On 08/14/2013 04:12 PM, Lennart Lund wrote: >>> tests/logsv/tet_LogOiOps.c | 104 ++++++++++++++++++++-------------- >> ------ >>> tests/unit_test_fw/inc/utest.h | 8 +++ tests/unit_test_fw/src/utest.c | >>> 40 +++++++++++++++ 3 files changed, >>> 101 insertions(+), 51 deletions(-) >>> >>> >>> - Improved printout at FAIL for tests using external tools e.g. immadm. >>> Affects test suit 4. >>> >>> diff --git a/tests/logsv/tet_LogOiOps.c b/tests/logsv/tet_LogOiOps.c --- >>> a/tests/logsv/tet_LogOiOps.c +++ >>> b/tests/logsv/tet_LogOiOps.c @@ -42,7 +42,7 @@ void saLogOi_01(void) >>> sprintf(command, "immcfg -a >>> saLogStreamFileName=notification %s", SA_LOG_STREAM_NOTIFICATION); rc = >>> system(command); - >>> test_validate(WEXITSTATUS(rc), 0); + test_validate2(WEXITSTATUS(rc), 0); >>> } >>> >>> /** @@ -64,7 +64,7 @@ void saLogOi_02(void) tststr, SA_LOG_STREAM_ALARM); >>> rc = system(command); - >>> test_validate(WEXITSTATUS(rc), 1); + test_validate2(WEXITSTATUS(rc), 1); >>> } >>> >>> void saLogOi_03(void) @@ -75,7 +75,7 @@ void saLogOi_03(void) >>> sprintf(command, "immcfg -a >>> saLogStreamMaxLogFileSize=1000000 %s", SA_LOG_STREAM_ALARM); rc = >>> system(command); - >>> test_validate(WEXITSTATUS(rc), 0); + test_validate2(WEXITSTATUS(rc), 0); >>> } >>> >>> void saLogOi_04(void) @@ -86,7 +86,7 @@ void saLogOi_04(void) >>> sprintf(command, "immcfg -a >>> saLogStreamFixedLogRecordSize=300 %s", SA_LOG_STREAM_ALARM); rc = >>> system(command); - >>> test_validate(WEXITSTATUS(rc), 0); + test_validate2(WEXITSTATUS(rc), 0); >>> } >>> >>> void saLogOi_05(void) @@ -97,7 +97,7 @@ void saLogOi_05(void) >>> sprintf(command, "immcfg -a >>> saLogStreamLogFullAction=1 %s 2> >> /dev/null", >>> SA_LOG_STREAM_ALARM); rc = system(command); - >>> test_validate(WEXITSTATUS(rc), 1); + >>> test_validate2(WEXITSTATUS(rc), 1); } >>> >>> void saLogOi_06(void) @@ -108,7 +108,7 @@ void saLogOi_06(void) >>> sprintf(command, "immcfg -a >>> saLogStreamLogFullAction=2 %s 2> >> /dev/null", >>> SA_LOG_STREAM_ALARM); rc = system(command); - >>> test_validate(WEXITSTATUS(rc), 1); + >>> test_validate2(WEXITSTATUS(rc), 1); } >>> >>> void saLogOi_07(void) @@ -119,7 +119,7 @@ void saLogOi_07(void) >>> sprintf(command, "immcfg -a >>> saLogStreamLogFullAction=3 %s", SA_LOG_STREAM_ALARM); rc = system(command); >>> - test_validate(WEXITSTATUS(rc), >>> 0); + test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_08(void) @@ -131,7 +131,7 @@ void saLogOi_08(void) >>> sprintf(command, "immcfg -a >>> saLogStreamLogFullAction=4 %s 2> >> /dev/null", >>> SA_LOG_STREAM_ALARM); rc = system(command); - >>> test_validate(WEXITSTATUS(rc), 1); + >>> test_validate2(WEXITSTATUS(rc), 1); } >>> >>> void saLogOi_09(void) @@ -142,7 +142,7 @@ void saLogOi_09(void) >>> sprintf(command, "immcfg -a >>> saLogStreamLogFullHaltThreshold=90 %s", SA_LOG_STREAM_ALARM); rc = >>> system(command); - >>> test_validate(WEXITSTATUS(rc), 0); + test_validate2(WEXITSTATUS(rc), 0); >>> } >>> >>> void saLogOi_10(void) @@ -153,7 +153,7 @@ void saLogOi_10(void) >>> sprintf(command, "immcfg -a >>> saLogStreamLogFullHaltThreshold=101 %s >> 2> /dev/null", >>> SA_LOG_STREAM_ALARM); rc = system(command); - >>> test_validate(WEXITSTATUS(rc), 1); + >>> test_validate2(WEXITSTATUS(rc), 1); } >>> >>> void saLogOi_11(void) @@ -164,7 +164,7 @@ void saLogOi_11(void) >>> sprintf(command, "immcfg -a >>> saLogStreamMaxFilesRotated=10 %s", SA_LOG_STREAM_ALARM); rc = >>> system(command); - >>> test_validate(WEXITSTATUS(rc), 0); + test_validate2(WEXITSTATUS(rc), 0); >>> } >>> >>> void saLogOi_12(void) @@ -175,7 +175,7 @@ void saLogOi_12(void) >>> sprintf(command, "immcfg -a >>> saLogStreamLogFileFormat=\"@Cr @Ct >> @Nh:@Nn:@Ns @Nm/@Nd/@NY @Ne5 @No30 @Ng30 \"@Cb\"\" %s", >>> SA_LOG_STREAM_ALARM); rc = system(command); - >>> test_validate(WEXITSTATUS(rc), 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_13(void) @@ -186,7 +186,7 @@ void saLogOi_13(void) >>> sprintf(command, "immcfg -a >>> saLogStreamLogFileFormat=\"@Cr @Ct >> @Sv @Ne5 @No30 @Ng30 \"@Cb\"\" %s 2> /dev/null", >>> SA_LOG_STREAM_ALARM); rc = system(command); - >>> test_validate(WEXITSTATUS(rc), 1); + >>> test_validate2(WEXITSTATUS(rc), 1); } >>> >>> void saLogOi_14(void) @@ -197,7 +197,7 @@ void saLogOi_14(void) >>> sprintf(command, "immcfg -a >>> saLogStreamSeverityFilter=7 %s", SA_LOG_STREAM_ALARM); rc = >>> system(command); - test_validate(WEXITSTATUS(rc), >>> 0); + test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_15(void) @@ -207,7 +207,7 @@ void saLogOi_15(void) >>> >>> sprintf(command, "immlist %s > /dev/null", SA_LOG_STREAM_ALARM); rc = >>> system(command); - >>> test_validate(WEXITSTATUS(rc), 0); + test_validate2(WEXITSTATUS(rc), 0); >>> } >>> >>> void saLogOi_16(void) @@ -222,7 +222,7 @@ void saLogOi_16(void) >>> SA_LOG_STREAM_CREATE, SA_TIME_ONE_SECOND, >> &logStreamHandle), SA_AIS_OK); >>> rc = system(command); safassert(saLogFinalize(logHandle), SA_AIS_OK); - >>> test_validate(WEXITSTATUS(rc), 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_17(void) @@ -233,7 +233,7 @@ void saLogOi_17(void) >>> sprintf(command, "immadm -o 1 -p >> saLogStreamSeverityFilter:SA_UINT32_T:7 %s 2> /dev/null", >>> SA_LOG_STREAM_ALARM); rc = system(command); - >>> test_validate(WEXITSTATUS(rc), 1); + >>> test_validate2(WEXITSTATUS(rc), 1); } >>> >>> void saLogOi_18(void) @@ -248,7 +248,7 @@ void saLogOi_18(void) >>> SA_LOG_STREAM_CREATE, SA_TIME_ONE_SECOND, >> &logStreamHandle), SA_AIS_OK); >>> rc = system(command); safassert(saLogFinalize(logHandle), SA_AIS_OK); - >>> test_validate(WEXITSTATUS(rc), 1); + >>> test_validate2(WEXITSTATUS(rc), 1); } >>> >>> void saLogOi_19(void) @@ -263,7 +263,7 @@ void saLogOi_19(void) >>> SA_LOG_STREAM_CREATE, SA_TIME_ONE_SECOND, >> &logStreamHandle), SA_AIS_OK); >>> rc = system(command); safassert(saLogFinalize(logHandle), SA_AIS_OK); - >>> test_validate(WEXITSTATUS(rc), 1); + >>> test_validate2(WEXITSTATUS(rc), 1); } >>> >>> void saLogOi_20(void) @@ -278,7 +278,7 @@ void saLogOi_20(void) >>> SA_LOG_STREAM_CREATE, SA_TIME_ONE_SECOND, >> &logStreamHandle), SA_AIS_OK); >>> rc = system(command); safassert(saLogFinalize(logHandle), SA_AIS_OK); - >>> test_validate(WEXITSTATUS(rc), 1); + >>> test_validate2(WEXITSTATUS(rc), 1); } >>> >>> void saLogOi_21(void) @@ -294,7 +294,7 @@ void saLogOi_21(void) rc = >>> system(command); /* SA_AIS_OK */ rc = >>> system(command); /* will give SA_AIS_ERR_NO_OP */ >>> safassert(saLogFinalize(logHandle), SA_AIS_OK); - >>> test_validate(WEXITSTATUS(rc), 1); + test_validate2(WEXITSTATUS(rc), 1); >>> } >>> >>> void saLogOi_22(void) @@ -309,7 +309,7 @@ void saLogOi_22(void) >>> SA_LOG_STREAM_CREATE, SA_TIME_ONE_SECOND, >> &logStreamHandle), SA_AIS_OK); >>> rc = system(command); safassert(saLogFinalize(logHandle), SA_AIS_OK); - >>> test_validate(WEXITSTATUS(rc), 1); + >>> test_validate2(WEXITSTATUS(rc), 1); } >>> >>> void saLogOi_23() @@ -320,7 +320,7 @@ void saLogOi_23() sprintf(command, >>> "immcfg -c SaLogStreamConfig >> safLgStrCfg=strA,safApp=safLogService " >>> "-a saLogStreamFileName=strA -a >> saLogStreamPathName=strAdir"); >>> rc = system(command); - test_validate(WEXITSTATUS(rc), 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_24() @@ -331,7 +331,7 @@ void saLogOi_24() sprintf(command, >>> "immcfg -c SaLogStreamConfig >> safLgStrCfg=strB,safApp=safLogService " >>> "-a saLogStreamFileName=strB -a >> saLogStreamPathName=strBdir"); >>> rc = system(command); - test_validate(WEXITSTATUS(rc), 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_25() @@ -342,7 +342,7 @@ void saLogOi_25() sprintf(command, >>> "immcfg -c SaLogStreamConfig >> safLgStrCfg=strC,safApp=safLogService " >>> "-a saLogStreamFileName=strC -a >> saLogStreamPathName=strCdir"); >>> rc = system(command); - test_validate(WEXITSTATUS(rc), 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_26() @@ -352,7 +352,7 @@ void saLogOi_26() >>> >>> sprintf(command, "immcfg -d safLgStrCfg=strB,safApp=safLogService"); rc = >>> system(command); - >>> test_validate(WEXITSTATUS(rc), 0); + test_validate2(WEXITSTATUS(rc), 0); >>> } >>> >>> void saLogOi_27() @@ -362,7 +362,7 @@ void saLogOi_27() >>> >>> sprintf(command, "immcfg -d safLgStrCfg=strC,safApp=safLogService"); rc = >>> system(command); - >>> test_validate(WEXITSTATUS(rc), 0); + test_validate2(WEXITSTATUS(rc), 0); >>> } >>> >>> void saLogOi_28() @@ -381,7 +381,7 @@ void saLogOi_28() sprintf(command, >>> "immcfg -a saLogStreamMaxFilesRotated=3 >> safLgStrCfg=strA,safApp=safLogService"); >>> rc = system(command); safassert(rc, 0); - test_validate(WEXITSTATUS(rc), >>> 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_29() @@ -391,7 +391,7 @@ void saLogOi_29() >>> >>> sprintf(command, "immcfg -a saLogStreamMaxLogFileSize=0 >> safLgStrCfg=strB,safApp=safLogService"); >>> rc = system(command); - test_validate(WEXITSTATUS(rc), 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_30() @@ -401,7 +401,7 @@ void saLogOi_30() >>> >>> sprintf(command, "immcfg -a saLogStreamFixedLogRecordSize=80 >> safLgStrCfg=strC,safApp=safLogService"); >>> rc = system(command); - test_validate(WEXITSTATUS(rc), 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_31() @@ -418,7 +418,7 @@ void saLogOi_31() sprintf(command, >>> "immlist >>> safLgStrCfg=strC,safApp=safLogService > >> /dev/null"); >>> rc = system(command); safassert(rc, 0); - test_validate(WEXITSTATUS(rc), >>> 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_32() @@ -435,7 +435,7 @@ void saLogOi_32() sprintf(command, >>> "immfind >>> safLgStrCfg=strC,safApp=safLogService > >> /dev/null"); >>> rc = system(command); safassert(rc, 0); - test_validate(WEXITSTATUS(rc), >>> 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_33() @@ -445,7 +445,7 @@ void saLogOi_33() >>> >>> sprintf(command, "saflogger -n"); rc = system(command); - >>> test_validate(WEXITSTATUS(rc), 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_34() @@ -457,7 +457,7 @@ void saLogOi_34() rc = >>> system(command); sprintf(command, "saflogtest -b >>> strA --count=5 --interval=100000 >> \"saflogtest (5,100000) strA\""); >>> rc = system(command); - test_validate(WEXITSTATUS(rc), 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_35() @@ -467,7 +467,7 @@ void saLogOi_35() >>> >>> sprintf(command, "saflogtest -b strB --count=500 --interval=5 >> \"saflogtest (500,5) strB\""); >>> rc = system(command); - test_validate(WEXITSTATUS(rc), 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_36() @@ -477,7 +477,7 @@ void saLogOi_36() >>> >>> sprintf(command, "saflogtest -b strC --count=700 --interval=5 >> \"saflogtest (700,5) strC\""); >>> rc = system(command); - test_validate(WEXITSTATUS(rc), 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_37() @@ -487,7 +487,7 @@ void saLogOi_37() >>> >>> sprintf(command, "immcfg -a saLogStreamMaxLogFileSize=2000 >> safLgStrCfg=strC,safApp=safLogService"); >>> rc = system(command); - test_validate(WEXITSTATUS(rc), 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_38() @@ -498,7 +498,7 @@ void saLogOi_38() sprintf(command, >>> "immcfg -a >>> saLogStreamFixedLogRecordSize=2048 >> safLgStrCfg=strC,safApp=safLogService " >>> "2> /dev/null"); rc = system(command); - test_validate(WEXITSTATUS(rc), >>> 1); + >>> test_validate2(WEXITSTATUS(rc), 1); } >>> >>> void saLogOi_39() @@ -509,7 +509,7 @@ void saLogOi_39() sprintf(command, >>> "immcfg -a saLogStreamMaxLogFileSize=70 >> safLgStrCfg=strC,safApp=safLogService " >>> "2> /dev/null"); rc = system(command); - test_validate(WEXITSTATUS(rc), >>> 1); + >>> test_validate2(WEXITSTATUS(rc), 1); } >>> >>> void saLogOi_40() @@ -519,7 +519,7 @@ void saLogOi_40() >>> >>> sprintf(command, "immcfg -d safLgStrCfg=strA,safApp=safLogService"); rc = >>> system(command); - >>> test_validate(WEXITSTATUS(rc), 0); + test_validate2(WEXITSTATUS(rc), 0); >>> } >>> >>> void saLogOi_41() @@ -539,7 +539,7 @@ void saLogOi_41() "-a >>> saLogStreamFileName=strDtest -a >> saLogStreamPathName=strDdir/../xyz 2> /dev/null"); >>> rc = system(command); if (rc <= 0) safassert(rc, 0); - >>> test_validate(WEXITSTATUS(rc), 1); + >>> test_validate2(WEXITSTATUS(rc), 1); } >>> >>> void saLogOi_42() @@ -550,7 +550,7 @@ void saLogOi_42() sprintf(command, >>> "immcfg -c SaLogStreamConfig >> safLgStrCfg=strD,safApp=safLogService " >>> "-a saLogStreamFileName=CrCtCdCyCb50CaSl30SvCx >> -a saLogStreamPathName=strDdir"); >>> rc = system(command); - test_validate(WEXITSTATUS(rc), 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_43(void) @@ -562,7 +562,7 @@ void saLogOi_43(void) >>> sprintf(command, "immcfg -a >>> saLogStreamLogFileFormat=\"%s\" >> safLgStrCfg=strD,safApp=safLogService", >>> logFileFormat); rc = system(command); - test_validate(WEXITSTATUS(rc), >>> 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_44() @@ -572,7 +572,7 @@ void saLogOi_44() >>> >>> sprintf(command, "saflogtest -b strD --count=500 --interval=5 >> \"saflogtest (500,5) strD\""); >>> rc = system(command); - test_validate(WEXITSTATUS(rc), 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_45(void) @@ -584,7 +584,7 @@ void saLogOi_45(void) >>> sprintf(command, "immcfg -a >>> saLogStreamFileName=\"%s\" >> safLgStrCfg=strD,safApp=safLogService", >>> logFileName); rc = system(command); - test_validate(WEXITSTATUS(rc), 0); >>> + test_validate2(WEXITSTATUS(rc), >>> 0); } >>> >>> void saLogOi_46() @@ -596,7 +596,7 @@ void saLogOi_46() sprintf(command, >>> "immcfg -a >>> saLogStreamLogFileFormat=\"%s\" >> safLgStrCfg=strD,safApp=safLogService", >>> logFileFormat); rc = system(command); - test_validate(WEXITSTATUS(rc), >>> 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_47() @@ -606,7 +606,7 @@ void saLogOi_47() >>> >>> sprintf(command, "immcfg -d safLgStrCfg=strD,safApp=safLogService"); rc = >>> system(command); - >>> test_validate(WEXITSTATUS(rc), 0); + test_validate2(WEXITSTATUS(rc), 0); >>> } >>> >>> /** @@ -621,7 +621,7 @@ void saLogOi_48() rc = system(command); >>> sprintf(command, "immcfg -a >>> logRootDirectory=%s/xxtest >> logConfig=1,safApp=safLogService",log_root_path); >>> rc = system(command); - test_validate(WEXITSTATUS(rc), 0); + >>> test_validate2(WEXITSTATUS(rc), 0); } >>> >>> void saLogOi_49() @@ -631,7 +631,7 @@ void saLogOi_49() >>> >>> sprintf(command, "immcfg -a logStreamSystemHighLimit=90 >> logConfig=1,safApp=safLogService 2> /dev/null"); >>> rc = system(command); - test_validate(WEXITSTATUS(rc), 1); + >>> test_validate2(WEXITSTATUS(rc), 1); } >>> >>> void saLogOi_50() @@ -647,7 +647,7 @@ void saLogOi_50() rc = >>> system(command); safassert(rc, 0); } - >>> test_validate(WEXITSTATUS(rc), 0); + test_validate2(WEXITSTATUS(rc), 0); >>> } >>> >>> static int get_filter_cnt_attr(const SaNameT* objName) @@ -693,11 +693,13 >>> @@ void saLogOi_51(void) assert((rc = >>> system(command[1])) != -1); filterCnt = >>> get_filter_cnt_attr(&app1StreamName); if (sevType < SA_LOG_SEV_INFO) { + >>> //printf("\tfilterCnt = %d, ((sevType + 1) * 100) = >>> +%d\n",filterCnt,((sevType + 1) * 100)); if (filterCnt != >>> ((sevType + 1) * 100)) { rc = -1; break; } } else { + >>> //printf("\tfilterCnt = %d, sevType * 100 >>> +=%d\n",filterCnt,(sevType * 100)); if (filterCnt != sevType * 100) { rc = >>> -2; break; @@ -706,7 +708,7 @@ void >>> saLogOi_51(void) sevType++; } safassert(saLogFinalize(logHandle), >>> SA_AIS_OK); - test_validate(WEXITSTATUS(rc), >>> 0); + test_validate2(WEXITSTATUS(rc), 0); } >>> >>> __attribute__ ((constructor)) static void saOiOperations_constructor(void) >>> diff --git >>> a/tests/unit_test_fw/inc/utest.h b/tests/unit_test_fw/inc/utest.h --- >>> a/tests/unit_test_fw/inc/utest.h +++ >>> b/tests/unit_test_fw/inc/utest.h @@ -51,6 +51,14 @@ extern void >>> test_case_add(unsigned int s extern void >>> test_validate(SaUint32T actual, SaUint32T expected); >>> >>> /** + * Validate and print result of a test case. + * Used when rc is an >>> exit code from an external tool e.g. >>> immadm + * + * @param rc + * @param expected + */ +void >>> test_validate2(SaUint32T rc, SaUint32T expected); +/** * >>> Run all test cases, all test cases in a suite or a specific * test case. >>> suites will be run in increasing order >>> using the * test suite number. Test cases will be run in order installed. >>> diff --git >>> a/tests/unit_test_fw/src/utest.c b/tests/unit_test_fw/src/utest.c --- >>> a/tests/unit_test_fw/src/utest.c +++ >>> b/tests/unit_test_fw/src/utest.c @@ -46,6 +46,12 @@ static unsigned int >>> current_test; >>> >>> unsigned int testdebug; >>> >>> +/** + * Used when rc is an SA_AIS_XXX reurn code + * + * @param rc + * >>> @param expected + */ void >>> test_validate(SaUint32T rc, SaUint32T expected) { /* Save for later use */ >>> @@ -68,6 +74,40 @@ void >>> test_validate(SaUint32T rc, SaUint3 test_total++; } >>> >>> +/** + * Used when rc is an exit code from an external tool e.g. immadm + * >>> + * @param rc + * @param expected + >>> */ +void test_validate2(SaUint32T rc, SaUint32T expected) { + char >>> *exit_str[] = >>> {"EXIT_SUCCESS","EXIT_FAILURE"}; + char other_str[] = "UNKNOWN"; + char >>> *rcstr, *expstr; + + /* Save for later >>> use */ + actualStatus = rc; + expectedStatus = expected; + >>> last_test_status = 0; + + if (rc == >>> expected) + { + test_passed++; + printf(" %3d PASSED", >>> current_test); + } + else + { >>> + test_failed++; + printf(" %3d FAILED", current_test); + >>> rcstr = (rc < 2) ? exit_str[rc]: >>> other_str; + expstr = (expected < 2) ? exit_str[expected]: >>> other_str; + printf("\t(expected %s, got %s >>> (%d))",expstr, rcstr, rc); + } + + test_total++; +} + void >>> test_suite_add(unsigned int suite, const char >>> *name) { suite_name[suite] = name; >>> > > ------------------------------------------------------------------------------ Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
