From 250d64faada1a9d0212be07cab6d54a112689b1b Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 20 Apr 2017 18:35:48 +0300 Subject: Add support for machine manifest options value --- unit-tests/bootstrap-manifest/testscript | 71 +++++++++++++++++++++++++------- 1 file changed, 56 insertions(+), 15 deletions(-) (limited to 'unit-tests') 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 - : 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 + : 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 + : 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 + : + $* <'stdin:3:42: error: invalid machine options: unterminated quoted string' == 1 + : 1 + : + options: -device "virtio-scsi-pci,id=scsi + EOI + + : empty + : + $* <'stdin:3:9: error: empty machine options' == 1 + : 1 + : + options: + EOI + } + : no-toolchain : $* <'stdin:8:1: error: toolchain manifest expected' == 1 -- cgit v1.1