Refactor tests.

DavidAlphaFox · May 22, 2024 · cfc6084 · cfc6084
1 parent 2f43dd6
commit cfc6084
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/dune-project b/dune-project
@@ -4,7 +4,7 @@
 (name camlkit)
 (version 0.1.1)
 
-(generate_opam_files true)
+(generate_opam_files false)
 
 (source (github dboris/camlkit))
 

diff --git a/test/dune → test/test-camlkit-base/dune b/test/dune → test/test-camlkit-base/dune
@@ -1,19 +1,13 @@
 (test
  (name test_objc)
  (modules test_objc)
+ (package camlkit-base)
  (build_if (= %{context_name} "default"))
  (libraries camlkit-base.foundation camlkit-base.runtime alcotest))
 
-(test
- (name test_camlkit)
- (modules test_camlkit)
- (build_if (and
- %{lib-available:camlkit}
- (= %{context_name} "default")))
- (libraries camlkit-base.foundation camlkit-base.runtime camlkit alcotest))
-
 (test
  (name test_stret)
  (modules test_stret)
+ (package camlkit-base)
  (build_if (= %{context_name} "default"))
  (libraries camlkit-base.foundation camlkit-base.runtime alcotest))
diff --git a/test/test_objc.ml → test/test-camlkit-base/test_objc.ml b/test/test_objc.ml → test/test-camlkit-base/test_objc.ml
diff --git a/test/test_stret.ml → test/test-camlkit-base/test_stret.ml b/test/test_stret.ml → test/test-camlkit-base/test_stret.ml
diff --git a/test/test-camlkit/dune b/test/test-camlkit/dune
@@ -0,0 +1,6 @@
+(test
+ (name test_camlkit)
+ (modules test_camlkit)
+ (package camlkit)
+ (build_if (= %{context_name} "default"))
+ (libraries camlkit-base.foundation camlkit-base.runtime camlkit alcotest))
diff --git a/test/test_camlkit.ml → test/test-camlkit/test_camlkit.ml b/test/test_camlkit.ml → test/test-camlkit/test_camlkit.ml