build: Use ounit2 (#23)

simonjbeaumont · Apr 21, 2022 · 334611a · 334611a
1 parent 936cff8
commit 334611a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.merlin b/.merlin
@@ -1,7 +1,7 @@
 PRJ pci
 PKG ctypes
 PKG ctypes.stubs
-PKG oUnit
+PKG ounit2
 
 S lib
 S lib_test

diff --git a/_oasis b/_oasis
@@ -58,7 +58,7 @@ Executable test_pci
   CompiledObject: best
   ByteOpt:        -warn-error +1..45
   NativeOpt:      -warn-error +1..45
-  BuildDepends:   pci, oUnit
+  BuildDepends:   pci, ounit2
 
 Test test_pci
   Command: $test_pci -runner sequential

diff --git a/_tags b/_tags
@@ -63,11 +63,11 @@ true: annot, bin_annot
 <lib_test/test_pci.{native,byte}>: oasis_executable_test_pci_native
 <lib_test/*.ml{,i,y}>: oasis_executable_test_pci_native
 <lib_test/test_pci.{native,byte}>: pkg_ctypes.stubs
-<lib_test/test_pci.{native,byte}>: pkg_oUnit
+<lib_test/test_pci.{native,byte}>: pkg_ounit2
 <lib_test/test_pci.{native,byte}>: use_pci
 <lib_test/test_pci.{native,byte}>: use_pci_bindings
 <lib_test/*.ml{,i,y}>: pkg_ctypes.stubs
-<lib_test/*.ml{,i,y}>: pkg_oUnit
+<lib_test/*.ml{,i,y}>: pkg_ounit2
 <lib_test/*.ml{,i,y}>: use_pci
 <lib_test/*.ml{,i,y}>: use_pci_bindings
 # Executable lspci

diff --git a/opam b/opam
@@ -21,7 +21,7 @@ remove: [
 depends: [
   "ctypes" {>= "0.4"}
   "ocamlfind" {build}
-  "ounit" {test}
+  "ounit2" {test}
 ]
 available: [ocaml-version >= "4.01.0" & os = "linux"]
 depexts: [

diff --git a/setup.ml b/setup.ml
@@ -7681,7 +7681,7 @@ let setup_t =
                       bs_build_depends =
                         [
                            InternalLibrary "pci";
-                           FindlibPackage ("oUnit", None)
+                           FindlibPackage ("ounit2", None)
                         ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
                       bs_interface_patterns =