[polybori] 02/03: Move testsuite fixes into one patch.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository polybori.

commit e1f7fea6f3f680d81f1ef7adbd613fd7bed6504c
Author: Tobias Hansen <thansen at debian.org>
Date:   Sun Oct 9 11:51:40 2016 +0000

    Move testsuite fixes into one patch.
---
 ...ries-symlinks-to-testsuite-dependencies-t.patch | 23 ------------
 debian/patches/fix-ftbfs-boost.1.60.patch          | 13 -------
 debian/patches/fix-testsuite.patch                 | 42 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 4 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/debian/patches/0001-Added-libraries-symlinks-to-testsuite-dependencies-t.patch b/debian/patches/0001-Added-libraries-symlinks-to-testsuite-dependencies-t.patch
deleted file mode 100644
index 614db89..0000000
--- a/debian/patches/0001-Added-libraries-symlinks-to-testsuite-dependencies-t.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Alexander Dreyer <adreyer at gmx.de>
-Date: Mon, 18 Feb 2013 13:44:07 +0100
-Subject: Added libraries symlinks to testsuite dependencies to ensure that
- tests can be executed
-
----
- SConstruct |    2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/SConstruct b/SConstruct
-index 0c30e5d..d13b8c3 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1252,6 +1252,8 @@ if BOOST_TEST:
-                         [BOOST_TEST] + libpbShared + libgbShared  + libm4ri + GD_LIBS,
-                     CPPDEFINES = ["BOOST_TEST_DYN_LINK"] )
- 
-+	env.Depends(target, pb_symlinks + gb_symlinks)
-+
-     test_building(TestsPath("unittests"), testfiles, env)
- 
-     for testfile in testfiles:
--- 
diff --git a/debian/patches/fix-ftbfs-boost.1.60.patch b/debian/patches/fix-ftbfs-boost.1.60.patch
deleted file mode 100644
index 310ff7a..0000000
--- a/debian/patches/fix-ftbfs-boost.1.60.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: the new gcc compiler is picky about missing ";"
-
---- polybori-0.8.3.orig/testsuite/src/BoolePolyRingTest.cc
-+++ polybori-0.8.3/testsuite/src/BoolePolyRingTest.cc
-@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(test_variables) {
- 
-   BOOST_TEST_MESSAGE( "nVariables, getVariableName, setVariableName" );
- 
--  BOOST_CHECK_THROW(ring.getVariableName(-1),PBoRiError)
-+  BOOST_CHECK_THROW(ring.getVariableName(-1),PBoRiError);
-   BOOST_CHECK_EQUAL(ring.getVariableName(0), "x(0)");
-   BOOST_CHECK_EQUAL(ring.getVariableName(1), "x(1)");
-   BOOST_CHECK_EQUAL(ring.getVariableName(2), "x(2)");
diff --git a/debian/patches/fix-testsuite.patch b/debian/patches/fix-testsuite.patch
new file mode 100644
index 0000000..54ecbd5
--- /dev/null
+++ b/debian/patches/fix-testsuite.patch
@@ -0,0 +1,42 @@
+Description: Fix test suite
+ - Added libraries symlinks to testsuite dependencies to ensure that
+   tests can be executed.
+ - Library sources were moved to folder libbrial.
+ - Add a missing ;
+From: Alexander Dreyer <adreyer at gmx.de>, Tobias Hansen <thansen at debian.org>
+
+---
+ SConstruct |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -99,7 +99,7 @@
+ 
+ [TestsPath, PyPBPath, CuddPath, GBPath, PBPath, DocPath, BuildPath] = \
+     [ PathJoiner(fdir)
+-      for fdir in Split("""testsuite PyPolyBoRi Cudd groebner libpolybori doc
++      for fdir in Split("""testsuite PyPolyBoRi Cudd groebner libbrial doc
+  build""") ]
+ 
+ M4RIPath = PathJoiner('M4RI')
+@@ -1252,6 +1252,8 @@
+                         [BOOST_TEST] + libpbShared + libgbShared  + libm4ri + GD_LIBS,
+                     CPPDEFINES = ["BOOST_TEST_DYN_LINK"] )
+ 
++	env.Depends(target, pb_symlinks + gb_symlinks)
++
+     test_building(TestsPath("unittests"), testfiles, env)
+ 
+     for testfile in testfiles:
+--- a/testsuite/src/BoolePolyRingTest.cc
++++ b/testsuite/src/BoolePolyRingTest.cc
+@@ -96,7 +96,7 @@
+ 
+   BOOST_TEST_MESSAGE( "nVariables, getVariableName, setVariableName" );
+ 
+-  BOOST_CHECK_THROW(ring.getVariableName(-1),PBoRiError)
++  BOOST_CHECK_THROW(ring.getVariableName(-1),PBoRiError);
+   BOOST_CHECK_EQUAL(ring.getVariableName(0), "x(0)");
+   BOOST_CHECK_EQUAL(ring.getVariableName(1), "x(1)");
+   BOOST_CHECK_EQUAL(ring.getVariableName(2), "x(2)");
diff --git a/debian/patches/series b/debian/patches/series
index 937a813..3579f86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 0003-Protect-CErrorInfo-from-invalid-array-access.patch
-fix-ftbfs-boost.1.60.patch
+fix-testsuite.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/polybori.git