From bc970e792159c6b03febb978fc8c9f09dc91e602 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 22 May 2019 15:26:09 +0300 Subject: Add support for package manifest upstream-version value --- tests/manifest/testscript | 151 +++++++++++++++++++--------------------------- 1 file changed, 63 insertions(+), 88 deletions(-) (limited to 'tests') diff --git a/tests/manifest/testscript b/tests/manifest/testscript index acf9d3b..96f8f31 100644 --- a/tests/manifest/testscript +++ b/tests/manifest/testscript @@ -231,21 +231,14 @@ { : absent : - $* <>EOO + $* <>EOF : 1 name: libfoo version: 2.0.0 summary: Modern C++ parser license: LGPLv2 description: libfoo is a very modern C++ XML parser. - EOI - : 1 - name: libfoo - version: 2.0.0 - summary: Modern C++ parser - license: LGPLv2 - description: libfoo is a very modern C++ XML parser. - EOO + EOF : not-text : @@ -279,21 +272,14 @@ : ignore-unknown : - $* -i <>EOO - : 1 - name: libfoo - version: 2.0.0 - summary: Modern C++ parser - license: LGPLv2 - description-file: README.rtf - EOI + $* -i <>EOF : 1 name: libfoo version: 2.0.0 summary: Modern C++ parser license: LGPLv2 description-file: README.rtf - EOO + EOF } : unknown @@ -315,7 +301,7 @@ : ignore : - $* -i <>EOO + $* -i <>EOF : 1 name: libfoo version: 2.0.0 @@ -323,15 +309,7 @@ license: LGPLv2 description: libfoo is a very modern C++ XML parser. description-type: text/markdowns - EOI - : 1 - name: libfoo - version: 2.0.0 - summary: Modern C++ parser - license: LGPLv2 - description: libfoo is a very modern C++ XML parser. - description-type: text/markdowns - EOO + EOF } : plain @@ -339,15 +317,7 @@ { : valid : - $* <>EOO - : 1 - name: libfoo - version: 2.0.0 - summary: Modern C++ parser - license: LGPLv2 - description: libfoo is a very modern C++ XML parser. - description-type: text/plain - EOI + $* <>EOF : 1 name: libfoo version: 2.0.0 @@ -355,7 +325,7 @@ license: LGPLv2 description: libfoo is a very modern C++ XML parser. description-type: text/plain - EOO + EOF : invalid : @@ -377,15 +347,7 @@ { : default : - $* <>EOO - : 1 - name: libfoo - version: 2.0.0 - summary: Modern C++ parser - license: LGPLv2 - description: libfoo is a very modern C++ XML parser. - description-type: text/markdown - EOI + $* <>EOF : 1 name: libfoo version: 2.0.0 @@ -393,11 +355,11 @@ license: LGPLv2 description: libfoo is a very modern C++ XML parser. description-type: text/markdown - EOO + EOF : gfm : - $* <>EOO + $* <>EOF : 1 name: libfoo version: 2.0.0 @@ -405,27 +367,11 @@ license: LGPLv2 description: libfoo is a very modern C++ XML parser. description-type: text/markdown; variant=GFM - EOI - : 1 - name: libfoo - version: 2.0.0 - summary: Modern C++ parser - license: LGPLv2 - description: libfoo is a very modern C++ XML parser. - description-type: text/markdown; variant=GFM - EOO + EOF : common-mark : - $* <>EOO - : 1 - name: libfoo - version: 2.0.0 - summary: Modern C++ parser - license: LGPLv2 - description: libfoo is a very modern C++ XML parser. - description-type: text/markdown; variant=CommonMark - EOI + $* <>EOF : 1 name: libfoo version: 2.0.0 @@ -433,7 +379,7 @@ license: LGPLv2 description: libfoo is a very modern C++ XML parser. description-type: text/markdown; variant=CommonMark - EOO + EOF : invalid-variant : @@ -454,7 +400,7 @@ : ignore : - $* -i <>EOO + $* -i <>EOF : 1 name: libfoo version: 2.0.0 @@ -462,15 +408,7 @@ license: LGPLv2 description: libfoo is a very modern C++ XML parser. description-type: text/markdown; variant=Original - EOI - : 1 - name: libfoo - version: 2.0.0 - summary: Modern C++ parser - license: LGPLv2 - description: libfoo is a very modern C++ XML parser. - description-type: text/markdown; variant=Original - EOO + EOF } : invalid-parameter @@ -492,15 +430,7 @@ : ignore : - $* -i <>EOO - : 1 - name: libfoo - version: 2.0.0 - summary: Modern C++ parser - license: LGPLv2 - description: libfoo is a very modern C++ XML parser. - description-type: text/markdown; variants=GFM - EOI + $* -i <>EOF : 1 name: libfoo version: 2.0.0 @@ -508,7 +438,7 @@ license: LGPLv2 description: libfoo is a very modern C++ XML parser. description-type: text/markdown; variants=GFM - EOO + EOF } } } @@ -527,6 +457,51 @@ EOI } } + + : upstream-version + : + { + : valid + : + $* <>EOF + : 1 + name: libfoo + version: 2.0.0 + upstream-version: 0.28.0.abc.15 + summary: Modern C++ parser + license: LGPLv2 + description: libfoo is a very modern C++ XML parser. + EOF + + : duplicate + : + $* <>EOE != 0 + : 1 + name: libfoo + version: 2.0.0 + upstream-version: 0.28.0.abc.15 + summary: Modern C++ parser + license: LGPLv2 + description: libfoo is a very modern C++ XML parser. + upstream-version: 0.28.0.abc.15 + EOI + stdin:8:1: error: upstream package version redefinition + EOE + + : stub + : + $* <>EOE != 0 + : 1 + name: libfoo + version: 0+1 + upstream-version: 0.28.0.abc.15 + summary: Modern C++ parser + license: LGPLv2 + description: libfoo is a very modern C++ XML parser. + EOI + stdin:4:1: error: upstream package version specified for a stub + EOE + } } : manifest-list -- cgit v1.1