ocaml / dune / 26811

7%

Build Type

push

github

Committed by web-flow

Commit Message

fix: handle trailing / in Path.External.drop_prefix (#10465)

* fix: handle trailing / in Path.drop_prefix

In a nutshell:

    # drop_prefix ~prefix:"/a/b/c/" "/a/b/c/d/e"
    Some "d/e"

This improves the test situation on nix (#8203) in the default devshell,
because the paths in `OCAMLPATH` can have trailing slashes.

More precisely, the `--sanitize-for-tests` options uses
`Path.External.drop_prefix` to replace elements of `OCAMLPATH` by the
`FINDLIB` string. If `OCAMLPATH` contains paths with trailing slashes,
these prefixes are not sanitized properly.

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

* refactor: get rid of [Path.External.drop_prefix]

Just as easily replaced by [Path.drop_prefix]. None of its uses were
performance critical, so the reduced complexity is more important here.

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Co-authored-by: Rudi Grinberg <me@rgrinberg.com>

Run Details

0 of 2 new or added lines in 1 file covered. (0.0%)

327 existing lines in 2 files now uncovered.

2909 of 42093 relevant lines covered (6.91%)

27061.48 hits per line