test double upperlimit service curve

3 files changed, 11 insertions, 2 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 30adce2c694..2043f62617c 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.126 2003/04/13 23:38:45 henning Exp $
+# $OpenBSD: Makefile,v 1.127 2003/04/13 23:40:52 henning Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
@@ -14,7 +14,7 @@ PFTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
 PFTESTS+=28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
 PFTESTS+=51 52 53 54 55 56 57 58 59 60 61
 PFFAIL=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
-PFFAIL+=28 29 30 31 32 33 34 35
+PFFAIL+=28 29 30 31 32 33 34 35 36
 PFSIMPLE=1 2
 PFSETUP=1 2 3
 PFLOAD=1 2 3 4 5 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 23 24 25 26 27 28 29
diff --git a/regress/sbin/pfctl/pfail36.in b/regress/sbin/pfctl/pfail36.in
new file mode 100644
index 00000000000..8d9fe4a2530
--- /dev/null
+++ b/regress/sbin/pfctl/pfail36.in
@@ -0,0 +1,6 @@
+# double upperlimit
+
+altq on lo0 tbrsize 1824 bandwidth 10Mb hfsc queue { eins }
+queue eins bandwidth 10% hfsc(default upperlimit(20% 20 5%) upperlimit 1Mb)
+
+
diff --git a/regress/sbin/pfctl/pfail36.ok b/regress/sbin/pfctl/pfail36.ok
new file mode 100644
index 00000000000..550c089ac4f
--- /dev/null
+++ b/regress/sbin/pfctl/pfail36.ok
@@ -0,0 +1,3 @@
+stdin:4: upperlimit already specified
+pfctl: Syntax error in config file: pf rules not loaded
+altq on lo0 hfsc bandwidth 10Mb tbrsize 1824 queue { eins }