Fix the reftests on OCaml 5.0 #5402
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kit-ty-kate
added this to PR
in Out of release : doc, test, install, etc.
via automation
kit-ty-kate
force-pushed
the
500-tests
branch
from
2abda9a
to
6fa5ebc
Compare
dra27
reviewed
Feb 8, 2023
src/client/opamAdminRepoUpgrade.ml
Outdated
| @@ -362,7 +364,7 @@ let do_upgrade repo_root = | |||
| O.with_substs [OpamFilename.Base.of_string conf_script_name] |> | |||
| O.with_build [ | |||
| List.map (fun s -> CString s, None) | |||
| [ "ocaml"; "unix.cma"; conf_script_name ], | |||
| [ "ocaml"; conf_script_name ], | |||
There was a problem hiding this comment.
This really shouldn't matter any more, as this only affects the 1.2 upgrade, but is there an issue I haven't spotted with not doing the change above and instead having:
Suggested change
| [ "ocaml"; conf_script_name ], | |
| [ "ocaml"; "-I"; "+unix"; "unix.cma"; conf_script_name ], |
(apart from the fact that my proposed version is ugly!)
Being ultra-paranoid, the file generated before is compilable, where with the current change it becomes a toplevel-only script?
rjbou
approved these changes
Feb 13, 2023
kit-ty-kate
force-pushed
the
500-tests
branch
from
b6396bb
to
d1f8967
Compare
kit-ty-kate
force-pushed
the
500-tests
branch
from
d1f8967
to
4a31680
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With this PR, the reftests are all green on my local machine.