Skip to content

Commit

Permalink
Add some tests showing the unhelpful conflict messages mentionned in o…
Browse files Browse the repository at this point in the history
  • Loading branch information
kit-ty-kate authored and Leonidas-from-XIV committed Mar 10, 2023
1 parent 9a376ad commit ad5b16f
Show file tree
Hide file tree
Showing 2 changed files with 306 additions and 0 deletions.
37 changes: 37 additions & 0 deletions tests/reftests/dune.inc
Original file line number Diff line number Diff line change
Expand Up @@ -943,6 +943,23 @@
%{targets}
(run ./run.exe %{bin:opam} %{dep:switch-set.test} %{read-lines:testing-env}))))

(rule
(alias reftest-unhelpful-conflicts-001)
(action
(diff unhelpful-conflicts-001.test unhelpful-conflicts-001.out)))

(alias
(name reftest)
(deps (alias reftest-unhelpful-conflicts-001)))

(rule
(targets unhelpful-conflicts-001.out)
(deps root-c1ba97dafe95c865d37ad4d88f6e57c9ffbe7f0a)
(action
(with-stdout-to
%{targets}
(run ./run.exe %{bin:opam} %{dep:unhelpful-conflicts-001.test} %{read-lines:testing-env}))))

(rule
(alias reftest-update-upgrade)
(action
Expand Down Expand Up @@ -1279,6 +1296,26 @@
--no-setup --bypass-checks --no-opamrc --bare
file://%{dep:opam-repo-c1842d168d})))))

(rule
(targets opam-archive-c1ba97dafe95c865d37ad4d88f6e57c9ffbe7f0a.tar.gz)
(action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/c1ba97dafe95c865d37ad4d88f6e57c9ffbe7f0a.tar.gz)))

(rule
(targets opam-repo-c1ba97dafe95c865d37ad4d88f6e57c9ffbe7f0a)
(action
(progn
(run mkdir -p %{targets})
(run tar -C %{targets} -xzf %{dep:opam-archive-c1ba97dafe95c865d37ad4d88f6e57c9ffbe7f0a.tar.gz} --strip-components=1))))

(rule
(targets root-c1ba97dafe95c865d37ad4d88f6e57c9ffbe7f0a)
(action
(progn
(ignore-stdout
(run %{bin:opam} init --root=%{targets}
--no-setup --bypass-checks --no-opamrc --bare
file://%{dep:opam-repo-c1ba97dafe95c865d37ad4d88f6e57c9ffbe7f0a})))))

(rule
(targets opam-archive-c1d23f0e.tar.gz)
(action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/c1d23f0e.tar.gz)))
Expand Down
Loading

0 comments on commit ad5b16f

Please sign in to comment.