← Back to branch summary

~ubuntu-branches/ubuntu/lucid/rsyslog/lucid-updates

« back to all changes in this revision

Viewing changes to tests/rscript.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl
  • Date: 2009-06-23 12:12:43 UTC
  • mfrom: (1.1.11 upstream) (3.2.8 sid)
  • Revision ID: james.westby@ubuntu.com-20090623121243-d2fejarzidywnn17
Tags: 4.2.0-1
http://bugs.debian.org/530228
* New upstream release of the now stable v4 branch.
  - Fix warnings when /etc/rsyslog.d/ is empty. Closes: #530228
* debian/patches/imudp_multiple_udp_sockets.patch
  - Removed, merged upstream.
* debian/rsyslog.default
  - Set default compat mode to '4'.
* debian/rsyslog.logcheck.ignore.server
  - Update logcheck rules files to also ignore rsyslogd and imklog stop
    messages.
* debian/control
  - Bump Standards-Version to 3.8.2. No further changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/rscript.c
39
39
DEFobjCurrIf(ctok_token)
40
40
DEFobjCurrIf(vmprg)
41
41
 
 
42
 
42
43
BEGINInit
43
44
CODESTARTInit
44
45
        pErrObj = "expr"; CHKiRet(objUse(expr, CORE_COMPONENT));
102
103
 
103
104
        if(strcmp((char*)rsCStrGetSzStr(pstrPrg), (char*)rsCStrGetSzStr(pstrOut))) {
104
105
                printf("error: compiled program different from expected result!\n");
105
 
                printf("generated vmprg:\n%s\n", rsCStrGetSzStr(pstrPrg));
106
 
                printf("expected:\n%s\n", rsCStrGetSzStr(pstrOut));
 
106
                printf("generated vmprg (%d bytes):\n%s\n", strlen((char*)rsCStrGetSzStr(pstrPrg)), rsCStrGetSzStr(pstrPrg));
 
107
                printf("expected (%d bytes):\n%s\n", strlen((char*)rsCStrGetSzStr(pstrOut)), rsCStrGetSzStr(pstrOut));
107
108
                ABORT_FINALIZE(RS_RET_ERR);
108
109
        }
109
110
 
138
139
        size_t lenLn;
139
140
        cstr_t *pstrIn = NULL;
140
141
        cstr_t *pstrOut = NULL;
 
142
        int iParse;
141
143
        rsRetVal iRetExpected;
142
144
        DEFiRet;
143
145
 
160
162
        /* once we had a comment, the next line MUST be "result: <nbr>". Anything
161
163
         * after nbr is simply ignored.
162
164
         */
163
 
        if(sscanf(lnptr, "result: %d", &iRetExpected) != 1) {
 
165
        if(sscanf(lnptr, "result: %d", &iParse) != 1) {
164
166
                printf("error in result line, scanf failed, line: '%s'\n", lnptr);
165
167
                ABORT_FINALIZE(RS_RET_ERR);
166
168
        }
 
169
        iRetExpected = iParse;
167
170
        getline(&lnptr, &lenLn, fp); CHKEOF;
168
171
 
169
172
        /* and now we look for "in:" (and again ignore the rest...) */