3 files changed, 8 insertions, 51 deletions
diff --git a/tests/manifest/driver.cxx b/tests/manifest/driver.cxx
index 0f24c8a..16240a5 100644
--- a/tests/manifest/driver.cxx
+++ b/tests/manifest/driver.cxx
@@ -22,7 +22,7 @@ using namespace bbot;
 // Read and parse manifest from STDIN and serialize it to STDOUT. The
 // following options specify the manifest type.
 //
-// -m  parse machine manifest
+// -m  parse machine header manifest
 // -t  parse task manifest
 // -r  parse result manifest
 // -tq parse task request manifest
@@ -43,7 +43,7 @@ try
   manifest_serializer s (cout, "stdout");
 
   if (opt == "-m")
-    machine_manifest (p).serialize (s);
+    machine_header_manifest (p).serialize (s);
   else if (opt == "-t")
     task_manifest (p).serialize (s);
   else if (opt == "-r")
diff --git a/tests/manifest/machine.test b/tests/manifest/machine-header.test
index 96619f9..051f62f 100644
--- a/tests/manifest/machine.test
+++ b/tests/manifest/machine-header.test
@@ -1,4 +1,4 @@
-# file      : tests/manifest/machine.test
+# file      : tests/manifest/machine-header.test
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
@@ -6,7 +6,7 @@ test.options += -m
 
 : valid
 :
-: Roundtrip the machine manifest.
+: Roundtrip the machine header manifest.
 :
 {
   : kvm
@@ -16,7 +16,6 @@ test.options += -m
   id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
   name: windows_10-msvc_14
   summary: Windows 10 build 1607 with VC 14 update 3
-  type: kvm
   EOF
 
   : nspawn
@@ -26,18 +25,16 @@ test.options += -m
   id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
   name: windows_10-msvc_14
   summary: Windows 10 build 1607 with VC 14 update 3
-  type: nspawn
   EOF
 }
 
 : multiple
 :
-$* <<EOI 2>'stdin:6:1: error: single machine manifest expected' == 1
+$* <<EOI 2>'stdin:5:1: error: single machine manifest expected' == 1
 : 1
 id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 name: windows_10-msvc_14
 summary: Windows 10 build 1607 with VC 14 update 3
-type: kvm
 :
 EOI
 
@@ -60,14 +57,6 @@ EOI
   name: windows
   EOI
 
-  : type
-  :
-  $* <<EOI 2>'stdin:3:1: error: machine type redefinition' == 1
-  : 1
-  type: kvm
-  type: kvm
-  EOI
-
   : summary
   :
   $* <<EOI 2>'stdin:3:1: error: machine summary redefinition' == 1
@@ -102,13 +91,6 @@ EOI
   EOI
 }
 
-: invalid-type
-:
-$* <<EOI 2>'stdin:2:7: error: invalid machine type' == 1
-: 1
-type: unknown
-EOI
-
 : unknown-name
 :
 $* <<EOI 2>"stdin:2:1: error: unknown name 'x' in machine manifest" == 1
@@ -121,37 +103,25 @@ EOI
 {
   : id
   :
-  $* <<EOI 2>'stdin:5:1: error: no machine id specified' == 1
+  $* <<EOI 2>'stdin:4:1: error: no machine id specified' == 1
   : 1
   name: windows
-  type: kvm
   summary: Windows
   EOI
 
   : name
   :
-  $* <<EOI 2>'stdin:5:1: error: no machine name specified' == 1
+  $* <<EOI 2>'stdin:4:1: error: no machine name specified' == 1
   : 1
   id: 123
-  type: kvm
-  summary: Windows
-  EOI
-
-  : type
-  :
-  $* <<EOI 2>'stdin:5:1: error: no machine type specified' == 1
-  : 1
-  id: 123
-  name: windows
   summary: Windows
   EOI
 
   : summary
   :
-  $* <<EOI 2>'stdin:5:1: error: no machine summary specified' == 1
+  $* <<EOI 2>'stdin:4:1: error: no machine summary specified' == 1
   : 1
   id: 123
   name: windows
-  type: kvm
   EOI
 }
diff --git a/tests/manifest/task-request.test b/tests/manifest/task-request.test
index 2e3fb75..135dc8d 100644
--- a/tests/manifest/task-request.test
+++ b/tests/manifest/task-request.test
@@ -81,16 +81,3 @@ $* <<EOI 2>'stdin:4:1: error: no task request machines specified' == 1
 agent: upsa
 fingerprint: 1105fb394ee870adb154b7abfbbae5755df7dcef6c81db34e8d1b68d2653734e
 EOI
-
-: type-not-allowed
-:
-$* <<EOI 2>'stdin:7:1: error: machine type not allowed' == 1
-: 1
-agent: upsa
-fingerprint: 1105fb394ee870adb154b7abfbbae5755df7dcef6c81db34e8d1b68d2653734e
-:
-id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-name: windows_10-msvc_14
-type: vm
-summary: Windows 10 build 1607 with VC 14 update 3
-EOI