From 4166eee52c7c084fb6382d4a7efb8dd581331497 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 4 May 2018 15:49:19 +0300 Subject: Adapt to version epoch syntax change from '~' to '+-' --- tests/load/1/math/libexp-+1-1.2+1.tar.gz | Bin 0 -> 350 bytes tests/load/1/math/libexp-1~1.2+1.tar.gz | Bin 360 -> 0 bytes tests/load/1/math/packages.manifest | 6 +++--- tests/load/1/stable/libfoo-1.2.2.tar.gz | Bin 301 -> 301 bytes tests/load/1/stable/packages.manifest | 4 ++-- tests/load/1/stable/signature.manifest | 20 ++++++++++---------- tests/load/driver.cxx | 8 ++++---- 7 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 tests/load/1/math/libexp-+1-1.2+1.tar.gz delete mode 100644 tests/load/1/math/libexp-1~1.2+1.tar.gz (limited to 'tests') diff --git a/tests/load/1/math/libexp-+1-1.2+1.tar.gz b/tests/load/1/math/libexp-+1-1.2+1.tar.gz new file mode 100644 index 0000000..2cd4bd7 Binary files /dev/null and b/tests/load/1/math/libexp-+1-1.2+1.tar.gz differ diff --git a/tests/load/1/math/libexp-1~1.2+1.tar.gz b/tests/load/1/math/libexp-1~1.2+1.tar.gz deleted file mode 100644 index 1d15a59..0000000 Binary files a/tests/load/1/math/libexp-1~1.2+1.tar.gz and /dev/null differ diff --git a/tests/load/1/math/packages.manifest b/tests/load/1/math/packages.manifest index 4980e93..3c6e325 100644 --- a/tests/load/1/math/packages.manifest +++ b/tests/load/1/math/packages.manifest @@ -2,7 +2,7 @@ sha256sum: b85ba3a0ba45b98e1fbb2507f199bc4b218a4a413ec6ba4094e214a7507490a2 : name: libexp -version: 1~1.2+1 +version: +1-1.2+1 summary: The exponent license: MIT tags: c++, exponent @@ -14,8 +14,8 @@ depends: libmisc depends: libpq >= 9.0.0 build-exclude: *; Only supported on Linux. build-include: linux* -location: libexp-1~1.2+1.tar.gz -sha256sum: 0a7414d06ad26d49dad203deaf3841f3df97f1fe27c5bf190c1c20dfeb7f84e0 +location: libexp-+1-1.2+1.tar.gz +sha256sum: 58c1385e959a5e650229768f907442cf9569cb23acc3b3f1b5478060f7bfe5f4 : name: libfoo version: 1.0 diff --git a/tests/load/1/stable/libfoo-1.2.2.tar.gz b/tests/load/1/stable/libfoo-1.2.2.tar.gz index a1b80ef..619c813 100644 Binary files a/tests/load/1/stable/libfoo-1.2.2.tar.gz and b/tests/load/1/stable/libfoo-1.2.2.tar.gz differ diff --git a/tests/load/1/stable/packages.manifest b/tests/load/1/stable/packages.manifest index 45bc015..d61b6e2 100644 --- a/tests/load/1/stable/packages.manifest +++ b/tests/load/1/stable/packages.manifest @@ -31,9 +31,9 @@ tags: c++, foo url: http://www.example.com/foo/ email: foo-users@example.com depends: libbar <= 2.4.0 -depends: libexp == 1~1.2 +depends: libexp == +1-1.2 location: libfoo-1.2.2.tar.gz -sha256sum: b47de1b207ef097c9ecdd560007aeadd3775f4fafb4f96fb983e9685c21f3980 +sha256sum: 58139f97dd8a9820a8c0f068f963865fdc0d1e5f7636d464c0d07441095a35fc : name: libfoo version: 1.2.3+4 diff --git a/tests/load/1/stable/signature.manifest b/tests/load/1/stable/signature.manifest index 0da4d07..ccd7b66 100644 --- a/tests/load/1/stable/signature.manifest +++ b/tests/load/1/stable/signature.manifest @@ -1,13 +1,13 @@ : 1 -sha256sum: 7ba11b5c9050827ba50dcb888e4f514fcfdd0f301e56640caf54226310f4fdad +sha256sum: 5ecbb89c8e36b9743fe08a3e53ceefe410ac13f9e1549300a58bcf83aa17e30c signature: \ -w4bLp8f6qGuRkNQE4Dh7+04HJFwlJXfe/qw2Mr41ERnER1nIgwTcF8e+PyUcyLXG9D/3RQ/vqec7 -kpqng0uOXl89dp9C0pwpFV/AntAOg7KeRz73NO30yrgk7gdZYd2/2SR82aYIlcdZxVcwf0kUGyuO -MPcdYQpUozgC2bwzL4LAh+Ky8deacR0ICLkt+4TjKP9rVvPlX82pDPWxYt7wxo6m4i4nXKLQXvHA -Gy59NKQx1+0cEP68RxBrsygfmG4uKWTgRZm2xWuYvwN94q+gGw7s6rkKYLF2/Ndm9vYOig49Kt5i -l7HaPXVMfzYvF/FmqQutk9cOvhkOaHdh+xDbLTOXxQynnYloq3lDxFyaw3ITUzmaONTP5+tVyWji -sOdhMs2URnjyPgrWm7IGAtSd135chXPROIiOqQ4GUZiUkZTjBnsOes/PSPFp7kJwBXG4ogJ09N4D -myeoNSeAdN0ZMR0Pm7eKIcEJXRNH0V78gxVC6j83iwSanMit+tODeikGkck9ndE6s+Ms0trSfao3 -Pq+im6iz3X0jD1i5IaQZCiDkS1oeVvbdyvvVuaCJuujLZd6HnxYTonEl4ZCwrkurYbLyIjApCdx4 -u31dT1Y5r7Xu+3nGQOaO8aXshkB/roID3vklMIJeXE7nXLnmyjsXcxLWm6tbUALBjoxpQNs2jzU= +X16KuI/I780t/KA34PgPgxWMu6mELo08WQVm0Z8f00KvPR1xKow2NMNatDZmtA4oAgAnkUA0tU0Z +G1qdAxwRwCcAYGwKPDT/3hX2oExbyBpU22pTJyQ9nG67CTdv8FXaCrcEP2ZWX43LfQBqagYwNZYH +ZGKloFNwyT5dAc1z2eMBOqQ8cgT8glGOnk9p39Hb02HGhbeUiO/gLwVr7u76sibXZ9TjuXdiE4SE +uBByHhoQOPPvoBtBilDy5S0XqQAig3Rg1qDpURodXz7fgebbQ2HtjS9MNeU0kmdkKUxWjnvu13Gl +Y1VShELMXSdEVLBMYt+hUgrZnYIDN4DrYsMznsMs5qhmarJEs97Fu3oAhXaiaJaFiBQ2ZfbeTasR +apxe2IFzid70+xMTk5Z9HgGNyorNCPCgd6aia9yDqsdgxI4mw396JQjiwGhftwj9VFXPc95ZtDAu +0koVpL3S88jsIykIkmROo2ZldpKYb6TcegEgAwecnBp8dtZD8j4NnS4mS4qtgEwsiCP7JGCHpiPO +FbB697+Pekha81eMSyD7nQOztn0psXc/Qzy9q8LTDqfv/lOZEmvlKVCWoQaoJ8AaTAOs1jcsoS3H +msluQ6WrzbUkH7k79i1t7nOCRd7JzYYDKLvGx9kXBg0y7tZ6la1g05meDyqq0Udw5jUGqy1OW5I= \ diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx index 61c10b0..c6c3deb 100644 --- a/tests/load/driver.cxx +++ b/tests/load/driver.cxx @@ -268,12 +268,12 @@ main (int argc, char* argv[]) "libexp", optional ( dependency_constraint ( - version ("1~1.2"), false, version ("1~1.2"), false)))); + version ("+1-1.2"), false, version ("+1-1.2"), false)))); assert (check_location (fpv2)); assert (fpv2->sha256sum && *fpv2->sha256sum == - "b47de1b207ef097c9ecdd560007aeadd3775f4fafb4f96fb983e9685c21f3980"); + "58139f97dd8a9820a8c0f068f963865fdc0d1e5f7636d464c0d07441095a35fc"); // libfoo-1.2.2-alpha.1 // @@ -619,7 +619,7 @@ main (int argc, char* argv[]) // libexp-1+1.2 // shared_ptr epv ( - db.load (package_id ("libexp", version ("1~1.2+1")))); + db.load (package_id ("libexp", version ("+1-1.2+1")))); assert (epv->summary == "The exponent"); assert (epv->tags == strings ({"c++", "exponent"})); @@ -663,7 +663,7 @@ main (int argc, char* argv[]) assert (check_location (epv)); assert (epv->sha256sum && *epv->sha256sum == - "0a7414d06ad26d49dad203deaf3841f3df97f1fe27c5bf190c1c20dfeb7f84e0"); + "58c1385e959a5e650229768f907442cf9569cb23acc3b3f1b5478060f7bfe5f4"); // Verify libpq package version. // -- cgit v1.1