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.

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

test: fixes to version-corruption.t #10469

Merged
merged 2 commits into from
May 3, 2024

Conversation

emillon
Copy link
Collaborator

@emillon emillon commented Apr 30, 2024

  • refactor(test): rewrite compare.sh in ocaml. This removes the external dependencies and makes intent clearer. The count changes because it was counting the numbers of characters differing in the hexdump instead of a byte count.
  • fix(test): disable version-corruption.t on mac. When codesigning triggers, the binary layout is completely changed to it's not meaningful to count the number of changed bytes.

@emillon emillon changed the title WIP: draft: adapt version-corruption test test: fixes to version-corruption.t Apr 30, 2024
@emillon emillon marked this pull request as ready for review April 30, 2024 13:31
@emillon emillon requested a review from anmonteiro April 30, 2024 13:31
@emillon emillon mentioned this pull request Apr 30, 2024
2 tasks
@emillon emillon linked an issue May 2, 2024 that may be closed by this pull request
2 tasks
Copy link
Collaborator

@Leonidas-from-XIV Leonidas-from-XIV left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call with the script, the original is hard to read and understand, whereas the new one is much easier to understand even without comments.

This removes the external dependencies and makes intent clearer.
The count changes because it was counting the numbers of characters
differing in the hexdump instead of a byte count.

Signed-off-by: Etienne Millon <me@emillon.org>
When codesigning triggers, the binary layout is completely changed to
it's not meaningful to count the number of changed bytes

Signed-off-by: Etienne Millon <me@emillon.org>
@emillon emillon merged commit cacaad3 into ocaml:main May 3, 2024
25 of 27 checks passed
@emillon emillon deleted the macos-version-corruption branch May 3, 2024 10:10
emillon added a commit to emillon/dune that referenced this pull request May 24, 2024
* refactor(test): rewrite compare.sh in ocaml

This removes the external dependencies and makes intent clearer.
The count changes because it was counting the numbers of characters
differing in the hexdump instead of a byte count.

Signed-off-by: Etienne Millon <me@emillon.org>

* fix(test): disable version-corruption.t on mac

When codesigning triggers, the binary layout is completely changed to
it's not meaningful to count the number of changed bytes

Signed-off-by: Etienne Millon <me@emillon.org>

---------

Signed-off-by: Etienne Millon <me@emillon.org>
emillon added a commit that referenced this pull request May 24, 2024
* fix(test): silence duplicate -lc++ warnings on mac (#10468)

When linking C++ on recent macos versions, the linker will emit a
duplicate `-lc++` warning which we can silence in the test suite.

Signed-off-by: Etienne Millon <me@emillon.org>

* test: fixes to version-corruption.t (#10469)

* refactor(test): rewrite compare.sh in ocaml

This removes the external dependencies and makes intent clearer.
The count changes because it was counting the numbers of characters
differing in the hexdump instead of a byte count.

Signed-off-by: Etienne Millon <me@emillon.org>

* fix(test): disable version-corruption.t on mac

When codesigning triggers, the binary layout is completely changed to
it's not meaningful to count the number of changed bytes

Signed-off-by: Etienne Millon <me@emillon.org>

---------

Signed-off-by: Etienne Millon <me@emillon.org>

* ci: run build on macOS x86_64 again (#10481)

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>

* test: fix truncate on macOS (#10361)

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>

---------

Signed-off-by: Etienne Millon <me@emillon.org>
Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
Co-authored-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Co-authored-by: Thomas Gazagnaire <thomas@gazagnaire.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CI failing on mac arm
2 participants