diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 12:19:44 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 12:19:44 +0200 |
| commit | e92a0db46dfd2661a92e41a678d982ce6d3eedde (patch) | |
| tree | 4e09eb39484f497e8eab28bf85bb933e139df49d /tests/rscript.c | |
| parent | 8a819d6a0623c0854462dd2dc632700f9a5c576c (diff) | |
| parent | e4f012eb60f6531f964557ba9eac54048ae2bef8 (diff) | |
| download | rsyslog-e92a0db46dfd2661a92e41a678d982ce6d3eedde.tar.gz rsyslog-e92a0db46dfd2661a92e41a678d982ce6d3eedde.tar.bz2 rsyslog-e92a0db46dfd2661a92e41a678d982ce6d3eedde.zip | |
Merge branch 'master' into oracle
Conflicts:
Makefile.am
Diffstat (limited to 'tests/rscript.c')
| -rw-r--r-- | tests/rscript.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/rscript.c b/tests/rscript.c index 3eec9c3c..6b232f5f 100644 --- a/tests/rscript.c +++ b/tests/rscript.c @@ -39,6 +39,7 @@ DEFobjCurrIf(ctok) DEFobjCurrIf(ctok_token) DEFobjCurrIf(vmprg) + BEGINInit CODESTARTInit pErrObj = "expr"; CHKiRet(objUse(expr, CORE_COMPONENT)); @@ -101,10 +102,9 @@ PerformTest(cstr_t *pstrIn, rsRetVal iRetExpected, cstr_t *pstrOut) CHKiRet(vmprg.Obj2Str(pExpr->pVmprg, pstrPrg)); if(strcmp((char*)rsCStrGetSzStr(pstrPrg), (char*)rsCStrGetSzStr(pstrOut))) { - int iLen; printf("error: compiled program different from expected result!\n"); - printf("generated vmprg (%d bytes):\n%s\n", strlen(rsCStrGetSzStr(pstrPrg)), rsCStrGetSzStr(pstrPrg)); - printf("expected (%d bytes):\n%s\n", strlen(rsCStrGetSzStr(pstrOut)), rsCStrGetSzStr(pstrOut)); + printf("generated vmprg (%d bytes):\n%s\n", strlen((char*)rsCStrGetSzStr(pstrPrg)), rsCStrGetSzStr(pstrPrg)); + printf("expected (%d bytes):\n%s\n", strlen((char*)rsCStrGetSzStr(pstrOut)), rsCStrGetSzStr(pstrOut)); ABORT_FINALIZE(RS_RET_ERR); } @@ -139,6 +139,7 @@ ProcessTestFile(uchar *pszFileName) size_t lenLn; cstr_t *pstrIn = NULL; cstr_t *pstrOut = NULL; + int iParse; rsRetVal iRetExpected; DEFiRet; @@ -161,10 +162,11 @@ ProcessTestFile(uchar *pszFileName) /* once we had a comment, the next line MUST be "result: <nbr>". Anything * after nbr is simply ignored. */ - if(sscanf(lnptr, "result: %d", &iRetExpected) != 1) { + if(sscanf(lnptr, "result: %d", &iParse) != 1) { printf("error in result line, scanf failed, line: '%s'\n", lnptr); ABORT_FINALIZE(RS_RET_ERR); } + iRetExpected = iParse; getline(&lnptr, &lenLn, fp); CHKEOF; /* and now we look for "in:" (and again ignore the rest...) */ |