[sagemath] 03/05: Change a test to not test the version of glpk.

[Tobias Hansen]

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

thansen pushed a commit to branch experimental
in repository sagemath.

commit c96592d3f2f7c4a514a1fef320496a78c48c7620
Author: Tobias Hansen <thansen at debian.org>
Date:   Sun Jan 29 19:13:45 2017 +0000

    Change a test to not test the version of glpk.
---
 debian/changelog                               |  1 +
 debian/patches/series                          |  1 +
 debian/patches/u1-dont-test-glpk-version.patch | 15 +++++++++++++++
 3 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 432d505..b042728 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ sagemath (7.5.1-1) UNRELEASED; urgency=medium
     - dt-more-fix-test-cases.patch (parts were applied upstream)
   * New patches:
     - u1-singular-include-path-for-pynac.patch
+    - u1-dont-test-glpk-version.patch
 
  -- Tobias Hansen <thansen at debian.org>  Wed, 18 Jan 2017 22:58:31 +0000
 
diff --git a/debian/patches/series b/debian/patches/series
index c00ff5e..1e11645 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,6 +15,7 @@ u1-fix-proper-scipy-rtol.patch
 u1-fix-preexec-fn.patch
 u1-fix-dont-require-DISPLAY.patch
 u1-singular-include-path-for-pynac.patch
+u1-dont-test-glpk-version.patch
 
 # Patches that should be upstreamed, but need a bit more work first
 u2-reproducible-docs.patch
diff --git a/debian/patches/u1-dont-test-glpk-version.patch b/debian/patches/u1-dont-test-glpk-version.patch
new file mode 100644
index 0000000..5ce1db7
--- /dev/null
+++ b/debian/patches/u1-dont-test-glpk-version.patch
@@ -0,0 +1,15 @@
+Description: Do not test the version of glpk
+ The test should not fail just because the version is different.
+Author: Tobias Hansen <thansen at debian.org>
+
+--- a/sage/src/sage/numerical/mip.pyx
++++ b/sage/src/sage/numerical/mip.pyx
+@@ -2519,7 +2519,7 @@
+             sage: b.solver_parameter("simplex_or_intopt", "simplex_only")
+             sage: b.solver_parameter("verbosity_simplex", "GLP_MSG_ALL")
+             sage: p.solve()  # rel tol 1e-5
+-            GLPK Simplex Optimizer, v4.60
++            GLPK Simplex Optimizer, v...
+             2 rows, 2 columns, 4 non-zeros
+             *     0: obj =   7.000000000e+00 inf =   0.000e+00 (2)
+             *     2: obj =   9.400000000e+00 inf =   0.000e+00 (0)

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