Skip to content

Commit e3b47c8

Browse files
committed
test: promote test output
Signed-off-by: Ali Caglayan <[email protected]>
1 parent a67b890 commit e3b47c8

File tree

10 files changed

+24
-30
lines changed

10 files changed

+24
-30
lines changed

test/blackbox-tests/test-cases/pkg/conflict-class.t

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ Local conflict class defined in a local package:
3030
> EOF
3131

3232
$ dune pkg lock
33-
Error: Unable to solve dependencies for the following lock directories:
34-
Lock directory dune.lock:
35-
Couldn't solve the package dependency formula.
33+
File "default/.lock/_unknown_", line 1, characters 0-0:
34+
Error: Couldn't solve the package dependency formula.
3635
Selected candidates: foo.dev x.dev foo&x
3736
- bar -> (problem)
3837
Rejected candidates:
@@ -49,9 +48,8 @@ Now the conflict class comes from the opam repository
4948
$ rm foo.opam
5049

5150
$ dune pkg lock
52-
Error: Unable to solve dependencies for the following lock directories:
53-
Lock directory dune.lock:
54-
Couldn't solve the package dependency formula.
51+
File "default/.lock/_unknown_", line 1, characters 0-0:
52+
Error: Couldn't solve the package dependency formula.
5553
Selected candidates: foo.0.0.1 x.dev
5654
- bar -> (problem)
5755
Rejected candidates:

test/blackbox-tests/test-cases/pkg/depopts/workspace-select.t

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ Select garbage
8484
> EOF
8585

8686
$ dune pkg lock
87-
Error: Unable to solve dependencies for the following lock directories:
88-
Lock directory dune.lock:
89-
Couldn't solve the package dependency formula.
87+
File "default/.lock/_unknown_", line 1, characters 0-0:
88+
Error: Couldn't solve the package dependency formula.
9089
The following packages couldn't be found: z
9190
[1]

test/blackbox-tests/test-cases/pkg/gh11265.t

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ A package which depends on a single package and also conflicts with the same pac
1313
> (depends bar)
1414
> (conflicts bar))
1515
> EOF
16-
Error: Unable to solve dependencies for the following lock directories:
17-
Lock directory dune.lock:
18-
Couldn't solve the package dependency formula.
16+
File "default/.lock/_unknown_", line 1, characters 0-0:
17+
Error: Couldn't solve the package dependency formula.
1918
Selected candidates: foo.dev
2019
- bar -> (problem)
2120
No usable implementations:
@@ -31,9 +30,8 @@ Now add an additional conflict on a non-existant package "baz". Dune should cont
3130
> (depends bar)
3231
> (conflicts bar baz))
3332
> EOF
34-
Error: Unable to solve dependencies for the following lock directories:
35-
Lock directory dune.lock:
36-
Couldn't solve the package dependency formula.
33+
File "default/.lock/_unknown_", line 1, characters 0-0:
34+
Error: Couldn't solve the package dependency formula.
3735
Selected candidates: foo.dev
3836
- bar -> (problem)
3937
No usable implementations:

test/blackbox-tests/test-cases/pkg/implicit-dune-constraint.t

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ dependency.
1717
> }
1818

1919
$ test "2.0.0" 2>&1 | sed -E 's/3.[0-9]+/3.XX/g'
20-
Error: Unable to solve dependencies for the following lock directories:
21-
Lock directory dune.lock:
22-
Couldn't solve the package dependency formula.
20+
File "default/.lock/_unknown_", line 1, characters 0-0:
21+
Error: Couldn't solve the package dependency formula.
2322
Selected candidates: foo.0.0.1 x.dev
2423
- dune -> (problem)
2524
User requested = 3.XX

test/blackbox-tests/test-cases/pkg/non-existent-dep.t

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ A few packages here so the errors could get large.
3434
> EOF
3535

3636
$ dune pkg lock
37-
Error: Unable to solve dependencies for the following lock directories:
38-
Lock directory dune.lock:
39-
Couldn't solve the package dependency formula.
37+
File "default/.lock/_unknown_", line 1, characters 0-0:
38+
Error: Couldn't solve the package dependency formula.
4039
The following packages couldn't be found: foobar
4140
[1]
4241
We only report about non-existent packages.

test/blackbox-tests/test-cases/pkg/non-local-package-depends-on-local-package-error.t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ local package.
2121
> EOF
2222

2323
$ dune pkg lock
24+
File "default/.lock/_unknown_", line 1, characters 0-0:
2425
Error: Dune does not support packages outside the workspace depending on
2526
packages in the workspace. The package "remote" is not in the workspace but
2627
it depends on the package "local_b" which is in the workspace.

test/blackbox-tests/test-cases/pkg/pin-stanza/cycle.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,13 @@ detect it and not descend into an infinite loop.
3838
> }
3939

4040
$ runtest a
41+
File "default/.lock/_unknown_", line 1, characters 0-0:
4142
Error: Dune does not support packages outside the workspace depending on
4243
packages in the workspace. The package "b" is not in the workspace but it
4344
depends on the package "a" which is in the workspace.
4445
[1]
4546
$ runtest b
47+
File "default/.lock/_unknown_", line 1, characters 0-0:
4648
Error: Dune does not support packages outside the workspace depending on
4749
packages in the workspace. The package "a" is not in the workspace but it
4850
depends on the package "b" which is in the workspace.

test/blackbox-tests/test-cases/pkg/self-version-constraint.t

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ constraint on `foo` will fail:
3434
> (name x)
3535
> (depends (foo (= :version))))
3636
> EOF
37-
Error: Unable to solve dependencies for the following lock directories:
38-
Lock directory dune.lock:
39-
Couldn't solve the package dependency formula.
37+
File "default/.lock/_unknown_", line 1, characters 0-0:
38+
Error: Couldn't solve the package dependency formula.
4039
Selected candidates: x.dev
4140
- foo -> (problem)
4241
No usable implementations:

test/blackbox-tests/test-cases/pkg/unsatisfied-version-constraint-on-dune.t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ project:
2222

2323
Solve the dependencies:
2424
$ dune pkg lock 2>&1 | sed -E 's/"3.[0-9]+"/"3.XX"/'
25+
File "default/.lock/_unknown_", line 1, characters 0-0:
2526
Error: The current version of Dune does not satisfy the version constraints
2627
for Dune in this project's dependencies.
2728
Details:

test/blackbox-tests/test-cases/pkg/with-test-dependencies.t

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ Test dependencies of test dependencies are excluded:
5555

5656
Conflicting packages can't be co-installed:
5757
$ solve foo conflicts-with-foo
58-
Error: Unable to solve dependencies for the following lock directories:
59-
Lock directory dune.lock:
60-
Couldn't solve the package dependency formula.
58+
File "default/.lock/_unknown_", line 1, characters 0-0:
59+
Error: Couldn't solve the package dependency formula.
6160
Selected candidates: foo.0.0.1 foo-dependency.0.0.1 x.dev
6261
- conflicts-with-foo -> (problem)
6362
Rejected candidates:
@@ -66,9 +65,8 @@ Conflicting packages can't be co-installed:
6665

6766
Conflicting packages in transitive dependencies can't be co-installed:
6867
$ solve depends-on-foo conflicts-with-foo
69-
Error: Unable to solve dependencies for the following lock directories:
70-
Lock directory dune.lock:
71-
Couldn't solve the package dependency formula.
68+
File "default/.lock/_unknown_", line 1, characters 0-0:
69+
Error: Couldn't solve the package dependency formula.
7270
Selected candidates: depends-on-foo.0.0.1 foo.0.0.1 foo-dependency.0.0.1
7371
x.dev
7472
- conflicts-with-foo -> (problem)

0 commit comments

Comments
 (0)