Enable the empty as-set and prefix-set tests since that is now allowed again

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.6.in b/regress/usr.sbin/bgpd/config/bgpd.conf.6.in
index f6c6514..c197f7d 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.6.in
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.6.in
@@ -1,10 +1,16 @@
-# $OpenBSD: bgpd.conf.6.in,v 1.4 2018/09/09 14:28:50 claudio Exp $
+# $OpenBSD: bgpd.conf.6.in,v 1.5 2018/09/09 20:41:01 claudio Exp $
 # test as-set blocks
 
 AS 1
 
-#as-set empty { }
-as-set one { 1 }
+as-set empty1 { }
+as-set empty2 {
+       # nothing
+}
+as-set one1 { 1 }
+as-set one2 {
+       1
+}
 
 as-set "test1" { 1 2 3 4 }
 as-set "test2" { 1, 2, 3, 4 }

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok
index a0f7c76..2c48717 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok
@@ -3,7 +3,19 @@ router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
 holdtime min 3
 fib-priority 48
-as-set "one" {
+as-set "empty1" {
+       
+}
+
+as-set "empty2" {
+       
+}
+
+as-set "one1" {
+       1 
+}
+
+as-set "one2" {
        1 
 }
 

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.7.in b/regress/usr.sbin/bgpd/config/bgpd.conf.7.in
index a477c06..7bfafe3 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.7.in
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.7.in
@@ -1,11 +1,17 @@
-# $OpenBSD: bgpd.conf.7.in,v 1.4 2018/09/09 14:28:50 claudio Exp $
+# $OpenBSD: bgpd.conf.7.in,v 1.5 2018/09/09 20:41:01 claudio Exp $
 # test prefix-set blocks
 
 AS 1
 
-#prefix-set empty { }
-
-prefix-set test1 { 1.2.3/24 }
+prefix-set empty1 { }
+prefix-set empty2 {
+       # comment
+}
+prefix-set one1 { 1.2.3/24 }
+prefix-set one2 {
+       # comment
+       1.2.3/24
+}
 prefix-set test2 { 1.2.3/24 1.2.8.0/22 prefixlen = 24 }
 
 prefix-set "test3_prefixes" { \

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok
index ab36928..355c834 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok
@@ -3,7 +3,17 @@ router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
 holdtime min 3
 fib-priority 48
-prefix-set "test1" {
+prefix-set "empty1" {
+}
+
+prefix-set "empty2" {
+}
+
+prefix-set "one1" {
+       1.2.3.0/24
+}
+
+prefix-set "one2" {
        1.2.3.0/24
 }