From 2431bb8aa58f572104683491bb7c534ebaaf45d8 Mon Sep 17 00:00:00 2001
From: Tanaka Akira
Date: Fri, 7 Aug 2020 23:35:51 +0900
Subject: Change OUnit package name to ounit2.

OUnit package name is changed from "oUnit" to "ounit2":
https://github.com/gildor478/ounit#user-content-transition-to-ounit2

This change follows it and fixes
a failure, `ocamlfind: Package oUnit not found`,
at `make test-suite` and `dune build`.
---
 test-suite/Makefile              | 8 ++++----
 test-suite/unit-tests/.merlin.in | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test-suite/Makefile b/test-suite/Makefile
index f7447d6cec..8ef59a3b6e 100644
--- a/test-suite/Makefile
+++ b/test-suite/Makefile
@@ -301,20 +301,20 @@ endif
 
 unit-tests/src/utest.cmx: unit-tests/src/utest.ml unit-tests/src/utest.cmi
 	$(SHOW) 'OCAMLOPT  $<'
-	$(HIDE)$(OCAMLOPT) -c -I unit-tests/src -package oUnit $<
+	$(HIDE)$(OCAMLOPT) -c -I unit-tests/src -package ounit2 $<
 unit-tests/src/utest.cmo: unit-tests/src/utest.ml unit-tests/src/utest.cmi
 	$(SHOW) 'OCAMLC  $<'
-	$(HIDE)$(OCAMLC) -c -I unit-tests/src -package oUnit $<
+	$(HIDE)$(OCAMLC) -c -I unit-tests/src -package ounit2 $<
 unit-tests/src/utest.cmi: unit-tests/src/utest.mli
 	$(SHOW) 'OCAMLC  $<'
-	$(HIDE)$(OCAMLC) -package oUnit -c $<
+	$(HIDE)$(OCAMLC) -package ounit2 -c $<
 
 unit-tests: $(UNIT_LOGFILES)
 
 # Build executable, run it to generate log file
 unit-tests/%.ml.log: unit-tests/%.ml unit-tests/src/$(UNIT_LINK)
 	$(SHOW) 'TEST      $<'
-	$(HIDE)$(OCAMLBEST) -linkall -linkpkg -package coq.toplevel,oUnit \
+	$(HIDE)$(OCAMLBEST) -linkall -linkpkg -package coq.toplevel,ounit2 \
 	     -I unit-tests/src $(UNIT_LINK) $< -o $<.test;
 	$(HIDE)./$<.test
 
diff --git a/test-suite/unit-tests/.merlin.in b/test-suite/unit-tests/.merlin.in
index b2279de74e..668b431d52 100644
--- a/test-suite/unit-tests/.merlin.in
+++ b/test-suite/unit-tests/.merlin.in
@@ -3,4 +3,4 @@ REC
 S **
 B **
 
-PKG oUnit
+PKG ounit2
-- 
cgit v1.2.3


From 5a77616b0997190c1a21469b7ddc659214a8aacc Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Tue, 18 Aug 2020 12:40:16 +0200
Subject: Dockerfile: Update ounit

---
 .gitlab-ci.yml                      | 2 +-
 dev/ci/docker/bionic_coq/Dockerfile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 32b05ec746..ffe0524639 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ stages:
 variables:
   # Format: $IMAGE-V$DATE [Cache is not used as of today but kept here
   # for reference]
-  CACHEKEY: "bionic_coq-V2020-07-21-V38"
+  CACHEKEY: "bionic_coq-V2020-08-18-V29"
   IMAGE: "$CI_REGISTRY_IMAGE:$CACHEKEY"
   # By default, jobs run in the base switch; override to select another switch
   OPAM_SWITCH: "base"
diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile
index 7570b17095..67a8415891 100644
--- a/dev/ci/docker/bionic_coq/Dockerfile
+++ b/dev/ci/docker/bionic_coq/Dockerfile
@@ -1,4 +1,4 @@
-# CACHEKEY: "bionic_coq-V2020-07-21-V38"
+# CACHEKEY: "bionic_coq-V2020-08-18-V29"
 # ^^ Update when modifying this file.
 
 FROM ubuntu:bionic
@@ -38,7 +38,7 @@ ENV COMPILER="4.05.0"
 # Common OPAM packages.
 # `num` does not have a version number as the right version to install varies
 # with the compiler version.
-ENV BASE_OPAM="num ocamlfind.1.8.1 ounit.2.2.2 odoc.1.5.0" \
+ENV BASE_OPAM="num ocamlfind.1.8.1 ounit2.2.2.3 odoc.1.5.0" \
     CI_OPAM="menhir.20190626 ocamlgraph.1.8.8" \
     BASE_ONLY_OPAM="elpi.1.11.0"
 
-- 
cgit v1.2.3