diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-06-27 16:09:49 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-06-27 16:09:49 +0000 |
| commit | 710c5d67f7c7c4347aba0f8dd802d87850c88b33 (patch) | |
| tree | b7d0804f56eda56060c1f027e0e430969e854645 | |
| parent | 4bc67de4ea727fe8332decfa0fb79a21cfdd9801 (diff) | |
Update suite-clopts.sh to match dumpcap's error output. Add a comment
to dumpcap.c about keeping the errors synced.
svn path=/trunk/; revision=37805
| -rw-r--r-- | dumpcap.c | 4 | ||||
| -rwxr-xr-x | test/suite-clopts.sh | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -4416,6 +4416,10 @@ report_cfilter_error(capture_options *capture_opts, guint i, const char *errmsg) g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "Capture filter error: %s", errmsg); pipe_write_block(2, SP_BAD_FILTER, tmp); } else { + /* + * clopts_step_invalid_capfilter in test/suite-clopts.sh MUST match + * the error message below. + */ interface_opts = g_array_index(capture_opts->ifaces, interface_options, i); fprintf(stderr, "Invalid capture filter \"%s\" for interface %s!\n" diff --git a/test/suite-clopts.sh b/test/suite-clopts.sh index 30da24f2c8..dc8107a991 100755 --- a/test/suite-clopts.sh +++ b/test/suite-clopts.sh @@ -116,7 +116,7 @@ clopts_step_invalid_capfilter() { if [ ! $RETURNVALUE -eq $EXIT_COMMAND_LINE ]; then test_step_failed "exit status: $RETURNVALUE" else - grep -i 'Invalid capture filter: "jkghg"' ./testout.txt > /dev/null + grep -i 'Invalid capture filter "jkghg" for interface' ./testout.txt > /dev/null if [ $? -eq 0 ]; then test_step_output_print ./testout.txt test_step_ok |