Fixup the test after new queue code has been added.

You can't load a ruleset with undefined queues into the anchor.
Change the test to use "set prio" since the whole purpose of it
is to test the flexibility of the pf.conf language, not a
particular queue feature.

4 files changed, 35 insertions, 35 deletions

diff --git a/regress/sbin/pfctl/pf39.in b/regress/sbin/pfctl/pf39.in
index 0a69a174a9b..739f4efd429 100644
--- a/regress/sbin/pfctl/pf39.in
+++ b/regress/sbin/pfctl/pf39.in
@@ -13,13 +13,13 @@ o_keep="keep state "
 o_fragment="fragment "
 o_allowopts="allow-opts "
 o_label="label blah"
-o_qname="queue blah"
+o_prio="set prio 2"
 
 $body2 $o_fragment $o_keep $o_label $o_tos
-$body2 $o_user $o_qname $o_tos $o_keep $o_group $o_label $o_allowopts \
+$body2 $o_user $o_prio $o_tos $o_keep $o_group $o_label $o_allowopts \
 $o_user2 $o_group2
-$body1 $o_icmpspec $o_keep $o_label $o_qname
+$body1 $o_icmpspec $o_keep $o_label $o_prio
 $body2 $o_keep
-$body2 $o_label $o_keep $o_qname $o_tos
+$body2 $o_label $o_keep $o_prio $o_tos
 $body1 $o_icmpspec $o_tos
 $body2 $o_flags $o_allowopts 
diff --git a/regress/sbin/pfctl/pf39.loaded b/regress/sbin/pfctl/pf39.loaded
index a83bf064b75..dcabd70d1e8 100644
--- a/regress/sbin/pfctl/pf39.loaded
+++ b/regress/sbin/pfctl/pf39.loaded
@@ -2,33 +2,33 @@
   [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@1 pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
+@1 pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah"
   [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
-  [ queue: qname=blah qid=1 pqname= pqid=1 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@2 pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
+@2 pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah"
   [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
-  [ queue: qname=blah qid=1 pqname= pqid=1 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@3 pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
+@3 pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah"
   [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
-  [ queue: qname=blah qid=1 pqname= pqid=1 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@4 pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
+@4 pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah"
   [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
-  [ queue: qname=blah qid=1 pqname= pqid=1 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@5 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 set ( queue blah ) label "blah"
+@5 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 set ( prio 2 ) label "blah"
   [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
-  [ queue: qname=blah qid=1 pqname= pqid=1 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass in log quick on lo0 inet proto tcp all flags S/SA
   [ Skip steps: i=end d=end r=end f=end p=8 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@7 pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 set ( queue blah ) label "blah"
+@7 pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 set ( prio 2 ) label "blah"
   [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
-  [ queue: qname=blah qid=1 pqname= pqid=1 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 tos 0x08
   [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
diff --git a/regress/sbin/pfctl/pf39.ok b/regress/sbin/pfctl/pf39.ok
index 3ec0067cdfb..719c3d0cf43 100644
--- a/regress/sbin/pfctl/pf39.ok
+++ b/regress/sbin/pfctl/pf39.ok
@@ -11,14 +11,14 @@ o_keep = "keep state "
 o_fragment = "fragment "
 o_allowopts = "allow-opts "
 o_label = "label blah"
-o_qname = "queue blah"
+o_prio = "set prio 2"
 pass in log quick on lo0 inet proto tcp all tos 0x08 fragment label "blah"
-pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
-pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
-pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
-pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
-pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 set ( queue blah ) label "blah"
+pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah"
+pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah"
+pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah"
+pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah"
+pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 set ( prio 2 ) label "blah"
 pass in log quick on lo0 inet proto tcp all flags S/SA
-pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 set ( queue blah ) label "blah"
+pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 set ( prio 2 ) label "blah"
 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 tos 0x08
 pass in log quick on lo0 inet proto tcp all flags S/SA allow-opts
diff --git a/regress/sbin/pfctl/pf39.optimized b/regress/sbin/pfctl/pf39.optimized
index a83bf064b75..dcabd70d1e8 100644
--- a/regress/sbin/pfctl/pf39.optimized
+++ b/regress/sbin/pfctl/pf39.optimized
@@ -2,33 +2,33 @@
   [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@1 pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
+@1 pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah"
   [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
-  [ queue: qname=blah qid=1 pqname= pqid=1 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@2 pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
+@2 pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah"
   [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
-  [ queue: qname=blah qid=1 pqname= pqid=1 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@3 pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
+@3 pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah"
   [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
-  [ queue: qname=blah qid=1 pqname= pqid=1 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@4 pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
+@4 pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 set ( prio 2 ) allow-opts label "blah"
   [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
-  [ queue: qname=blah qid=1 pqname= pqid=1 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@5 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 set ( queue blah ) label "blah"
+@5 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 set ( prio 2 ) label "blah"
   [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
-  [ queue: qname=blah qid=1 pqname= pqid=1 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass in log quick on lo0 inet proto tcp all flags S/SA
   [ Skip steps: i=end d=end r=end f=end p=8 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@7 pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 set ( queue blah ) label "blah"
+@7 pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 set ( prio 2 ) label "blah"
   [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
-  [ queue: qname=blah qid=1 pqname= pqid=1 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 tos 0x08
   [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]