On Wed, Nov 08, 2017 at 06:49:31PM -0800, Carlos Cardenas wrote:
> Update regression tests to match new switch configuration
>
committed, thanks!
> diff --git regress/usr.sbin/vmd/config/Makefile
> regress/usr.sbin/vmd/config/Makefile
> index 2adc69ae491..3bf124aff56 100644
> --- regress/usr.sbin/vmd/config/Makefile
> +++ regress/usr.sbin/vmd/config/Makefile
> @@ -5,7 +5,7 @@ VMD ?= /usr/sbin/vmd
> VMD_PASS=boot-keyword memory-round memory-just-enough
> VMD_FAIL=kernel-keyword too-few-ram vm-name-too-long too-many-ifs \
> boot-name-too-long disk-path-too-long too-many-disks \
> - switch-no-interface
> + switch-no-interface switch-no-add
>
> REGRESS_TARGETS=
>
> diff --git regress/usr.sbin/vmd/config/vmd-fail-switch-no-add.conf
> regress/usr.sbin/vmd/config/vmd-fail-switch-no-add.conf
> new file mode 100644
> index 00000000000..40117749346
> --- /dev/null
> +++ regress/usr.sbin/vmd/config/vmd-fail-switch-no-add.conf
> @@ -0,0 +1,6 @@
> +# $OpenBSD$
> +# Fail when a switch is attempting to use add
> +switch "x" {
> + interface bridge0
> + add vether0
> +}
> diff --git regress/usr.sbin/vmd/config/vmd-fail-switch-no-add.ok
> regress/usr.sbin/vmd/config/vmd-fail-switch-no-add.ok
> new file mode 100644
> index 00000000000..c04c2d13732
> --- /dev/null
> +++ regress/usr.sbin/vmd/config/vmd-fail-switch-no-add.ok
> @@ -0,0 +1 @@
> +5: syntax error
> diff --git regress/usr.sbin/vmd/config/vmd-fail-switch-no-interface.conf
> regress/usr.sbin/vmd/config/vmd-fail-switch-no-interface.conf
> index 891d9c88176..f92c09656d6 100644
> --- regress/usr.sbin/vmd/config/vmd-fail-switch-no-interface.conf
> +++ regress/usr.sbin/vmd/config/vmd-fail-switch-no-interface.conf
> @@ -1,5 +1,5 @@
> # $OpenBSD: vmd-fail-switch-no-interface.conf,v 1.1 2017/10/30 03:49:30
> mlarkin Exp $
> # Fail when a switch is missing interface name
> switch "x" {
> - add vether0
> + up
> }
> --
> 2.14.3
>
