[polybori] 03/13: Remove testsuite-boost-1.62.patch (applied upstream).
Tobias Hansen
thansen at moszumanska.debian.org
Sat Nov 4 01:30:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository polybori.
commit 04e4dac0663edf5cffe95eb34b234f82cb738126
Author: Tobias Hansen <thansen at debian.org>
Date: Tue Oct 24 20:56:47 2017 +0100
Remove testsuite-boost-1.62.patch (applied upstream).
---
debian/changelog | 1 +
debian/patches/series | 1 -
debian/patches/testsuite-boost-1.62.patch | 218 ------------------------------
3 files changed, 1 insertion(+), 219 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7a800d9..aa19d83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
brial (1.2.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Remove testsuite-boost-1.62.patch (applied upstream).
-- Tobias Hansen <thansen at debian.org> Tue, 24 Oct 2017 20:52:47 +0100
diff --git a/debian/patches/series b/debian/patches/series
index 5fe5990..b4c5dd7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
0003-Protect-CErrorInfo-from-invalid-array-access.patch
-testsuite-boost-1.62.patch
diff --git a/debian/patches/testsuite-boost-1.62.patch b/debian/patches/testsuite-boost-1.62.patch
deleted file mode 100644
index dce342d..0000000
--- a/debian/patches/testsuite-boost-1.62.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-Description: Fix testsuite for change in hash_combine in boost 1.62
- The hash function for boost::hash_combine() which is called in
- libbrial/include/polybori/routines/pbori_routines_hash.h was changed for
- boost 1.62 in the commit
- https://github.com/boostorg/functional/commit/45eeb170f2b1372b4b5e52744d3c51eddb285b42
- .
- Therefore the hashes in the testsuite need to be updated.
-Author: Tobias Hansen <thansen at debian.org>
-
---- a/testsuite/src/BoolePolynomialTest.cc
-+++ b/testsuite/src/BoolePolynomialTest.cc
-@@ -334,21 +334,21 @@
- BOOST_TEST_MESSAGE( "stableHash");
-
- #ifdef PBORI_TEST_64BITTED
-- BOOST_CHECK_EQUAL(poly_type(1, ring).stableHash(), 4801919416);
-- BOOST_CHECK_EQUAL(poly_type(x).stableHash(), 173100285919);
-- BOOST_CHECK_EQUAL(poly_type(x*y).stableHash(), 11091674931773);
-- BOOST_CHECK_EQUAL(poly_type(x*y + z).stableHash(), 46073228251744210);
-- BOOST_CHECK_EQUAL(poly_type(x*y + z + 1).stableHash(), 3005992135566960638);
-- BOOST_CHECK_EQUAL(poly_type(x*y + x + z).stableHash(), 3006002441743652495);
-- BOOST_CHECK_EQUAL(poly_type(x*y + x + z + 1).stableHash(), 5907816585472828820);
-+ BOOST_CHECK_EQUAL(poly_type(1, ring).stableHash(), 16982317933699389295);
-+ BOOST_CHECK_EQUAL(poly_type(x).stableHash(), 14511566905035657723);
-+ BOOST_CHECK_EQUAL(poly_type(x*y).stableHash(), 1160268684422367443);
-+ BOOST_CHECK_EQUAL(poly_type(x*y + z).stableHash(), 15553547522801749128);
-+ BOOST_CHECK_EQUAL(poly_type(x*y + z + 1).stableHash(), 14746308500923705671);
-+ BOOST_CHECK_EQUAL(poly_type(x*y + x + z).stableHash(), 6609543853578108291);
-+ BOOST_CHECK_EQUAL(poly_type(x*y + x + z + 1).stableHash(), 13745298887294022704);
- #else
-- BOOST_CHECK_EQUAL(poly_type(1, ring).stableHash(), 2654501304);
-- BOOST_CHECK_EQUAL(poly_type(x).stableHash(), 3449012191);
-- BOOST_CHECK_EQUAL(poly_type(x*y).stableHash(), 4216922685);
-- BOOST_CHECK_EQUAL(poly_type(x*y + z).stableHash(), 4229314514);
-- BOOST_CHECK_EQUAL(poly_type(x*y + z + 1).stableHash(), 517852158);
-- BOOST_CHECK_EQUAL(poly_type(x*y + x + z).stableHash(), 689818255);
-- BOOST_CHECK_EQUAL(poly_type(x*y + x + z + 1).stableHash(), 3337575060);
-+ BOOST_CHECK_EQUAL(poly_type(1, ring).stableHash(), 879054753);
-+ BOOST_CHECK_EQUAL(poly_type(x).stableHash(), 3481556931);
-+ BOOST_CHECK_EQUAL(poly_type(x*y).stableHash(), 569922758);
-+ BOOST_CHECK_EQUAL(poly_type(x*y + z).stableHash(), 240822309);
-+ BOOST_CHECK_EQUAL(poly_type(x*y + z + 1).stableHash(), 2507878590);
-+ BOOST_CHECK_EQUAL(poly_type(x*y + x + z).stableHash(), 433737400);
-+ BOOST_CHECK_EQUAL(poly_type(x*y + x + z + 1).stableHash(), 628776654);
- #endif
-
- BOOST_TEST_MESSAGE( "deg, TotalDeg, length, nNodes, nUsedVariables, usedVariables");
-@@ -567,21 +567,21 @@
- "{d,f}, {d}, {f}, {}}"));
-
- #ifdef PBORI_TEST_64BITTED
-- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 4801919416);
-- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 173100285919);
-- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 11091674931773);
-+ BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 16982317933699389295);
-+ BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 14511566905035657723);
-+ BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 1160268684422367443);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
-- 11091674972829);
-- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 173100285919);
-- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 173100285919);
-+ 994909422134781907);
-+ BOOST_CHECK_EQUAL(poly1.leadStableHash(), 14511566905035657723);
-+ BOOST_CHECK_EQUAL(poly2.leadStableHash(), 14511566905035657723);
- #else
-- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 2654501304);
-- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3449012191);
-- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 4216922685);
-+ BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 879054753);
-+ BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3481556931);
-+ BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 569922758);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
-- 4216963741);
-- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 3449012191);
-- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 3449012191);
-+ 1713393842);
-+ BOOST_CHECK_EQUAL(poly1.leadStableHash(), 3481556931);
-+ BOOST_CHECK_EQUAL(poly2.leadStableHash(), 3481556931);
- #endif
-
- // naturally lexicographicsl
-@@ -667,21 +667,21 @@
- "{d,f}, {d}, {f}, {}}"));
-
- #ifdef PBORI_TEST_64BITTED
-- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 4801919416);
-- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 173100285919);
-- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 11091674931773);
-+ BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 16982317933699389295);
-+ BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 14511566905035657723);
-+ BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 1160268684422367443);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
-- 11091674972829);
-- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 706244161997016);
-- BOOST_CHECK_EQUAL(poly2.leadStableHash(),11091674972829);
-+ 994909422134781907);
-+ BOOST_CHECK_EQUAL(poly1.leadStableHash(), 13332077148710286618);
-+ BOOST_CHECK_EQUAL(poly2.leadStableHash(), 994909422134781907);
- #else
-- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 2654501304);
-- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3449012191);
-- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 4216922685);
-+ BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 879054753);
-+ BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3481556931);
-+ BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 569922758);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
-- 4216963741);
-- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 1214744792);
-- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 4216963741);
-+ 1713393842);
-+ BOOST_CHECK_EQUAL(poly1.leadStableHash(), 2080251592);
-+ BOOST_CHECK_EQUAL(poly2.leadStableHash(), 1713393842);
- #endif
-
- BooleMonomial terms1[] = {c*d*e, c*e*f, g*h, a, b};
-@@ -760,21 +760,21 @@
- "{d,f}, {d}, {f}, {}}"));
-
- #ifdef PBORI_TEST_64BITTED
-- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 4801919416);
-- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 173100285919);
-- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 11091674931773);
-+ BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 16982317933699389295);
-+ BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 14511566905035657723);
-+ BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 1160268684422367443);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
-- 11091674972829);
-- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 706244162000938);
-- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 11091674956572);
-+ 994909422134781907);
-+ BOOST_CHECK_EQUAL(poly1.leadStableHash(), 16171595639562729641);
-+ BOOST_CHECK_EQUAL(poly2.leadStableHash(), 298249910754104916);
- #else
-- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 2654501304);
-- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3449012191);
-- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 4216922685);
-+ BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 879054753);
-+ BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3481556931);
-+ BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 569922758);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
-- 4216963741);
-- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 1214748714);
-- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 4216947484);
-+ 1713393842);
-+ BOOST_CHECK_EQUAL(poly1.leadStableHash(), 3527394431);
-+ BOOST_CHECK_EQUAL(poly2.leadStableHash(), 9141547);
- #endif
-
- BooleMonomial terms1[] = {c*e*f, c*d*e, g*h, b, a};
-@@ -855,21 +855,21 @@
- "{d,f}, {d}, {f}, {}}"));
-
- #ifdef PBORI_TEST_64BITTED
-- BOOST_CHECK_EQUAL(poly_type(1,ring).leadStableHash(), 4801919416);
-- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 173100285919);
-- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 11091674931773);
-+ BOOST_CHECK_EQUAL(poly_type(1,ring).leadStableHash(), 16982317933699389295);
-+ BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 14511566905035657723);
-+ BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 1160268684422367443);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
-- 11091674972829);
-- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 173100285919);
-- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 173100285919);
-+ 994909422134781907);
-+ BOOST_CHECK_EQUAL(poly1.leadStableHash(), 14511566905035657723);
-+ BOOST_CHECK_EQUAL(poly2.leadStableHash(), 14511566905035657723);
- #else
-- BOOST_CHECK_EQUAL(poly_type(1,ring).leadStableHash(), 2654501304);
-- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3449012191);
-- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 4216922685);
-+ BOOST_CHECK_EQUAL(poly_type(1,ring).leadStableHash(), 879054753);
-+ BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3481556931);
-+ BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 569922758);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
-- 4216963741);
-- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 3449012191);
-- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 3449012191);
-+ 1713393842);
-+ BOOST_CHECK_EQUAL(poly1.leadStableHash(), 3481556931);
-+ BOOST_CHECK_EQUAL(poly2.leadStableHash(), 3481556931);
- #endif
-
-
-@@ -950,22 +950,22 @@
- "{d,f}, {d}, {f}, {}}"));
-
- #ifdef PBORI_TEST_64BITTED
-- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 4801919416);
-- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 173100285919);
-- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 11091674931773);
-+ BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 16982317933699389295);
-+ BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 14511566905035657723);
-+ BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 1160268684422367443);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
-- 11091674972829);
-+ 994909422134781907);
-
-- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 706244162000938);
-- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 11091674972829);
-+ BOOST_CHECK_EQUAL(poly1.leadStableHash(), 16171595639562729641);
-+ BOOST_CHECK_EQUAL(poly2.leadStableHash(), 994909422134781907);
- #else
-- BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 2654501304);
-- BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3449012191);
-- BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 4216922685);
-+ BOOST_CHECK_EQUAL(poly_type(1, ring).leadStableHash(), 879054753);
-+ BOOST_CHECK_EQUAL(poly_type(a).leadStableHash(), 3481556931);
-+ BOOST_CHECK_EQUAL(poly_type(a*b).leadStableHash(), 569922758);
- BOOST_CHECK_EQUAL(poly_type(c*d +c + e + 1).leadStableHash(),
-- 4216963741);
-- BOOST_CHECK_EQUAL(poly1.leadStableHash(), 1214748714);
-- BOOST_CHECK_EQUAL(poly2.leadStableHash(), 4216963741);
-+ 1713393842);
-+ BOOST_CHECK_EQUAL(poly1.leadStableHash(), 3527394431);
-+ BOOST_CHECK_EQUAL(poly2.leadStableHash(), 1713393842);
- #endif
-
- BooleMonomial terms1[] = {c*e*f, c*d*e, b, a, g*h};
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/polybori.git
More information about the debian-science-commits
mailing list