1 files changed, 56 insertions, 15 deletions
diff --git a/unit-tests/bootstrap-manifest/testscript b/unit-tests/bootstrap-manifest/testscript
index 8e1fbcf..0632317 100644
--- a/unit-tests/bootstrap-manifest/testscript
+++ b/unit-tests/bootstrap-manifest/testscript
@@ -77,20 +77,42 @@
 
   : valid
   :
-  $* <<EOF >>EOF
-  : 1
-  :
-  id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-  name: windows_10-msvc_14
-  summary: Windows 10 build 1607 with VC 14 update 3
-  type: kvm
-  mac: de:ad:be:ef:de:ad
-  :
-  id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-  :
-  bbot-version: 1010200
-  libbbot-version: 1010100
-  EOF
+  {
+    : all-values
+    :
+    $* <<EOF >>EOF
+    : 1
+    :
+    id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+    name: windows_10-msvc_14
+    summary: Windows 10 build 1607 with VC 14 update 3
+    type: kvm
+    mac: de:ad:be:ef:de:ad
+    options: -device "virtio-scsi-pci,id=scsi" -device "scsi-hd,drive=disk0"
+    :
+    id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+    :
+    bbot-version: 1010200
+    libbbot-version: 1010100
+    EOF
+
+    : no-options
+    :
+    $* <<EOF >>EOF
+    : 1
+    :
+    id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+    name: windows_10-msvc_14
+    summary: Windows 10 build 1607 with VC 14 update 3
+    type: kvm
+    mac: de:ad:be:ef:de:ad
+    :
+    id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+    :
+    bbot-version: 1010200
+    libbbot-version: 1010100
+    EOF
+  }
 
   : unknown
   :
@@ -114,9 +136,28 @@
   name: windows_10-msvc_14
   summary: Windows 10 build 1607 with VC 14 update 3
   type: kvm
-
   EOI
 
+  : invalid-options
+  :
+  {
+    : unquoted
+    :
+    $* <<EOI 2>'stdin:3:42: error: invalid machine options: unterminated quoted string' == 1
+    : 1
+    :
+    options: -device "virtio-scsi-pci,id=scsi
+    EOI
+
+    : empty
+    :
+    $* <<EOI 2>'stdin:3:9: error: empty machine options' == 1
+    : 1
+    :
+    options:
+    EOI
+  }
+
   : no-toolchain
   :
   $* <<EOI 2>'stdin:8:1: error: toolchain manifest expected' == 1