Skip to content

Commit 341d64d

Browse files
gridbugsgridbugs
committed
Reword portable lockdir solve message and remove platforms
Removing the list of platforms printed when solving portable lockdirs is intended to reduce noise in our tests and to make tests robust to changing the default set of platforms which dune will solve for in the future. Also rewords the message for clarity. Signed-off-by: Stephen Sherratt <[email protected]>
1 parent 457403e commit 341d64d

14 files changed

+14
-90
lines changed

‎bin/pkg/lock.ml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,7 @@ let summary_message
261261
User_message.Style.Success
262262
(Pp.textf "Solution for %s" (Path.to_string_maybe_quoted lock_dir_path))
263263
:: Pp.nop
264-
:: Pp.text "This solution supports the following platforms:"
265-
:: Pp.enumerate (snd lock_dir.solved_for_platforms) ~f:Solver_env.pp_oneline
266-
:: Pp.nop
267-
:: Pp.text "Dependencies on all supported platforms:"
264+
:: Pp.text "Dependencies common to all supported platforms:"
268265
:: pp_package_set common_packages
269266
:: (maybe_uncommon_packages @ maybe_perf_stats))
270267
@ maybe_unsolved_platforms_message)

‎test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-basic.t‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,7 @@ Create a package that writes a different value to some files depending on the os
3636
$ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
3737
Solution for dune.lock
3838

39-
This solution supports the following platforms:
40-
- arch = x86_64; os = linux
41-
- arch = arm64; os = linux
42-
- arch = x86_64; os = macos
43-
- arch = arm64; os = macos
44-
45-
Dependencies on all supported platforms:
39+
Dependencies common to all supported platforms:
4640
- foo.0.0.1
4741

4842
$ cat ${default_lock_dir}/lock.dune

‎test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-custom-platforms.t‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@ Create a custom dune-workspace to solve for openbsd.
4848
$ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
4949
Solution for dune.lock
5050

51-
This solution supports the following platforms:
52-
- arch = x86_64; os = openbsd
53-
54-
Dependencies on all supported platforms:
51+
Dependencies common to all supported platforms:
5552
- foo.0.0.1
5653

5754
$ cat ${default_lock_dir}/lock.dune

‎test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-custom-solver-env.t‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,7 @@ Solve the project:
5151
$ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
5252
Solution for dune.lock
5353

54-
This solution supports the following platforms:
55-
- arch = x86_64; os = linux; sys-ocaml-version =
56-
5.4.0+solver-env-version-override
57-
- arch = arm64; os = linux; sys-ocaml-version =
58-
5.4.0+solver-env-version-override
59-
- arch = x86_64; os = macos; sys-ocaml-version =
60-
5.4.0+solver-env-version-override
61-
- arch = arm64; os = macos; sys-ocaml-version =
62-
5.4.0+solver-env-version-override
63-
64-
Dependencies on all supported platforms:
54+
Dependencies common to all supported platforms:
6555
- foo.0.0.1
6656

6757
Confirming that the build action creates the conditional file:

‎test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-depexts-basic.t‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,7 @@ Demonstrate various cases representing depexts in lockfiles.
2424
$ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
2525
Solution for dune.lock
2626

27-
This solution supports the following platforms:
28-
- arch = x86_64; os = linux
29-
- arch = arm64; os = linux
30-
- arch = x86_64; os = macos
31-
- arch = arm64; os = macos
32-
33-
Dependencies on all supported platforms:
27+
Dependencies common to all supported platforms:
3428
- foo.0.0.1
3529

3630
$ cat ${default_lock_dir}/foo.0.0.1.pkg

‎test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-depexts-pkg-config.t‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,7 @@ correct depext names can be chosen for the current distro at build time.
5454
$ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
5555
Solution for dune.lock
5656

57-
This solution supports the following platforms:
58-
- arch = x86_64; os = macos; os-distribution = homebrew; os-family = homebrew
59-
- arch = x86_64; os = linux
60-
- arch = x86_64; os = win32; os-distribution = cygwin; os-family = windows
61-
62-
Dependencies on all supported platforms:
57+
Dependencies common to all supported platforms:
6358
- conf-pkg-config.0.0.1
6459

6560
Print the name of the depext on a variety of os/distro/versions:

‎test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-package-variable-typo-detection.t‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,5 @@ Create a workspace with some typos in package variable names
4040
"os-family"?
4141
Solution for dune.lock
4242

43-
This solution supports the following platforms:
44-
- arch = x86_64; os = linux
45-
46-
Dependencies on all supported platforms:
43+
Dependencies common to all supported platforms:
4744
(none)

‎test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-partial-solve.t‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ to solve for macos, linux, and windows by default.
3535
$ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
3636
Solution for dune.lock
3737

38-
This solution supports the following platforms:
39-
- arch = x86_64; os = macos
40-
- arch = arm64; os = macos
41-
42-
Dependencies on all supported platforms:
38+
Dependencies common to all supported platforms:
4339
- foo.0.0.1
4440

4541
No package solution was found for some requsted platforms.

‎test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-platform-dependant-dependencies.t‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,7 @@ A package that conditionally depends on packages depending on the OS:
5454
$ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
5555
Solution for dune.lock
5656

57-
This solution supports the following platforms:
58-
- arch = x86_64; os = linux
59-
- arch = arm64; os = linux
60-
- arch = x86_64; os = macos
61-
- arch = arm64; os = macos
62-
63-
Dependencies on all supported platforms:
57+
Dependencies common to all supported platforms:
6458
- foo.0.0.1
6559

6660
Additionally, some packages will only be built on specific platforms.

‎test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-platform-dependant-version-extra-files.t‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,7 @@ Solve the project. The solution will contain extra files for both versions of fo
7171
$ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
7272
Solution for dune.lock
7373

74-
This solution supports the following platforms:
75-
- arch = x86_64; os = linux
76-
- arch = arm64; os = linux
77-
- arch = x86_64; os = macos
78-
- arch = arm64; os = macos
79-
80-
Dependencies on all supported platforms:
74+
Dependencies common to all supported platforms:
8175
- bar.0.0.1
8276

8377
Additionally, some packages will only be built on specific platforms.

0 commit comments

Comments
 (0)