Comment the empty as-set and prefix-set tests. This is not yet working.

Add a single asnum test, just to make sure that works as well

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.6.in b/regress/usr.sbin/bgpd/config/bgpd.conf.6.in
index d5a3182..f6c6514 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.6.in
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.6.in
@@ -1,9 +1,10 @@
-# $OpenBSD: bgpd.conf.6.in,v 1.3 2018/09/09 13:31:10 claudio Exp $
+# $OpenBSD: bgpd.conf.6.in,v 1.4 2018/09/09 14:28:50 claudio Exp $
 # test as-set blocks
 
 AS 1
 
-as-set empty { }
+#as-set empty { }
+as-set one { 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 90adac3..a0f7c76 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok
@@ -3,8 +3,8 @@ router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
 holdtime min 3
 fib-priority 48
-as-set "empty" {
-       
+as-set "one" {
+       1 
 }
 
 as-set "test1" {

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.7.in b/regress/usr.sbin/bgpd/config/bgpd.conf.7.in
index d722a9f..a477c06 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.7.in
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.7.in
@@ -1,9 +1,9 @@
-# $OpenBSD: bgpd.conf.7.in,v 1.3 2018/09/09 13:31:10 claudio Exp $
+# $OpenBSD: bgpd.conf.7.in,v 1.4 2018/09/09 14:28:50 claudio Exp $
 # test prefix-set blocks
 
 AS 1
 
-prefix-set empty { }
+#prefix-set empty { }
 
 prefix-set test1 { 1.2.3/24 }
 prefix-set test2 { 1.2.3/24 1.2.8.0/22 prefixlen = 24 }

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