From 7e4c92e29954c14f9c1dd51aff95fff25d3ced32 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 22 May 2019 14:15:44 +0300 Subject: Add support for package manifest upstream-version value --- tests/load/1/math/libexp-+2-1.2+1.tar.gz | Bin 408 -> 426 bytes tests/load/1/math/packages.manifest | 3 ++- tests/load/driver.cxx | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/load') diff --git a/tests/load/1/math/libexp-+2-1.2+1.tar.gz b/tests/load/1/math/libexp-+2-1.2+1.tar.gz index 20c8434..5beeb84 100644 Binary files a/tests/load/1/math/libexp-+2-1.2+1.tar.gz and b/tests/load/1/math/libexp-+2-1.2+1.tar.gz differ diff --git a/tests/load/1/math/packages.manifest b/tests/load/1/math/packages.manifest index 1bb1c57..49caea6 100644 --- a/tests/load/1/math/packages.manifest +++ b/tests/load/1/math/packages.manifest @@ -3,6 +3,7 @@ sha256sum: b85ba3a0ba45b98e1fbb2507f199bc4b218a4a413ec6ba4094e214a7507490a2 : name: libexp version: +2-1.2+1 +upstream-version: 1.2.abc.15-x project: mathLab summary: The exponent license: MIT @@ -19,7 +20,7 @@ build-include: windows**d/x86_64** build-include: windows-vc_13** build-exclude: **; Only supported on Windows. location: libexp-+2-1.2+1.tar.gz -sha256sum: 4f476dab0cd13d4c7a4676b50180e66a9a10a65f92a3d335b8227a9a8ca58e21 +sha256sum: 317c8c6f45d9dfdfdef3a823411920cecd51729c7c4f58f9a0b0bbd681c07bd6 : name: libfoo version: +0-X.Y diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx index 27be0da..18c601e 100644 --- a/tests/load/driver.cxx +++ b/tests/load/driver.cxx @@ -792,6 +792,7 @@ test_pkg_repos (const cstrings& loader_args, db.load ( package_id (tenant, package_name ("libexp"), version ("+2-1.2+1")))); + assert (epv->upstream_version && *epv->upstream_version == "1.2.abc.15-x"); assert (epv->project == "mathLab"); assert (epv->summary == "The exponent"); assert (epv->tags == strings ({"mathlab", "c++", "exponent"})); @@ -836,7 +837,7 @@ test_pkg_repos (const cstrings& loader_args, assert (check_location (epv)); assert (epv->sha256sum && *epv->sha256sum == - "4f476dab0cd13d4c7a4676b50180e66a9a10a65f92a3d335b8227a9a8ca58e21"); + "317c8c6f45d9dfdfdef3a823411920cecd51729c7c4f58f9a0b0bbd681c07bd6"); // Verify libpq package version. // -- cgit v1.1