diff options
| author | Josh Triplett <josh@freedesktop.org> | 2007-07-22 20:27:57 -0700 |
|---|---|---|
| committer | Josh Triplett <josh@freedesktop.org> | 2007-07-22 20:27:57 -0700 |
| commit | 33683d9fd2b3d6d240c539e50e61af0fca0fe5aa (patch) | |
| tree | 6f8a3daae8586ba1976c461cdd2d524d1ec89e35 /validation/preprocessor | |
| parent | 3a38b8db6d5ffa9d19c08c854c71c7a5f03e3934 (diff) | |
| download | sparse-dev-33683d9fd2b3d6d240c539e50e61af0fca0fe5aa.tar.gz | |
Fix test-suite to handle stdout and stderr separately, and fix up tests
test-suite merged stdout and stderr, which relied on the ordering of data from
the two streams in the merged stream. This made test-suite frequently fail on
tests with both output and errors, when the ordering didn't happen to match
what the test assumed. Handle each of the streams separately, and update the
tests accordingly.
Also clean up the output of "test-suite format" to avoid outputting values
equal to the defaults.
Signed-off-by: Josh Triplett <josh@freedesktop.org>
Diffstat (limited to 'validation/preprocessor')
| -rw-r--r-- | validation/preprocessor/preprocessor18.c | 8 | ||||
| -rw-r--r-- | validation/preprocessor/preprocessor19.c | 6 | ||||
| -rw-r--r-- | validation/preprocessor/preprocessor21.c | 6 |
3 files changed, 11 insertions, 9 deletions
diff --git a/validation/preprocessor/preprocessor18.c b/validation/preprocessor/preprocessor18.c index b4de1e68..20169e8b 100644 --- a/validation/preprocessor/preprocessor18.c +++ b/validation/preprocessor/preprocessor18.c @@ -4,14 +4,14 @@ /* * check-name: Preprocessor #18 * check-command: sparse -E $file - * check-exit-value: 1 * * check-output-start -preprocessor/preprocessor18.c:2:2: error: expected identifier to 'define' -preprocessor/preprocessor18.c:3:2: error: expected identifier to 'undef' * check-output-end * - * check-known-to-fail + * check-error-start +preprocessor/preprocessor18.c:2:2: error: expected identifier to 'define' +preprocessor/preprocessor18.c:3:2: error: expected identifier to 'undef' + * check-error-end */ diff --git a/validation/preprocessor/preprocessor19.c b/validation/preprocessor/preprocessor19.c index ef27740d..7dd3820d 100644 --- a/validation/preprocessor/preprocessor19.c +++ b/validation/preprocessor/preprocessor19.c @@ -8,9 +8,11 @@ A * check-command: sparse -E $file * * check-output-start -preprocessor/preprocessor19.c:4:9: warning: preprocessor token A redefined -preprocessor/preprocessor19.c:3:9: this was the original definition y * check-output-end + * check-error-start +preprocessor/preprocessor19.c:4:9: warning: preprocessor token A redefined +preprocessor/preprocessor19.c:3:9: this was the original definition + * check-error-end */ diff --git a/validation/preprocessor/preprocessor21.c b/validation/preprocessor/preprocessor21.c index 1719fc07..4b55a6b8 100644 --- a/validation/preprocessor/preprocessor21.c +++ b/validation/preprocessor/preprocessor21.c @@ -4,13 +4,13 @@ * check-name: Preprocessor #21 * check-description: This used to hang Sparse. * check-command: sparse -E $file - * check-exit-value: 1 * * check-output-start -preprocessor/preprocessor21.c:2:2: error: unterminated preprocessor conditional * check-output-end * - * check-known-to-fail + * check-error-start +preprocessor/preprocessor21.c:2:2: error: unterminated preprocessor conditional + * check-error-end */ |