From 0bd2f5a8b8c3d1ec419016b80b57fe5139bf4c56 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 5 Jul 2024 23:26:19 +0300 Subject: Adapt tests to libbutl's manifest serializer which now uses new-fashioned multi-line value introducer --- tests/manifest/testscript | 144 ++++++++++++++++++++++++++++++---------------- 1 file changed, 94 insertions(+), 50 deletions(-) (limited to 'tests/manifest/testscript') diff --git a/tests/manifest/testscript b/tests/manifest/testscript index b583b5c..65ec7cc 100644 --- a/tests/manifest/testscript +++ b/tests/manifest/testscript @@ -1170,7 +1170,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - build-bot:\ + build-bot: + \ -----BEGIN PUBLIC KEY----- MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAw5liP5pyU9ebC/nD3djZ 1H2dlKmUyiX0Z8POvKhLREd0B3rM59bPcnbRB4HMIhj0J0hUBvS8xb4u5udCPToa @@ -1186,7 +1187,8 @@ oFDbGI3uY4LnhwmDFLbjtk8CAwEAAQ== -----END PUBLIC KEY----- \ - build-bot:\ + build-bot: + \ -----BEGIN PUBLIC KEY----- AIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAw5liP5pyU9ebC/nD3djZ 2H2dlKmUyiX0Z8POvKhLREd0B3rM59bPcnbRB4HMIhj0J0hUBvS8xb4u5udCPToa @@ -2175,7 +2177,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { prefer @@ -2198,7 +2201,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { prefer @@ -2239,7 +2243,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { enable ($cxx.target.class == 'windows') @@ -2263,7 +2268,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { prefer @@ -2278,7 +2284,7 @@ } \ EOF - stdin:17:3: error: enable clause should precede prefer clause + stdin:18:3: error: enable clause should precede prefer clause EOE : require-clause @@ -2289,7 +2295,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { prefer @@ -2308,7 +2315,7 @@ } \ EOI - stdin:17:3: error: require and prefer clauses are mutually exclusive + stdin:18:3: error: require and prefer clauses are mutually exclusive EOE } @@ -2323,7 +2330,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { require @@ -2343,7 +2351,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { enable ($cxx.target.class == 'windows') @@ -2365,7 +2374,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { require @@ -2382,7 +2392,7 @@ } \ EOF - stdin:15:3: error: prefer and require clauses are mutually exclusive + stdin:16:3: error: prefer and require clauses are mutually exclusive EOE : unescaped-semicolon @@ -2415,7 +2425,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { require @@ -3601,7 +3612,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { reflect @@ -3621,7 +3633,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { enable ($cxx.target.class == 'windows') @@ -3669,7 +3682,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { # Configure bar. @@ -3687,7 +3701,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { require @@ -3707,7 +3722,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { require # Configure bar. @@ -3723,7 +3739,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { require @@ -3743,7 +3760,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { #\\ @@ -3771,7 +3789,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { prefer @@ -3793,7 +3812,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ bar { #\\ @@ -3815,7 +3835,7 @@ } \ EOI - stdin:25:2: error: unterminated multi-line comment + stdin:26:2: error: unterminated multi-line comment EOE } } @@ -3828,7 +3848,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ baz | bar { @@ -3850,7 +3871,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - depends:\ + depends: + \ baz @@ -3965,7 +3987,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - requires:\ + requires: + \ zlib >= 1.2.0 { enable ($cxx.target.class == 'linux') @@ -3986,7 +4009,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - requires:\ + requires: + \ libbar >= 1.2.0 { require @@ -3996,7 +4020,7 @@ } \ EOI - stdin:9:3: error: require clause is not permitted for requirements + stdin:10:3: error: require clause is not permitted for requirements EOE : simple @@ -4458,7 +4482,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - bootstrap-build:\ + bootstrap-build: + \ project = libfoo using version @@ -4467,14 +4492,16 @@ using test using install \ - root-build:\ + root-build: + \ include config/common.build cxx.std = latest using cxx \ - config/common-build:\ + config/common-build: + \ { config [bool] config.libfoo.extras ?= false } @@ -4489,7 +4516,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - bootstrap-build2:\ + bootstrap-build2: + \ project = libfoo using version @@ -4498,14 +4526,16 @@ using test using install \ - root-build2:\ + root-build2: + \ include config/common.build2 cxx.std = latest using cxx \ - config/common-build2:\ + config/common-build2: + \ { config [bool] config.libfoo.extras ?= false } @@ -4520,7 +4550,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - bootstrap-build:\ + bootstrap-build: + \ project = libfoo using version @@ -4529,20 +4560,22 @@ using test using install \ - root-build:\ + root-build: + \ include config/common.build cxx.std = latest using cxx \ - config/common-build2:\ + config/common-build2: + \ { config [bool] config.libfoo.extras ?= false } \ EOI - stdin:22:1: error: standard buildfile naming scheme is already used + stdin:24:1: error: standard buildfile naming scheme is already used EOE : backslash @@ -4664,7 +4697,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - bootstrap-build:\ + bootstrap-build: + \ project = libfoo using version @@ -4673,7 +4707,8 @@ using test using install \ - root-build:\ + root-build: + \ include config/common.build include config/extra.build @@ -4681,7 +4716,8 @@ using cxx \ - config/common-build:\ + config/common-build: + \ { config [bool] config.libfoo.extras ?= false } @@ -4697,7 +4733,8 @@ version: 2.0.0 summary: Modern C++ parser license: LGPLv2 - bootstrap-build2:\ + bootstrap-build2: + \ project = libfoo using version @@ -4706,7 +4743,8 @@ using test using install \ - root-build2:\ + root-build2: + \ include config/common.build2 cxx.std = latest @@ -4867,11 +4905,13 @@ network-build-include: linux* network-build-exclude: *; Only supports Linux. network-build-config: config.libfoo.network=true; Enable networking API. - bootstrap-build:\ + bootstrap-build: + \ project = libfoo \ - root-build:\ + root-build: + \ cxx.std = latest using cxx @@ -4892,7 +4932,8 @@ builds: default legacy; Default and legacy. builds: -windows; Not on Windows. build-exclude: *-msvc_14*/i?86-*; Linker crash. - bootstrap-build:\ + bootstrap-build: + \ project = libbar \ @@ -4907,7 +4948,8 @@ email: libbaz-users@example.org build-error-email: libbaz-issues@example.org; Email for libbaz issues. builds: default experimental - bootstrap-build:\ + bootstrap-build: + \ project = libbaz \ @@ -5167,7 +5209,8 @@ summary: General C++ package repository description: This is the awesome C++ package repository full of exciting\ stuff. - certificate:\ + certificate: + \ -----BEGIN CERTIFICATE----- MIIFLzCCAxegAwIBAgIJAJ71rMp8mDy1MA0GCSqGSIb3DQEBCwUAMDMxFzAVBgNV BAoMDkNvZGUgU3ludGhlc2lzMRgwFgYDVQQDDA9uYW1lOmNwcGdldC5vcmcwHhcN @@ -5414,7 +5457,8 @@ $* -s <>EOF : 1 sha256sum: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - signature:\ + signature: + \ geWdw7Gm+Rt+CLDMBby5Y796E8rxwImb0bmcZwGWar9D3vkFm9Kjh00Buuo1PuU7tP1dV6yvRbH8 NzC0IryEoUJHx9909AJ449ET9Zb+C3ykEeBlKH2wonj7cAVK9ZEDpPEGAtp56XWZQEawl50mwq6t XkZAABxtOswXiicdh3HK7kaPHp38/9CBMc0rva6wDnkbTigUYA2ULqLtP5a5mLovVc48zI9A/hmb -- cgit v1.1