summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2011-10-14 20:48:20 +0300
committerTimo Teräs <timo.teras@iki.fi>2011-10-14 21:01:43 +0300
commitafd854a3e2cf20b3f35c5503c9df9589f482dc74 (patch)
tree2c334538f13290b736f99021cc166486a023b638 /test
parent3f098e7d8c47f34dd0438dcb63abb6b0a5f2332e (diff)
downloadapk-tools-afd854a3e2cf20b3f35c5503c9df9589f482dc74.tar.gz
apk-tools-afd854a3e2cf20b3f35c5503c9df9589f482dc74.tar.bz2
apk-tools-afd854a3e2cf20b3f35c5503c9df9589f482dc74.tar.xz
apk-tools-afd854a3e2cf20b3f35c5503c9df9589f482dc74.zip
solver: preference scoring
Should now choose packages better if the best available version is uninstallable for some reason.
Diffstat (limited to 'test')
-rw-r--r--test/error1.expect5
-rw-r--r--test/error2.expect2
-rw-r--r--test/error3.expect4
-rw-r--r--test/error5.expect5
4 files changed, 7 insertions, 9 deletions
diff --git a/test/error1.expect b/test/error1.expect
index 6f340f1..ddd4f4f 100644
--- a/test/error1.expect
+++ b/test/error1.expect
@@ -1,3 +1,2 @@
-2 unsatisfiable dependencies (solution with 4 names)
-world: d>1.5
-c-1: d>1.0
+1 unsatisfiable dependencies (solution with 4 names)
+b-1: d<2.0
diff --git a/test/error2.expect b/test/error2.expect
index 5ab9023..7faac5e 100644
--- a/test/error2.expect
+++ b/test/error2.expect
@@ -1,2 +1,2 @@
1 unsatisfiable dependencies (solution with 4 names)
-c-1: d>1.0
+world: d<1.5
diff --git a/test/error3.expect b/test/error3.expect
index 55be962..d04f76e 100644
--- a/test/error3.expect
+++ b/test/error3.expect
@@ -1,2 +1,2 @@
-1 unsatisfiable dependencies (solution with 4 names)
-world: !b
+1 unsatisfiable dependencies (solution with 3 names)
+a-3: b
diff --git a/test/error5.expect b/test/error5.expect
index 553ecf3..ddd4f4f 100644
--- a/test/error5.expect
+++ b/test/error5.expect
@@ -1,3 +1,2 @@
-2 unsatisfiable dependencies (solution with 4 names)
-a-3: d>1.5
-c-1: d>1.0
+1 unsatisfiable dependencies (solution with 4 names)
+b-1: d<2.0