From 95cf9088ccb535a1b288a0e651e0a9f116c0f384 Mon Sep 17 00:00:00 2001
From: ccardenas <ccardenas@openbsd.org>
Date: Sun, 7 Jan 2018 22:59:57 +0000
Subject: [PATCH] Add regression tests for cdrom keyword

ok mlarkin@
---
 regress/usr.sbin/vmd/config/Makefile                      | 6 +++---
 .../usr.sbin/vmd/config/vmd-fail-cdrom-name-too-long.conf | 6 ++++++
 .../usr.sbin/vmd/config/vmd-fail-cdrom-name-too-long.ok   | 1 +
 regress/usr.sbin/vmd/config/vmd-pass-cdrom-keyword.conf   | 8 ++++++++
 regress/usr.sbin/vmd/config/vmd-pass-cdrom-keyword.ok     | 1 +
 5 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 regress/usr.sbin/vmd/config/vmd-fail-cdrom-name-too-long.conf
 create mode 100644 regress/usr.sbin/vmd/config/vmd-fail-cdrom-name-too-long.ok
 create mode 100644 regress/usr.sbin/vmd/config/vmd-pass-cdrom-keyword.conf
 create mode 100644 regress/usr.sbin/vmd/config/vmd-pass-cdrom-keyword.ok

diff --git a/regress/usr.sbin/vmd/config/Makefile b/regress/usr.sbin/vmd/config/Makefile
index b52ca21416f..4b602083c0a 100644
--- a/regress/usr.sbin/vmd/config/Makefile
+++ b/regress/usr.sbin/vmd/config/Makefile
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile,v 1.3 2017/11/11 02:54:42 mlarkin Exp $
+#	$OpenBSD: Makefile,v 1.4 2018/01/07 22:59:57 ccardenas Exp $
 
 VMD ?= /usr/sbin/vmd
 
-VMD_PASS=boot-keyword memory-round memory-just-enough
+VMD_PASS=boot-keyword memory-round memory-just-enough cdrom-keyword
 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-add
+	 switch-no-interface switch-no-add cdrom-name-too-long
 
 REGRESS_TARGETS=
 
diff --git a/regress/usr.sbin/vmd/config/vmd-fail-cdrom-name-too-long.conf b/regress/usr.sbin/vmd/config/vmd-fail-cdrom-name-too-long.conf
new file mode 100644
index 00000000000..70ad4e952aa
--- /dev/null
+++ b/regress/usr.sbin/vmd/config/vmd-fail-cdrom-name-too-long.conf
@@ -0,0 +1,6 @@
+#	$OpenBSD: vmd-fail-cdrom-name-too-long.conf,v 1.1 2018/01/07 22:59:57 ccardenas Exp $
+# Fail on cdrom path (> 128)
+iso="/some/absolutepath/somewhere/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/cd62.iso"
+vm "x" {
+    cdrom $iso
+}
diff --git a/regress/usr.sbin/vmd/config/vmd-fail-cdrom-name-too-long.ok b/regress/usr.sbin/vmd/config/vmd-fail-cdrom-name-too-long.ok
new file mode 100644
index 00000000000..e94f1e3ef8c
--- /dev/null
+++ b/regress/usr.sbin/vmd/config/vmd-fail-cdrom-name-too-long.ok
@@ -0,0 +1 @@
+5: cdrom name too long
diff --git a/regress/usr.sbin/vmd/config/vmd-pass-cdrom-keyword.conf b/regress/usr.sbin/vmd/config/vmd-pass-cdrom-keyword.conf
new file mode 100644
index 00000000000..36db51eb885
--- /dev/null
+++ b/regress/usr.sbin/vmd/config/vmd-pass-cdrom-keyword.conf
@@ -0,0 +1,8 @@
+#	$OpenBSD: vmd-pass-cdrom-keyword.conf,v 1.1 2018/01/07 22:59:57 ccardenas Exp $
+# Pass on cdrom keyword
+
+vm "x" {
+    memory 1G
+    cdrom "cd62.iso"
+    disable
+}
diff --git a/regress/usr.sbin/vmd/config/vmd-pass-cdrom-keyword.ok b/regress/usr.sbin/vmd/config/vmd-pass-cdrom-keyword.ok
new file mode 100644
index 00000000000..403d828b763
--- /dev/null
+++ b/regress/usr.sbin/vmd/config/vmd-pass-cdrom-keyword.ok
@@ -0,0 +1 @@
+configuration OK
-- 
2.20.1