Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve conflicts in ocamltest #2805

Merged
merged 3 commits into from
Aug 19, 2024
Merged

Resolve conflicts in ocamltest #2805

merged 3 commits into from
Aug 19, 2024

Conversation

mshinwell
Copy link
Collaborator

As subject

@mshinwell mshinwell requested a review from xclerc July 18, 2024 11:37
@mshinwell
Copy link
Collaborator Author

@xclerc please approve when you are happy with this

@mshinwell
Copy link
Collaborator Author

@xclerc please could you look at the most recent commit, which brings this to what I believe is a working state. The main changes are:

  • build system fixes/improvements
  • some merge mistakes corrected
  • removal of the use of let _ = ... for registering actions, etc - this is too fragile with respect to the build system.

@mshinwell mshinwell merged commit be37d64 into ocaml-flambda:merge-5.2 Aug 19, 2024
1 of 18 checks passed
lukemaurer pushed a commit to lukemaurer/flambda-backend that referenced this pull request Oct 23, 2024
@mshinwell @xclerc
flambda-backend: Resolve conflicts in ocamltest (ocaml-flambda#2805)
3a5d69c 
* Resolve conflicts in ocamltest

* Restore the "do_something" mechanism.

* Further fixes for ocamltest

---------

Co-authored-by: Xavier Clerc <xclerc@janestreet.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xclerc xclerc xclerc approved these changes

Assignees
No one assigned
Labels
OCaml 5.2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mshinwell @xclerc