diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-07-27 15:06:23 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-07-27 22:07:56 +0000 |
| commit | 157c2fc0e13a5b801af1c146eb00049061a6a075 (patch) | |
| tree | 68998d85ebae2913e93800bf169501b20f8234d8 /tools/pidl | |
| parent | 93d5df468fc9013debe4a30f6f670eeedc01c911 (diff) | |
Fix from the Samba repository:
Author: Aurelien Aptel <aaptel@suse.com>
Date: Wed May 18 14:23:56 2016 +0200
pidl/ws: fix failing tests
This commit fixes 2 test failures in Pidl test suite.
- commit 02cd7808 changed the error the test was expecting
=> update expected output in the test
- commit c76b65e changed whitespaces in the output
=> revert to the old output in the generator
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Change-Id: I142d4ae405edfff760c00b95e0475502a1eac2f0
Reviewed-on: https://code.wireshark.org/review/16734
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tools/pidl')
| -rw-r--r-- | tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm | 5 | ||||
| -rwxr-xr-x | tools/pidl/tests/wireshark-conf.pl | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm index a62f9563a9..f3d7f69d26 100644 --- a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm +++ b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm @@ -1317,9 +1317,8 @@ sub DumpHfList($) foreach (sort {$a->{INDEX} cmp $b->{INDEX}} values %{$self->{conformance}->{header_fields}}) { - $res .= "\t{ &$_->{INDEX}, - { ".make_str($_->{NAME}).", ".make_str($_->{FILTER}).", $_->{FT_TYPE}, $_->{BASE_TYPE}, $_->{VALSSTRING}, $_->{MASK}, ".make_str_or_null($_->{BLURB}).", HFILL }}, -"; + $res .= "\t{ &$_->{INDEX},\n". + "\t { ".make_str($_->{NAME}).", ".make_str($_->{FILTER}).", $_->{FT_TYPE}, $_->{BASE_TYPE}, $_->{VALSSTRING}, $_->{MASK}, ".make_str_or_null($_->{BLURB}).", HFILL }},\n"; } return $res."\t};\n"; diff --git a/tools/pidl/tests/wireshark-conf.pl b/tools/pidl/tests/wireshark-conf.pl index a8e33dfecd..fff89f6fe0 100755 --- a/tools/pidl/tests/wireshark-conf.pl +++ b/tools/pidl/tests/wireshark-conf.pl @@ -60,7 +60,7 @@ is_deeply(parse_conf("FIELD_DESCRIPTION foo my description\n"), is_deeply(parse_conf("CODE START\ndata\nCODE END\n"), { override => "data\n" }); is_deeply(parse_conf("CODE START\ndata\nmore data\nCODE END\n"), { override => "data\nmore data\n" }); -test_warnings("nofile:1: Unknown command `CODE'\n", +test_warnings("nofile:1: CODE END outside CODE section\n", sub { parse_conf("CODE END\n"); } ); is_deeply(parse_conf("TYPE winreg_String dissect_myminregstring(); FT_STRING BASE_DEC 0 0 2\n"), { types => { winreg_String => { |