From cfc6084c81d27d4559df05bee9bd3f443d575a30 Mon Sep 17 00:00:00 2001
From: "Boris D." <boris.dob@gmail.com>
Date: Wed, 22 May 2024 11:24:32 -0700
Subject: [PATCH] Refactor tests.

---
 dune-project                               |  2 +-
 test/{ => test-camlkit-base}/dune          | 10 ++--------
 test/{ => test-camlkit-base}/test_objc.ml  |  0
 test/{ => test-camlkit-base}/test_stret.ml |  0
 test/test-camlkit/dune                     |  6 ++++++
 test/{ => test-camlkit}/test_camlkit.ml    |  0
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename test/{ => test-camlkit-base}/dune (60%)
 rename test/{ => test-camlkit-base}/test_objc.ml (100%)
 rename test/{ => test-camlkit-base}/test_stret.ml (100%)
 create mode 100644 test/test-camlkit/dune
 rename test/{ => test-camlkit}/test_camlkit.ml (100%)

diff --git a/dune-project b/dune-project
index 7f1d67ce..a9ae8b53 100644
--- 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 b/test/test-camlkit-base/dune
similarity index 60%
rename from test/dune
rename to test/test-camlkit-base/dune
index 1fb4b363..f6934a3b 100644
--- a/test/dune
+++ b/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 b/test/test-camlkit-base/test_objc.ml
similarity index 100%
rename from test/test_objc.ml
rename to test/test-camlkit-base/test_objc.ml
diff --git a/test/test_stret.ml b/test/test-camlkit-base/test_stret.ml
similarity index 100%
rename from test/test_stret.ml
rename to test/test-camlkit-base/test_stret.ml
diff --git a/test/test-camlkit/dune b/test/test-camlkit/dune
new file mode 100644
index 00000000..75d4977b
--- /dev/null
+++ 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))
\ No newline at end of file
diff --git a/test/test_camlkit.ml b/test/test-camlkit/test_camlkit.ml
similarity index 100%
rename from test/test_camlkit.ml
rename to test/test-camlkit/test_camlkit.ml