aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanaka Akira2020-08-07 23:35:51 +0900
committerGaƫtan Gilbert2020-08-18 12:39:02 +0200
commit2431bb8aa58f572104683491bb7c534ebaaf45d8 (patch)
tree456d344f342689327effc2070d5e3f2e64e0969c
parentaa926429727f1f6b5ef07c8912f2618d53f6d155 (diff)
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`.
-rw-r--r--test-suite/Makefile8
-rw-r--r--test-suite/unit-tests/.merlin.in2
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