Skip to content

Commit 7ec9649

Browse files
committed
python-sat: drop Lingeling from the new test_empty_clause and test_proof in 1.9.dev17
1 parent a97ea13 commit 7ec9649

1 file changed

Lines changed: 29 additions & 3 deletions

File tree

‎patches/python-sat/1.9.dev17/0001-build-without-the-Lingeling-solver.patch‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,19 @@ Drop 'lingeling' from to_install. pysolvers.cc guards all Lingeling
1717
code behind WITH_LINGELING, so the extension builds and links without
1818
it; pysat.solvers.Lingeling (and Solver(name='lingeling')) then fails
1919
with an AttributeError on pysolvers.lingeling_new. Remove 'lingeling'
20-
from the solver lists of the three tests that loop over every solver
21-
so that they keep exercising the remaining nineteen.
20+
from the solver lists of the five tests that loop over every solver
21+
(test_empty_clause.py names it by its 'lgl' alias) so that they keep
22+
exercising the remaining nineteen.
2223

2324
Signed-off-by: Ludovic Henry <git@ludovic.dev>
2425
---
2526
setup.py | 2 +-
2627
tests/test_accum_stats.py | 1 -
2728
tests/test_cnf.py | 1 -
29+
tests/test_empty_clause.py | 2 +-
30+
tests/test_proof.py | 1 -
2831
tests/test_unique_model.py | 1 -
29-
4 files changed, 1 insertion(+), 4 deletions(-)
32+
6 files changed, 2 insertions(+), 6 deletions(-)
3033

3134
diff --git a/setup.py b/setup.py
3235
index 65da94a..837c620 100644
@@ -77,5 +80,28 @@ index 35d86b6..9fd127d 100644
7780
'maplechrono',
7881
'maplecm',
7982
'maplesat',
83+
diff --git a/tests/test_empty_clause.py b/tests/test_empty_clause.py
84+
--- a/tests/test_empty_clause.py
85+
+++ b/tests/test_empty_clause.py
86+
@@ -2,7 +2,7 @@ from pysat.solvers import Solver
87+
from pysat.solvers import ergo_present
88+
89+
# every solver's name, as a clause-adding backend
90+
-solvers = ['m22', 'mgh', 'mep', 'mpl', 'mcm', 'mc', 'mcb', 'lgl',
91+
+solvers = ['m22', 'mgh', 'mep', 'mpl', 'mcm', 'mc', 'mcb',
92+
'g3', 'g4', 'g41', 'gc3', 'gc4',
93+
'cd', 'cd15', 'cd19', 'cd30', 'cdl', 'cdl15', 'cdl19', 'ergo']
94+
95+
diff --git a/tests/test_proof.py b/tests/test_proof.py
96+
--- a/tests/test_proof.py
97+
+++ b/tests/test_proof.py
98+
@@ -12,7 +12,6 @@ solvers = ['cadical103',
99+
'glucose30',
100+
'glucose41',
101+
'glucose42',
102+
- 'lingeling',
103+
'maplechrono',
104+
'maplecm',
105+
'maplesat']
80106
--
81107
2.43.0

0 commit comments

Comments
 (0)