Skip to content

Add a test showing the behaviour described in #4501 #5183

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

Closed
kit-ty-kate wants to merge 2 commits into from
Closed

Add a test showing the behaviour described in #4501 #5183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c864a48
Add a test showing the behaviour described in #4501 (Migration from 2…
kit-ty-kate Jul 15, 2022
284ccbf
Update master_changes.md
kit-ty-kate Jul 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions master_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ users)
* Update opam root version test do escape `OPAMROOTVERSION` sed, it matches generated hexa temporary directory names [#5007 @AltGr]
* Add json output test [#5143 @rjbou]
* Add test for opam file write with format preserved bug in #4936, fixed in #4941 [#4159 @rjbou]
* Add a test showing the behaviour described in #4501 [#5183 @kit-ty-kate]
### Engine
* Add `opam-cat` to normalise opam file printing [#4763 @rjbou @dra27] [2.1.0~rc2 #4715]
* Fix meld reftest: open only with failing ones [#4913 @rjbou]
Expand Down
83 changes: 56 additions & 27 deletions tests/reftests/opamroot-versions.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ let installed_switches =
| _ -> ""
in
Format.sprintf {|
installed-switches: ["sw-sys-comp" "sw-comp"%s "default" %S "this-internal-error"]
installed-switches: ["sw-sys-comp" "sw-comp"%s "default" %S "this-internal-error" "pinned-comp"]
switch: "sw-sys-comp"
|} local_switch (Filename.concat (Sys.getcwd ()) "why-did-you-delete-me")
let default_compiler = {|default-compiler: ["i-am-sys-compiler" "i-am-compiler"]|}
Expand All @@ -550,6 +550,12 @@ compiler: ["i-am-sys-compiler.1"]
roots: ["i-am-another-package.2" "i-am-sys-compiler.1"]
installed: ["i-am-another-package.2" "i-am-package.2" "i-am-sys-compiler.1"]
|}
let sw_state_pinned_comp = {|
compiler: ["i-am-compiler.1"]
roots: ["i-am-package.1" "i-am-compiler.1"]
installed: ["i-am-compiler.1" "i-am-package.1"]
pinned: ["i-am-compiler.1"]
|}
let invariant_default = {|invariant: ["i-am-sys-compiler" | "i-am-compiler"]|}
let invariant_sw_comp = {|invariant: ["i-am-compiler"]|}
let invariant_sw_sys_comp = {|invariant: ["i-am-sys-compiler"]|}
Expand All @@ -563,7 +569,9 @@ let opam_20 =
"sw-comp/.opam-switch/switch-config", [ opam_version_2_0; synopsis "switch with compiler" ];
"sw-comp/.opam-switch/switch-state", [ opam_version_2_0; sw_state_sw_comp ];
"sw-sys-comp/.opam-switch/switch-config", [ opam_version_2_0; synopsis "switch with system compiler" ];
"sw-sys-comp/.opam-switch/switch-state", [ opam_version_2_0; sw_state_sw_sys_comp ]
"sw-sys-comp/.opam-switch/switch-state", [ opam_version_2_0; sw_state_sw_sys_comp ];
"pinned-comp/.opam-switch/switch-config", [ opam_version_2_0; synopsis "switch with pinned compiler" ];
"pinned-comp/.opam-switch/switch-state", [ opam_version_2_0; sw_state_pinned_comp ];
], [
"_opam/.opam-switch/switch-config", [ opam_version_2_0; synopsis "local switch"; opam_root ];
"_opam/.opam-switch/switch-state", [ opam_version_2_0; sw_state_default ];
Expand Down Expand Up @@ -710,7 +718,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 1
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-comp" "sw-sys-comp" "default"]
installed-switches: ["sw-comp" "sw-sys-comp" "default" "pinned-comp"]
opam-root-version: current
opam-version: "2.0"
repositories: "default"
Expand Down Expand Up @@ -782,7 +790,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 1
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "${BASEDIR}" "default"]
installed-switches: ["sw-sys-comp" "sw-comp" "${BASEDIR}" "default" "pinned-comp"]
jobs: 4
opam-root-version: current
opam-version: "2.0"
Expand Down Expand Up @@ -856,7 +864,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 1
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "default"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "pinned-comp"]
jobs: 4
opam-root-version: current
opam-version: "2.0"
Expand Down Expand Up @@ -918,7 +926,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 1
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "this-internal-error"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "this-internal-error" "pinned-comp"]
jobs: 4
opam-root-version: current
opam-version: "2.0"
Expand Down Expand Up @@ -961,6 +969,7 @@ RSTATE Cache found
GSTATE LOAD-GLOBAL-STATE @ ${BASEDIR}/OPAM
${BASEDIR}
default
pinned-comp
sw-comp
sw-sys-comp
### opam list
Expand All @@ -981,7 +990,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 3
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "default"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "pinned-comp"]
opam-root-version: current
opam-version: "2.0"
repositories: "default"
Expand Down Expand Up @@ -1053,7 +1062,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 3
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-comp" "sw-sys-comp" "default"]
installed-switches: ["sw-comp" "sw-sys-comp" "default" "pinned-comp"]
opam-root-version: current
opam-version: "2.0"
repositories: "default"
Expand Down Expand Up @@ -1120,7 +1129,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 3
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "${BASEDIR}" "default"]
installed-switches: ["sw-sys-comp" "sw-comp" "${BASEDIR}" "default" "pinned-comp"]
opam-root-version: current
opam-version: "2.0"
repositories: "default"
Expand Down Expand Up @@ -1190,7 +1199,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 3
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "default"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "pinned-comp"]
opam-root-version: current
opam-version: "2.0"
repositories: "default"
Expand Down Expand Up @@ -1253,7 +1262,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 1
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "this-internal-error"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "this-internal-error" "pinned-comp"]
jobs: 4
opam-root-version: current
opam-version: "2.0"
Expand Down Expand Up @@ -1301,6 +1310,7 @@ Update done, please now retry your command.
GSTATE LOAD-GLOBAL-STATE @ ${BASEDIR}/OPAM
${BASEDIR}
default
pinned-comp
sw-comp
sw-sys-comp
### opam list
Expand All @@ -1321,7 +1331,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 3
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "default"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "pinned-comp"]
opam-root-version: current
opam-version: "2.0"
repositories: "default"
Expand Down Expand Up @@ -1396,7 +1406,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 3
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-comp" "sw-sys-comp" "default"]
installed-switches: ["sw-comp" "sw-sys-comp" "default" "pinned-comp"]
opam-root-version: current
opam-version: "2.0"
repositories: "default"
Expand Down Expand Up @@ -1465,7 +1475,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 3
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "${BASEDIR}" "default"]
installed-switches: ["sw-sys-comp" "sw-comp" "${BASEDIR}" "default" "pinned-comp"]
opam-root-version: current
opam-version: "2.0"
repositories: "default"
Expand Down Expand Up @@ -1537,7 +1547,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 3
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "default"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "pinned-comp"]
opam-root-version: current
opam-version: "2.0"
repositories: "default"
Expand Down Expand Up @@ -1600,7 +1610,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 1
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "this-internal-error"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "this-internal-error" "pinned-comp"]
jobs: 4
opam-root-version: current
opam-version: "2.0"
Expand Down Expand Up @@ -1648,6 +1658,7 @@ Update done.
GSTATE LOAD-GLOBAL-STATE @ ${BASEDIR}/OPAM
${BASEDIR}
default
pinned-comp
sw-comp
sw-sys-comp
### opam list
Expand All @@ -1668,7 +1679,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 3
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "default"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "pinned-comp"]
opam-root-version: current
opam-version: "2.0"
repositories: "default"
Expand Down Expand Up @@ -1733,7 +1744,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 1
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "default"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "pinned-comp"]
jobs: 4
opam-root-version: current
opam-version: "2.0"
Expand Down Expand Up @@ -1796,7 +1807,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 1
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "${BASEDIR}" "default"]
installed-switches: ["sw-sys-comp" "sw-comp" "${BASEDIR}" "default" "pinned-comp"]
jobs: 4
opam-root-version: current
opam-version: "2.0"
Expand Down Expand Up @@ -1861,7 +1872,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 1
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "${BASEDIR}" "default"]
installed-switches: ["sw-sys-comp" "sw-comp" "${BASEDIR}" "default" "pinned-comp"]
jobs: 4
opam-root-version: current
opam-version: "2.0"
Expand Down Expand Up @@ -1915,7 +1926,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 1
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "this-internal-error"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "this-internal-error" "pinned-comp"]
jobs: 4
opam-root-version: current
opam-version: "2.0"
Expand Down Expand Up @@ -1952,6 +1963,7 @@ RSTATE Cache found
GSTATE LOAD-GLOBAL-STATE @ ${BASEDIR}/OPAM
${BASEDIR}
default
pinned-comp
sw-comp
sw-sys-comp
### opam list
Expand All @@ -1972,7 +1984,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 3
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "default"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "pinned-comp"]
opam-root-version: current
opam-version: "2.0"
repositories: "default"
Expand Down Expand Up @@ -2020,7 +2032,7 @@ depext: true
depext-cannot-install: false
depext-run-installs: true
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "${BASEDIR}/why-did-you-delete-me" "this-internal-error"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "${BASEDIR}/why-did-you-delete-me" "this-internal-error" "pinned-comp"]
opam-root-version: current
opam-version: "2.0"
repositories: "default"
Expand Down Expand Up @@ -2067,7 +2079,7 @@ depext: true
depext-cannot-install: false
depext-run-installs: true
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "${BASEDIR}" "default" "${BASEDIR}/why-did-you-delete-me" "this-internal-error"]
installed-switches: ["sw-sys-comp" "sw-comp" "${BASEDIR}" "default" "${BASEDIR}/why-did-you-delete-me" "this-internal-error" "pinned-comp"]
opam-root-version: current
opam-version: "2.0"
repositories: "default"
Expand Down Expand Up @@ -2114,7 +2126,7 @@ depext: true
depext-cannot-install: false
depext-run-installs: true
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "${BASEDIR}" "default" "${BASEDIR}/why-did-you-delete-me" "this-internal-error"]
installed-switches: ["sw-sys-comp" "sw-comp" "${BASEDIR}" "default" "${BASEDIR}/why-did-you-delete-me" "this-internal-error" "pinned-comp"]
opam-root-version: current
opam-version: "2.0"
repositories: "default"
Expand Down Expand Up @@ -2167,7 +2179,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 1
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "this-internal-error"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "this-internal-error" "pinned-comp"]
jobs: 4
opam-root-version: current
opam-version: "2.0"
Expand Down Expand Up @@ -2201,7 +2213,7 @@ depext-cannot-install: false
depext-run-installs: true
download-jobs: 3
eval-variables: [sys-comp-version ["sh" "-c" "echo $OPAMSYSCOMP"] "comp version"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "${BASEDIR}/why-did-you-delete-me" "this-internal-error"]
installed-switches: ["sw-sys-comp" "sw-comp" "default" "${BASEDIR}/why-did-you-delete-me" "this-internal-error" "pinned-comp"]
opam-root-version: current
opam-version: "2.0"
repositories: "default"
Expand All @@ -2213,6 +2225,7 @@ wrap-remove-commands: ["%{hooks}%/sandbox.sh" "remove"] {os = "linux" | os = "ma
GSTATE LOAD-GLOBAL-STATE @ ${BASEDIR}/OPAM
${BASEDIR}
default
pinned-comp
sw-comp
sw-sys-comp
this-internal-error
Expand All @@ -2226,3 +2239,19 @@ STATE Switch state loaded in 0.000s
# Name # Installed # Synopsis
i-am-package 2 One-line description
i-am-sys-compiler 2 One-line description
### ocaml generate.ml 2.0
### opam upgrade --switch pinned-comp --show-action
GSTATE LOAD-GLOBAL-STATE @ ${BASEDIR}/OPAM
FMT_UPG On-the-fly config upgrade, from 2.0 to 2.1
FMT_UPG Format upgrade done
RSTATE LOAD-REPOSITORY-STATE @ ${BASEDIR}/OPAM
RSTATE Cache found
STATE LOAD-SWITCH-STATE @ pinned-comp
STATE Definition missing for installed package i-am-compiler.1, copying from repo
STATE Definition missing for installed package i-am-package.1, copying from repo
STATE Inferred invariant: from base packages { i-am-compiler.1 }, (roots { i-am-compiler.1 }) => ["i-am-compiler"]
STATE Switch state loaded in 0.000s
STATE Detected changed packages (marked for reinstall): {}
The following actions would be performed:
=== upgrade 1 package
- upgrade i-am-package 1 to 2