diff --git a/.merlin b/.merlin index f18d84c..e5b208a 100644 --- 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 index 53db238..0443598 100644 --- 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 index 81eaa26..b8e20fc 100644 --- a/_tags +++ b/_tags @@ -63,11 +63,11 @@ true: annot, bin_annot : oasis_executable_test_pci_native : oasis_executable_test_pci_native : pkg_ctypes.stubs -: pkg_oUnit +: pkg_ounit2 : use_pci : use_pci_bindings : pkg_ctypes.stubs -: pkg_oUnit +: pkg_ounit2 : use_pci : use_pci_bindings # Executable lspci diff --git a/opam b/opam index bc03b69..6e5e197 100644 --- 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 index c3907bf..b1f3074 100644 --- 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 =