From d3a0e798e5af401b78ecbfb550cb6eabc825df44 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 6 Mar 2019 16:30:31 +0300 Subject: Use new setup for unit tests --- bbot/.gitignore | 7 +- bbot/bootstrap-manifest.test.cxx | 46 +++++ bbot/bootstrap-manifest.test.testscript | 43 +++++ bbot/buildfile | 43 ++++- bbot/machine-manifest.test.cxx | 62 +++++++ bbot/machine-manifest.test.testscript | 312 ++++++++++++++++++++++++++++++++ 6 files changed, 504 insertions(+), 9 deletions(-) create mode 100644 bbot/bootstrap-manifest.test.cxx create mode 100644 bbot/bootstrap-manifest.test.testscript create mode 100644 bbot/machine-manifest.test.cxx create mode 100644 bbot/machine-manifest.test.testscript (limited to 'bbot') diff --git a/bbot/.gitignore b/bbot/.gitignore index e7ffd50..bed4dc1 100644 --- a/bbot/.gitignore +++ b/bbot/.gitignore @@ -1,4 +1,9 @@ -*-options.?xx bbot-agent bbot-worker +*.test +*-options.?xx version.hxx + +# Testscript output directory (can be symlink). +# +test-*.test diff --git a/bbot/bootstrap-manifest.test.cxx b/bbot/bootstrap-manifest.test.cxx new file mode 100644 index 0000000..da41fd7 --- /dev/null +++ b/bbot/bootstrap-manifest.test.cxx @@ -0,0 +1,46 @@ +// file : bbot/bootstrap-manifest.test.cxx -*- C++ -*- +// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd +// license : TBC; see accompanying LICENSE file + +#include // ios_base::failbit, ios_base::badbit +#include + +#include +#include + +#include +#include + +#include + +using namespace std; +using namespace butl; +using namespace bbot; + +// Usage: argv[0] +// +// Read and parse bootstrap manifest from STDIN and serialize it to STDOUT. +// +int +main () +try +{ + cin.exceptions (ios_base::failbit | ios_base::badbit); + cout.exceptions (ios_base::failbit | ios_base::badbit); + + manifest_parser p (cin, "stdin"); + manifest_serializer s (cout, "stdout"); + + bootstrap_manifest (p).serialize (s); + return 0; +} +catch (const manifest_parsing& e) +{ + cerr << e << endl; + return 1; +} +catch (const manifest_serialization& e) +{ + cerr << e << endl; + return 1; +} diff --git a/bbot/bootstrap-manifest.test.testscript b/bbot/bootstrap-manifest.test.testscript new file mode 100644 index 0000000..626497c --- /dev/null +++ b/bbot/bootstrap-manifest.test.testscript @@ -0,0 +1,43 @@ +# file : bbot/bootstrap-manifest.test.testscript +# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd +# license : TBC; see accompanying LICENSE file + +: bootstrap-manifest +: +{ + : valid + : + $* <>EOF + : 1 + bbot-version: 1.1.2 + libbbot-version: 1.1.1 + EOF + + : dup + : + $* <'stdin:3:1: error: bbot-version redefinition' == 1 + : 1 + bbot-version: 1.1.2 + bbot-version: 1.1.3 + EOI + + : invalid-version + : + $* <'stdin:2:15: error: invalid package version: invalid major version' == 1 + : 1 + bbot-version: abc + EOI + + : no-versions + : + $* <'stdin:2:1: error: no package versions specified' == 1 + : 1 + EOI + + : unknown + : + $* <"stdin:2:1: error: unknown name 'x' in bootstrap manifest" == 1 + : 1 + x: y + EOI +} diff --git a/bbot/buildfile b/bbot/buildfile index dbb32c6..3925585 100644 --- a/bbot/buildfile +++ b/bbot/buildfile @@ -28,22 +28,49 @@ if ($cxx.target.class == "linux") { ./: exe{bbot-agent} service{'bbot-agent@'} - exe{bbot-agent}: agent/{hxx ixx txx cxx}{* -agent-options} \ - agent/{hxx ixx cxx}{agent-options} libue{bbot} + exe{bbot-agent}: agent/cxx{agent} agent/libue{bbot} + + agent/ + { + libue{bbot}: {hxx ixx txx cxx}{* -agent -agent-options -*.test...} \ + {hxx ixx cxx}{agent-options} \ + ../libue{bbot} + } } -./: exe{bbot-worker} +./: exe{bbot-worker}: worker/cxx{worker} worker/libue{bbot} -exe{bbot-worker}: worker/{hxx ixx txx cxx}{* -worker-options} \ - worker/{hxx ixx cxx}{worker-options} libue{bbot} + worker/ +{ + libue{bbot}: {hxx ixx txx cxx}{* -worker -worker-options -*.test...} \ + {hxx ixx cxx}{worker-options} \ + ../libue{bbot} +} -libue{bbot}: bin.whole = false -libue{bbot}: {hxx ixx txx cxx}{* -common-options -version} \ - {hxx ixx cxx}{common-options} {hxx}{version} \ +libue{bbot}: {hxx ixx txx cxx}{* -common-options -version -*.test...} \ + {hxx ixx cxx}{common-options} \ + {hxx}{version} \ $libs hxx{version}: in{version} $src_root/manifest +# Unit tests. +# +exe{*.test}: +{ + test = true + install = false +} + +for t: cxx{**.test...} +{ + d = $directory($t) + n = $name($t)... + + ./: $d/exe{$n}: $t $d/{hxx ixx txx}{+$n} $d/testscript{+$n} + $d/exe{$n}: $d/libue{bbot}: bin.whole = false +} + # Generated options parser. # if $cli.configured diff --git a/bbot/machine-manifest.test.cxx b/bbot/machine-manifest.test.cxx new file mode 100644 index 0000000..c1287dc --- /dev/null +++ b/bbot/machine-manifest.test.cxx @@ -0,0 +1,62 @@ +// file : bbot/machine-manifest.test.cxx -*- C++ -*- +// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd +// license : TBC; see accompanying LICENSE file + +#include // ios_base::failbit, ios_base::badbit +#include + +#include +#include + +#include +#include + +#include + +using namespace std; +using namespace butl; +using namespace bbot; + +// Usage: argv[0] (-m|-t|-bm) +// +// Read and parse manifest from STDIN and serialize it to STDOUT. The +// following options specify the manifest type. +// +// -m parse machine manifest +// -t parse toolchain manifest +// -bm parse bootstrapped machine manifest +// +int +main (int argc, char* argv[]) +try +{ + assert (argc == 2); + string opt (argv[1]); + + cin.exceptions (ios_base::failbit | ios_base::badbit); + cout.exceptions (ios_base::failbit | ios_base::badbit); + + manifest_parser p (cin, "stdin"); + manifest_serializer s (cout, "stdout"); + + if (opt == "-m") + machine_manifest (p).serialize (s); + else if (opt == "-t") + toolchain_manifest (p).serialize (s); + else if (opt == "-bm") + bootstrapped_machine_manifest (p).serialize (s); + else + assert (false); + + return 0; +} +catch (const manifest_parsing& e) +{ + cerr << e << endl; + return 1; +} +catch (const manifest_serialization& e) +{ + cerr << e << endl; + return 1; +} diff --git a/bbot/machine-manifest.test.testscript b/bbot/machine-manifest.test.testscript new file mode 100644 index 0000000..fe8c59a --- /dev/null +++ b/bbot/machine-manifest.test.testscript @@ -0,0 +1,312 @@ +# file : bbot/machine-manifest.test.testscript +# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd +# license : TBC; see accompanying LICENSE file + +: machine-manifest +: +{ + test.options += -m + + : valid + : + { + : 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" + changes: \ + 0.7.0 + - mac is changed to de:ad:be:ef:de:ad + - increased disk size to 30GB + \ + EOF + + : multi-line-options + : + $* <>EOO + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + type: kvm + options: \ + -device "virtio-scsi-pci,id=scsi" + -device "scsi-hd,drive=disk0" + \ + EOI + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + type: kvm + options: -device "virtio-scsi-pci,id=scsi" -device "scsi-hd,drive=disk0" + EOO + + : no-mac + : + $* <>EOF + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + type: nspawn + options: -device "virtio-scsi-pci,id=scsi" -device "scsi-hd,drive=disk0" + EOF + + : no-options + : + $* <>EOF + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + type: nspawn + mac: de:ad:be:ef:de:ad + EOF + } + + : redefinition + : + { + : type + : + $* <'stdin:6:1: error: machine type redefinition' == 1 + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + type: nspawn + type: kvm + EOI + + : mac + : + $* <'stdin:6:1: error: machine mac redefinition' == 1 + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + mac: de:ad:be:ef:de:ad + mac: de:ad:be:ef:de:ad + EOI + + : options + : + $* <'stdin:6:1: error: machine options redefinition' == 1 + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + options: -device "virtio-scsi-pci,id=scsi" -device "scsi-hd,drive=disk0" + options: + EOI + } + + : invalid + : + { + : type + : + $* <'stdin:5:7: error: invalid machine type' == 1 + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + type: vmware + EOI + + : options + : + { + : empty + : + $* <'stdin:5:9: error: empty machine options' == 1 + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + options: + EOI + + : unquoted + : + $* <'stdin:5:42: error: invalid machine options: unterminated quoted string' == 1 + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + options: -device "virtio-scsi-pci,id=scsi + EOI + + : unquoted-multi-line + : + $* <'stdin:7:29: error: invalid machine options: unterminated quoted string' == 1 + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + options: \ + -device "virtio-scsi-pci,id=scsi" + -device "scsi-hd,drive=disk0 + \ + EOI + } + + : changes + : + $* <'stdin:5:9: error: empty machine changes' == 1 + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + changes: + EOI + } + + : missed + : + { + : type + : + $* <'stdin:5:1: error: no machine type specified' == 1 + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + EOI + } + + : unknown-name + : + $* <"stdin:5:1: error: unknown name 'x' in machine manifest" == 1 + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + x: + EOI +} + +: toolchain-manifest +: +{ + test.options += -t + + : valid + : + $* <>EOF + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + EOF + + : no-id + : + $* <'stdin:2:1: error: no toolchain id specified' == 1 + : 1 + EOI + + : dup-id + : + $* <'stdin:3:1: error: toolchain id redefinition' == 1 + : 1 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + EOI + + : empty-id + : + $* <'stdin:2:4: error: empty toolchain id' == 1 + : 1 + id: + EOI + + : unknown + : + $* <"stdin:2:1: error: unknown name 'x' in toolchain manifest" == 1 + : 1 + x: y + EOI +} + +: bootstrapped-machine-manifest +: +{ + test.options += -bm + + : valid + : + { + : 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 + : + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + : + bbot-version: 1.1.2 + libbbot-version: 1.1.1 + EOF + } + + : unknown + : + $* <"stdin:2:1: error: unknown name 'x' in bootstrapped machine manifest" == 1 + : 1 + x: y + EOI + + : no-machine + : + $* <'stdin:2:1: error: machine manifest expected' == 1 + : 1 + EOI + + : no-machine-mac + : + $* <'stdin:2:1: error: mac address must be present in machine manifest' == 1 + : 1 + : + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + type: kvm + EOI + + : no-toolchain + : + $* <'stdin:8:1: error: toolchain manifest expected' == 1 + : 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 + EOI + + : no-bootstrap + : + $* <'stdin:10:1: error: bootstrap manifest expected' == 1 + : 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 + EOI +} -- cgit v1.1