From f5a74f868477c484a58f9deb7435afa88efaefa0 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 10 Apr 2017 13:17:22 +0200 Subject: Split machine_manifest into machine_header_manifest and machine_manifest --- tests/manifest/driver.cxx | 4 +- tests/manifest/machine-header.test | 127 ++++++++++++++++++++++++++++++ tests/manifest/machine.test | 157 ------------------------------------- tests/manifest/task-request.test | 13 --- 4 files changed, 129 insertions(+), 172 deletions(-) create mode 100644 tests/manifest/machine-header.test delete mode 100644 tests/manifest/machine.test (limited to 'tests') 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-header.test b/tests/manifest/machine-header.test new file mode 100644 index 0000000..051f62f --- /dev/null +++ b/tests/manifest/machine-header.test @@ -0,0 +1,127 @@ +# file : tests/manifest/machine-header.test +# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd +# license : MIT; see accompanying LICENSE file + +test.options += -m + +: valid +: +: Roundtrip the machine header manifest. +: +{ + : kvm + : + $* <>EOF + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + EOF + + : nspawn + : + $* <>EOF + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + EOF +} + +: multiple +: +$* <'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 +: +EOI + +: redefinition +: +{ + : id + : + $* <'stdin:3:1: error: machine id redefinition' == 1 + : 1 + id: 123 + id: 123 + EOI + + : name + : + $* <'stdin:3:1: error: machine name redefinition' == 1 + : 1 + name: windows + name: windows + EOI + + : summary + : + $* <'stdin:3:1: error: machine summary redefinition' == 1 + : 1 + summary: Windows + summary: Windows + EOI +} + +: empty +: +{ + : id + : + $* <'stdin:2:4: error: empty machine id' == 1 + : 1 + id: + EOI + + : name + : + $* <'stdin:2:6: error: empty machine name' == 1 + : 1 + name: + EOI + + : summary + : + $* <'stdin:2:9: error: empty machine summary' == 1 + : 1 + summary: + EOI +} + +: unknown-name +: +$* <"stdin:2:1: error: unknown name 'x' in machine manifest" == 1 +: 1 +x: +EOI + +: missed +: +{ + : id + : + $* <'stdin:4:1: error: no machine id specified' == 1 + : 1 + name: windows + summary: Windows + EOI + + : name + : + $* <'stdin:4:1: error: no machine name specified' == 1 + : 1 + id: 123 + summary: Windows + EOI + + : summary + : + $* <'stdin:4:1: error: no machine summary specified' == 1 + : 1 + id: 123 + name: windows + EOI +} diff --git a/tests/manifest/machine.test b/tests/manifest/machine.test deleted file mode 100644 index 96619f9..0000000 --- a/tests/manifest/machine.test +++ /dev/null @@ -1,157 +0,0 @@ -# file : tests/manifest/machine.test -# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd -# license : MIT; see accompanying LICENSE file - -test.options += -m - -: valid -: -: Roundtrip the machine manifest. -: -{ - : kvm - : - $* <>EOF - : 1 - id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - name: windows_10-msvc_14 - summary: Windows 10 build 1607 with VC 14 update 3 - type: kvm - EOF - - : nspawn - : - $* <>EOF - : 1 - id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - name: windows_10-msvc_14 - summary: Windows 10 build 1607 with VC 14 update 3 - type: nspawn - EOF -} - -: multiple -: -$* <'stdin:6: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 - -: redefinition -: -{ - : id - : - $* <'stdin:3:1: error: machine id redefinition' == 1 - : 1 - id: 123 - id: 123 - EOI - - : name - : - $* <'stdin:3:1: error: machine name redefinition' == 1 - : 1 - name: windows - name: windows - EOI - - : type - : - $* <'stdin:3:1: error: machine type redefinition' == 1 - : 1 - type: kvm - type: kvm - EOI - - : summary - : - $* <'stdin:3:1: error: machine summary redefinition' == 1 - : 1 - summary: Windows - summary: Windows - EOI -} - -: empty -: -{ - : id - : - $* <'stdin:2:4: error: empty machine id' == 1 - : 1 - id: - EOI - - : name - : - $* <'stdin:2:6: error: empty machine name' == 1 - : 1 - name: - EOI - - : summary - : - $* <'stdin:2:9: error: empty machine summary' == 1 - : 1 - summary: - EOI -} - -: invalid-type -: -$* <'stdin:2:7: error: invalid machine type' == 1 -: 1 -type: unknown -EOI - -: unknown-name -: -$* <"stdin:2:1: error: unknown name 'x' in machine manifest" == 1 -: 1 -x: -EOI - -: missed -: -{ - : id - : - $* <'stdin:5:1: error: no machine id specified' == 1 - : 1 - name: windows - type: kvm - summary: Windows - EOI - - : name - : - $* <'stdin:5:1: error: no machine name specified' == 1 - : 1 - id: 123 - type: kvm - summary: Windows - EOI - - : type - : - $* <'stdin:5:1: error: no machine type specified' == 1 - : 1 - id: 123 - name: windows - summary: Windows - EOI - - : summary - : - $* <'stdin:5: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 @@ $* <'stdin:4:1: error: no task request machines specified' == 1 agent: upsa fingerprint: 1105fb394ee870adb154b7abfbbae5755df7dcef6c81db34e8d1b68d2653734e EOI - -: type-not-allowed -: -$* <'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 -- cgit v1.1