diff options
| -rw-r--r-- | bbot/manifest | 2 | ||||
| -rw-r--r-- | bbot/manifest.cxx | 2 | ||||
| -rw-r--r-- | tests/manifest/machine.test | 20 |
3 files changed, 12 insertions, 12 deletions
diff --git a/bbot/manifest b/bbot/manifest index 5122dc6..c95e83c 100644 --- a/bbot/manifest +++ b/bbot/manifest @@ -22,7 +22,7 @@ namespace bbot { - enum class machine_type {vm, container}; + enum class machine_type {kvm, nspawn}; class LIBBBOT_EXPORT machine_manifest { diff --git a/bbot/manifest.cxx b/bbot/manifest.cxx index 6c9fe4d..b9c623e 100644 --- a/bbot/manifest.cxx +++ b/bbot/manifest.cxx @@ -32,7 +32,7 @@ namespace bbot using strings = vector<string>; - static const strings machine_type_names ({"vm", "container"}); + static const strings machine_type_names ({"kvm", "nspawn"}); static const strings result_status_names ({ "success", diff --git a/tests/manifest/machine.test b/tests/manifest/machine.test index b775a79..cd50bd4 100644 --- a/tests/manifest/machine.test +++ b/tests/manifest/machine.test @@ -9,23 +9,23 @@ test.options += -m : Roundtrip the machine manifest. : { - : vm + : kvm : $* <<EOF >>EOF : 1 id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 name: windows_10-msvc_14 - type: vm + type: kvm summary: Windows 10 build 1607 with VC 14 update 3 EOF - : container + : nspawn : $* <<EOF >>EOF : 1 id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 name: windows_10-msvc_14 - type: container + type: nspawn summary: Windows 10 build 1607 with VC 14 update 3 EOF } @@ -36,7 +36,7 @@ $* <<EOI 2>'stdin:6:1: error: single machine manifest expected' == 1 : 1 id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 name: windows_10-msvc_14 -type: vm +type: kvm summary: Windows 10 build 1607 with VC 14 update 3 : EOI @@ -64,8 +64,8 @@ EOI : $* <<EOI 2>'stdin:3:1: error: machine type redefinition' == 1 : 1 - type: vm - type: vm + type: kvm + type: kvm EOI : summary @@ -124,7 +124,7 @@ EOI $* <<EOI 2>'stdin:5:1: error: no machine id specified' == 1 : 1 name: windows - type: vm + type: kvm summary: Windows EOI @@ -133,7 +133,7 @@ EOI $* <<EOI 2>'stdin:5:1: error: no machine name specified' == 1 : 1 id: 123 - type: vm + type: kvm summary: Windows EOI @@ -152,6 +152,6 @@ EOI : 1 id: 123 name: windows - type: vm + type: kvm EOI } |