From b8c44536ca911418fee1c9ab4eecbb913a1ca852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Tue, 11 Jun 2013 14:06:06 +0300 Subject: solver: rewrite as deductive solver -- core features Implementing basic dependency handling, install_if and awareness of pinning. --- test/conflict2.test | 2 +- test/error1.test | 2 +- test/error2.test | 2 +- test/error3.test | 2 +- test/error4.test | 2 +- test/error5.test | 2 +- test/provides2.test | 2 +- test/provides5.test | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'test') diff --git a/test/conflict2.test b/test/conflict2.test index 32e2b7349d..c9f59ec18c 100644 --- a/test/conflict2.test +++ b/test/conflict2.test @@ -2,5 +2,5 @@ --test-repo conflict.repo add a b>1 @EXPECT -ERROR: 1 unsatisfiable dependencies: +ERROR: unsatisfiable dependencies: world: b>1 diff --git a/test/error1.test b/test/error1.test index 3a165f5e07..4b1662e7c5 100644 --- a/test/error1.test +++ b/test/error1.test @@ -2,5 +2,5 @@ --test-repo complicated1.repo add a d>1.5 @EXPECT -ERROR: 1 unsatisfiable dependencies: +ERROR: unsatisfiable dependencies: b-1: d<2.0 diff --git a/test/error2.test b/test/error2.test index 506bcf2cd1..7f10fb1212 100644 --- a/test/error2.test +++ b/test/error2.test @@ -2,5 +2,5 @@ --test-repo complicated1.repo add a d<1.5 @EXPECT -ERROR: 1 unsatisfiable dependencies: +ERROR: unsatisfiable dependencies: world: d<1.5 diff --git a/test/error3.test b/test/error3.test index 74a817602d..26653742e7 100644 --- a/test/error3.test +++ b/test/error3.test @@ -2,5 +2,5 @@ --test-repo complicated1.repo add a !b @EXPECT -ERROR: 1 unsatisfiable dependencies: +ERROR: unsatisfiable dependencies: a-3: b diff --git a/test/error4.test b/test/error4.test index c05aa93d47..5b22921cba 100644 --- a/test/error4.test +++ b/test/error4.test @@ -2,5 +2,5 @@ --test-repo complicated1.repo add a nonexistant @EXPECT -ERROR: 1 unsatisfiable dependencies: +ERROR: unsatisfiable dependencies: world: nonexistant diff --git a/test/error5.test b/test/error5.test index 3086b20627..b42445484a 100644 --- a/test/error5.test +++ b/test/error5.test @@ -2,5 +2,5 @@ --test-repo complicated1.repo add a>2 @EXPECT -ERROR: 1 unsatisfiable dependencies: +ERROR: unsatisfiable dependencies: b-1: d<2.0 diff --git a/test/provides2.test b/test/provides2.test index 36a0637f07..ff509f8a26 100644 --- a/test/provides2.test +++ b/test/provides2.test @@ -2,7 +2,7 @@ --test-repo provides.repo add mail-reader @EXPECT -ERROR: 1 unsatisfiable dependencies: +ERROR: unsatisfiable dependencies: world: mail-reader mail-reader is a virtual package provided by: diff --git a/test/provides5.test b/test/provides5.test index 9876b02de0..906eb76671 100644 --- a/test/provides5.test +++ b/test/provides5.test @@ -2,5 +2,5 @@ --test-repo provides.repo add server-a server-b @EXPECT -ERROR: 1 unsatisfiable dependencies: +ERROR: unsatisfiable dependencies: world: server-a -- cgit v1.2.3