summaryrefslogtreecommitdiff
path: root/source4/pidl/tests/wireshark-conf.pl
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-02-19 14:45:23 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-02-19 14:45:23 +1100
commite51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1 (patch)
tree643566bbcf1312cd9ae1fed9e235d702c7281a8f /source4/pidl/tests/wireshark-conf.pl
parent5842df9d0fb71430d1bcda1c4c748589b38ecb00 (diff)
parent9368ea67cdbb0d1fe5ef2258cc7e8c20c66e6ecd (diff)
downloadsamba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.tar.gz
samba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.tar.bz2
samba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.zip
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 837eb8a0bc011cd84bc7e8d2849028313d709928)
Diffstat (limited to 'source4/pidl/tests/wireshark-conf.pl')
-rwxr-xr-xsource4/pidl/tests/wireshark-conf.pl6
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/pidl/tests/wireshark-conf.pl b/source4/pidl/tests/wireshark-conf.pl
index c06ac16de4..9da5c7d1ed 100755
--- a/source4/pidl/tests/wireshark-conf.pl
+++ b/source4/pidl/tests/wireshark-conf.pl
@@ -5,7 +5,7 @@
use strict;
use warnings;
-use Test::More tests => 48;
+use Test::More tests => 49;
use FindBin qw($RealBin);
use lib "$RealBin";
use Util;
@@ -35,7 +35,6 @@ test_warnings("nofile:1: Unknown command `foobar'\n",
test_warnings("nofile:1: incomplete HF_RENAME command\n",
sub { parse_conf("HF_RENAME\n"); });
-
is_deeply(parse_conf("HF_RENAME foo bar\n")->{hf_renames}->{foo},
{ OLDNAME => "foo", NEWNAME => "bar", POS => {FILE => "nofile", LINE => 1}, USED => 0});
@@ -47,6 +46,9 @@ test_warnings("nofile:1: incomplete MANUAL command\n",
is_deeply(parse_conf("MANUAL foo\n"), { manual => {foo => 1}});
+test_errors("nofile:1: incomplete INCLUDE command\n",
+ sub { parse_conf("INCLUDE\n"); } );
+
test_warnings("nofile:1: incomplete FIELD_DESCRIPTION command\n",
sub { parse_conf("FIELD_DESCRIPTION foo\n"); });