aboutsummaryrefslogtreecommitdiff
path: root/tests/manifest
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-01-29 16:08:35 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-01-30 15:53:10 +0300
commitf8851063035424e441259af9f26c28af090542b4 (patch)
tree8488701f06909d6d9bce3cb3a964bce3116e6f8e /tests/manifest
parentec1f115eaed9ec950cacab1b7ded6d35e99afb9d (diff)
Add package_manifest constructor that translates package version
Also complete ~$/^$ dependency constraints using standard_version_constraint class.
Diffstat (limited to 'tests/manifest')
-rw-r--r--tests/manifest/driver.cxx28
-rw-r--r--tests/manifest/testscript127
2 files changed, 121 insertions, 34 deletions
diff --git a/tests/manifest/driver.cxx b/tests/manifest/driver.cxx
index 3bffd4a..5f8a0f5 100644
--- a/tests/manifest/driver.cxx
+++ b/tests/manifest/driver.cxx
@@ -9,6 +9,7 @@
#include <libbutl/manifest-parser.mxx>
#include <libbutl/manifest-serializer.mxx>
+#include <libbutl/standard-version.mxx>
#include <libbpkg/manifest.hxx>
@@ -86,9 +87,25 @@ main (int argc, char* argv[])
cin.exceptions (ios_base::failbit | ios_base::badbit);
if (opt == "-p")
- pkg_package_manifest (p,
- false /* ignore_unknown */,
- complete_depends).serialize (s);
+ package_manifest (
+ p,
+ [] (version& v)
+ {
+ // Emulate populating the snapshot information for the latest
+ // snapshot.
+ //
+ if (butl::optional<standard_version> sv =
+ parse_standard_version (v.string ()))
+ {
+ if (sv->latest_snapshot ())
+ {
+ sv->snapshot_sn = 123;
+ v = version (sv->string ());
+ }
+ }
+ },
+ false /* ignore_unknown */,
+ complete_depends).serialize (s);
else if (opt == "-pp")
pkg_package_manifests (p).serialize (s);
else if (opt == "-dp")
@@ -112,6 +129,11 @@ main (int argc, char* argv[])
cerr << e << endl;
return 1;
}
+ catch (const invalid_argument& e)
+ {
+ cerr << e << endl;
+ return 1;
+ }
return 0;
}
diff --git a/tests/manifest/testscript b/tests/manifest/testscript
index b1b94ed..591ae07 100644
--- a/tests/manifest/testscript
+++ b/tests/manifest/testscript
@@ -119,21 +119,76 @@
{
: complete
:
- $* -c -p <<EOI >>EOO
- : 1
- name: foo
- version: 2.0.0
- summary: Modern C++ parser
- license: LGPLv2
- depends: bar == $ | libbaz ~$ | libbox ^$ | libfox [1.0 $)
- EOI
- : 1
- name: foo
- version: 2.0.0
- summary: Modern C++ parser
- license: LGPLv2
- depends: bar == 2.0.0 | libbaz ~2.0.0 | libbox ^2.0.0 | libfox [1.0 2.0.0)
- EOO
+ {
+ : final
+ :
+ $* -c -p <<EOI >>EOO
+ : 1
+ name: foo
+ version: 2.0.0
+ summary: Modern C++ parser
+ license: LGPLv2
+ depends: bar == $ | libbaz ~$ | libbox ^$ | libfox [1.0 $)
+ EOI
+ : 1
+ name: foo
+ version: 2.0.0
+ summary: Modern C++ parser
+ license: LGPLv2
+ depends: bar == 2.0.0 | libbaz ~2.0.0 | libbox ^2.0.0 | libfox [1.0 2.0.0)
+ EOO
+
+ : non-standard
+ :
+ $* -c -p <<EOI >>EOO
+ : 1
+ name: foo
+ version: 2.0.0-x
+ summary: Modern C++ parser
+ license: LGPLv2
+ depends: bar == $ | libfox [1.0 $)
+ EOI
+ : 1
+ name: foo
+ version: 2.0.0-x
+ summary: Modern C++ parser
+ license: LGPLv2
+ depends: bar == 2.0.0-x | libfox [1.0 2.0.0-x)
+ EOO
+
+ : non-standard-shortcut
+ :
+ $* -c -p <<EOI 2>>EOE != 0
+ : 1
+ name: foo
+ version: 2.0.0-x
+ summary: Modern C++ parser
+ license: LGPLv2
+ depends: bar ~$
+ EOI
+ stdin:6:10: error: invalid dependency constraint: dependent version is not standard
+ EOE
+
+ : latest-snapshot
+ :
+ $* -c -p <<EOI >>EOO
+ : 1
+ name: foo
+ version: 2.0.0-a.0.z
+ summary: Modern C++ parser
+ license: LGPLv2
+ depends: bar == $ | libbaz ~$ | libbox ^$ | libfox [1.0 $)
+ EOI
+ : 1
+ name: foo
+ version: 2.0.0-a.0.123
+ summary: Modern C++ parser
+ license: LGPLv2
+ depends: bar == 2.0.0-a.0.123 | libbaz [2.0.0-a.0.1 2.0.0-a.1) | libbox\
+ [2.0.0-a.0.1 2.0.0-a.1) | libfox [1.0 2.0.0-a.0.123)
+ EOO
+
+ }
: incomplete
:
@@ -579,20 +634,22 @@
: effective-constraints
:
{
+ test.options += -ec
+
: regular
:
- $* -ec '1.2.3+1' <<EOI >>EOO
+ $* '1.2.3+1' <<EOI >>EOO
[1.0 $)
[1.0 $]
- [$ 1.2.4)
[$ 1.2.4]
+ ($ 1.2.4]
== $
>= $
EOI
[1.0 $) [1.0 1.2.3)
[1.0 $] [1.0 1.2.3]
- [$ 1.2.4) [1.2.3 1.2.4)
[$ 1.2.4] [1.2.3 1.2.4]
+ ($ 1.2.4] (1.2.3 1.2.4]
== $ == 1.2.3
>= $ >= 1.2.3
EOO
@@ -603,8 +660,8 @@
: final
:
{
- $* -ec '1.2.3+1' <'~$' >'~$ ~1.2.0' : tilda
- $* -ec '1.2.3+1' <'^$' >'^$ ^1.0.0' : carrot
+ $* '1.2.3+1' <'~$' >'~$ ~1.2.0' : tilda
+ $* '1.2.3+1' <'^$' >'^$ ^1.0.0' : carrot
}
: pre-release
@@ -613,16 +670,16 @@
: tilda
:
{
- $* -ec '1.2.0-b.2' <'~$' >'~$ ~1.2.0-a.1' : no-final
- $* -ec '1.2.1-a.1' <'~$' >'~$ ~1.2.0' : final-patch
+ $* '1.2.0-b.2' <'~$' >'~$ ~1.2.0-a.1' : no-final
+ $* '1.2.1-a.1' <'~$' >'~$ ~1.2.0' : final-patch
}
: carrot
:
{
- $* -ec '1.0.0-b.2' <'^$' >'^$ ^1.0.0-a.1' : no-final
- $* -ec '1.0.1-a.1' <'^$' >'^$ ^1.0.0' : final-patch
- $* -ec '1.1.0-b.2' <'^$' >'^$ ^1.0.0' : final-minor
+ $* '1.0.0-b.2' <'^$' >'^$ ^1.0.0-a.1' : no-final
+ $* '1.0.1-a.1' <'^$' >'^$ ^1.0.0' : final-patch
+ $* '1.1.0-b.2' <'^$' >'^$ ^1.0.0' : final-minor
}
}
@@ -632,18 +689,26 @@
: tilda
:
{
- $* -ec '1.2.1-a.2.345' <'~$' >'~$ ~1.2.0' : patch
- $* -ec '1.2.0-a.0.345' <'~$' >'~$ [1.2.0-a.0.1 1.2.0-a.1)' : minor
- $* -ec '1.0.0-a.0.345' <'~$' >'~$ [1.0.0-a.0.1 1.0.0-a.1)' : major
+ $* '1.2.1-a.2.345' <'~$' >'~$ ~1.2.0' : patch
+ $* '1.2.0-a.0.345' <'~$' >'~$ [1.2.0-a.0.1 1.2.0-a.1)' : minor
+ $* '1.0.0-a.0.345' <'~$' >'~$ [1.0.0-a.0.1 1.0.0-a.1)' : major
}
: carrot
:
{
- $* -ec '1.2.1-a.2.345' <'^$' >'^$ ^1.0.0' : patch
- $* -ec '1.2.0-a.0.345' <'^$' >'^$ [1.2.0-a.0.1 1.2.0-a.1)' : minor
- $* -ec '1.0.0-a.0.345' <'^$' >'^$ [1.0.0-a.0.1 1.0.0-a.1)' : major
+ $* '1.2.1-a.2.345' <'^$' >'^$ ^1.0.0' : patch
+ $* '1.2.0-a.0.345' <'^$' >'^$ [1.2.0-a.0.1 1.2.0-a.1)' : minor
+ $* '1.0.0-a.0.345' <'^$' >'^$ [1.0.0-a.0.1 1.0.0-a.1)' : major
}
}
+
+ : invalid
+ :
+ {
+ $* '1.2.3-' <'~$' 2>'dependent version is earliest' == 1 : earliest-version
+ $* '1.2.3-a.0.z' <'~$' 2>'invalid version: dependent version is latest snapshot' == 1 : latest-version
+ $* '0+1' <'~$' 2>'invalid version: dependent version is stub' == 1 : stub-version
+ }
}
}