Merge pull request #5022 from kit-ty-kate/cram-unix

Add some unix-only cram tests to test for #4216 before fixing it
ocaml · Jan 26, 2022 · d396aac · d396aac
2 parents 9e28777 + 44f7e7d
commit d396aac
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 16 deletions.
diff --git a/dune-project b/dune-project
@@ -1,2 +1,4 @@
-(lang dune 2.0)
+(lang dune 2.7)
 (name opam)
+
+(cram enable)
diff --git a/master_changes.md b/master_changes.md
@@ -135,6 +135,7 @@ users)
   * Update bootstrap ocaml to 4.12.1 to integrate mingw fix [#4927 @rjbou]
   * Update bootstrap to use `-j` for Unix (Windows already does) [#4988 @dra27]
   * Update cold compiler to 4.13 [#5017 @dra27]
+  * Change minimum required Dune to 2.7 [#5022 @kit-ty-kate]
 
 ## Infrastructure
   * Fix caching of Cygwin compiler on AppVeyor [#4988 @dra27]
@@ -221,6 +222,9 @@ users)
   * Make all the tests work on macOS/arm64 [#5019 @kit-ty-kate]
 
   * Add clean test for untracked option [#4915 @rjbou]
+## Cram tests
+### Cram tests
+  * Add some unix-only cram tests to test for https://github.com/ocaml/opam/issues/4216 before fixing it [#5022 @kit-ty-kate]
 
 ## Github Actions
   * Add solver backends compile test [#4723 @rjbou] [2.1.0~rc2 #4720]

diff --git a/opam-admin.opam b/opam-admin.opam
@@ -17,7 +17,7 @@ homepage: "https://opam.ocaml.org/"
 bug-reports: "https://github.com/ocaml/opam/issues"
 license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 depends: [
-  "dune" {>= "2.0.0"}
+  "dune" {>= "2.7.0"}
   "re" {>= "1.9.0"}
   "opam-file-format" {>= "2.1.3"}
 ]
diff --git a/opam-client.opam b/opam-client.opam
@@ -33,7 +33,7 @@ depends: [
   "opam-repository" {= version}
   "re" {>= "1.9.0"}
   "cmdliner" {>= "1.0.0"}
-  "dune" {>= "2.0.0"}
+  "dune" {>= "2.7.0"}
 ]
 conflicts: [
   "extlib" {< "1.7.8"}

diff --git a/opam-core.opam b/opam-core.opam
@@ -31,7 +31,7 @@ depends: [
   "base-bigarray"
   "ocamlgraph"
   "re" {>= "1.9.0"}
-  "dune" {>= "2.0.0"}
+  "dune" {>= "2.7.0"}
   "cppo" {build & >= "1.1.0"}
 ]
 conflicts: "extlib-compat"
diff --git a/opam-devel.opam b/opam-devel.opam
@@ -29,7 +29,7 @@ depends: [
   "ocaml" {>= "4.08.0"}
   "opam-client" {= version}
   "cmdliner"
-  "dune" {>= "2.0.0"}
+  "dune" {>= "2.7.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
 ]

diff --git a/opam-format.opam b/opam-format.opam
@@ -30,5 +30,5 @@ depends: [
   "opam-core" {= version}
   "opam-file-format" {>= "2.1.3"}
   "re" {>= "1.9.0"}
-  "dune" {>= "2.0.0"}
+  "dune" {>= "2.7.0"}
 ]
diff --git a/opam-installer.opam b/opam-installer.opam
@@ -31,5 +31,5 @@ depends: [
   "ocaml" {(>= "4.03.0" & os != "win32") | >= "4.06.0"}
   "opam-format" {= version}
   "cmdliner" {>= "0.9.8"}
-  "dune" {>= "2.0.0"}
+  "dune" {>= "2.7.0"}
 ]
diff --git a/opam-repository.opam b/opam-repository.opam
@@ -28,5 +28,5 @@ build: [
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-format" {= version}
-  "dune" {>= "2.0.0"}
+  "dune" {>= "2.7.0"}
 ]
diff --git a/opam-solver.opam b/opam-solver.opam
@@ -32,7 +32,7 @@ depends: [
   "dose3" {>= "6.1"}
   "cudf" {>= "0.7"}
   "re" {>= "1.9.0"}
-  "dune" {>= "2.0.0"}
+  "dune" {>= "2.7.0"}
   "opam-0install-cudf" {>= "0.4"}
 ]
 depopts: [

diff --git a/opam-state.opam b/opam-state.opam
@@ -30,5 +30,5 @@ depends: [
   "opam-repository" {= version}
   "re" {>= "1.9.0"}
   "spdx_licenses" {>= "1.0.0"}
-  "dune" {>= "2.0.0"}
+  "dune" {>= "2.7.0"}
 ]
diff --git a/opam.opam b/opam.opam
@@ -18,6 +18,6 @@ homepage: "https://opam.ocaml.org/"
 bug-reports: "https://github.com/ocaml/opam/issues"
 license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 depends: [
-  "dune" {>= "2.0.0"}
+  "dune" {>= "2.7.0"}
   "opam-client" {= version}
 ]
diff --git a/tests/cram/unix/dune b/tests/cram/unix/dune
@@ -0,0 +1,5 @@
+(cram
+ (enabled_if (= %{os_type} "Unix"))
+ (deps
+  (package opam-devel)
+  (sandbox always)))
diff --git a/tests/cram/unix/list.t b/tests/cram/unix/list.t
@@ -0,0 +1,6 @@
+Test https://github.com/ocaml/opam/issues/4216
+  $ export OPAMROOT=./opamroot
+  $ opam init --bare -n git+https://github.com/ocaml/opam-repository.git#0ec9bbf73a91b8e90b15bb11735859c9552a9888 > /dev/null
+  $ OCAMLRUNPARAM=-b opam list --depends-on dune -s --all-versions | head -n1
+  0install.2.14
+  Fatal error: exception Sys_error("Broken pipe")
diff --git a/tests/reftests/clean.test b/tests/reftests/clean.test
@@ -10,11 +10,6 @@ install: [
   [ "cp" "second" "%{lib}%/things/second" ]
 ]
 ### OPAMPRECISETRACKING=1 OPAMYES=1
-### opam update
-
-<><> Updating package repositories ><><><><><><><><><><><><><><><><><><><><><><>
-[default] synchronised from file://${BASEDIR}/REPO
-Now run 'opam upgrade' to apply any package updates.
 ### opam switch create clean --empty
 ### opam install things
 The following actions will be performed: