Resto/Jbuilder: fix test packaging

vendors/ocplib-resto/lib_ezresto-directory/test/jbuild

@@ -0,0 +1,14 @@
+(jbuild_version 1)
+
+(executable
+ ((name ezResto_test)
+  (modules (EzServices EzDirectory EzResto_test))
+  (libraries (ocplib-ezresto-directory lwt.unix))))
+
+(alias
+((name runtest_ezresto)
+ (action (run ${path:ezResto_test.exe}))))
+
+(alias
+((name runtest)
+ (deps ((alias runtest_ezresto)))))

vendors/ocplib-resto/lib_resto-directory/ocplib-resto-directory.opam

@@ -19,6 +19,7 @@ build-test: [
 depends: [
   "ocamlfind" {build}
   "jbuilder" {build}
-  "ocplib-resto"
+  "ocplib-resto" {= "dev" }
-  "lwt"
+  "ocplib-resto-json" {= "dev" & test }
+  "lwt" { >= "3.0.0" }
 ]

vendors/ocplib-resto/lib_resto-directory/test/jbuild

@@ -0,0 +1,14 @@
+(jbuild_version 1)
+
+(executable
+ ((name resto_test)
+  (modules (Services Directory Resto_test))
+  (libraries (ocplib-resto-directory ocplib-resto-json lwt.unix))))
+
+(alias
+((name runtest_resto)
+ (action (run ${path:resto_test.exe}))))
+
+(alias
+((name runtest)
+ (deps ((alias runtest_resto)))))

vendors/ocplib-resto/test/jbuild

@@ -1,24 +0,0 @@
-(jbuild_version 1)
-
-(executable
- ((name resto_test)
-  (modules (Services Directory Resto_test))
-  (libraries (ocplib-resto-directory ocplib-resto-json lwt.unix))))
-
-(alias
-((name runtest_resto)
- (action (run ${path:resto_test.exe}))))
-
-(executable
- ((name ezResto_test)
-  (modules (EzServices EzDirectory EzResto_test))
-  (libraries (ocplib-ezresto-directory lwt.unix))))
-
-(alias
-((name runtest_ezresto)
- (action (run ${path:ezResto_test.exe}))))
-
-(alias
-((name runtest)
- (deps ((alias runtest_resto)
-        (alias runtest_ezresto)))))