Client refactor: Move non-unix depend modules of stdlib-lwt
into stdlib
This commit is contained in:
parent
154b932713
commit
c55181273c
@ -3,7 +3,12 @@
|
|||||||
(library
|
(library
|
||||||
((name tezos_stdlib)
|
((name tezos_stdlib)
|
||||||
(public_name tezos-stdlib)
|
(public_name tezos-stdlib)
|
||||||
(libraries (ocplib-endian.bigstring cstruct stringext hex))
|
(libraries (ocplib-endian.bigstring
|
||||||
|
cstruct
|
||||||
|
stringext
|
||||||
|
hex
|
||||||
|
lwt
|
||||||
|
lwt.log))
|
||||||
(flags (:standard -safe-string))))
|
(flags (:standard -safe-string))))
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
(* *)
|
(* *)
|
||||||
(**************************************************************************)
|
(**************************************************************************)
|
||||||
|
|
||||||
open Error_monad
|
open Lwt.Infix
|
||||||
|
|
||||||
type t =
|
type t =
|
||||||
{ mutable pending_tasks : unit Lwt.u list ;
|
{ mutable pending_tasks : unit Lwt.u list ;
|
@ -154,7 +154,7 @@ let rec peek ({ closed ; queue ; _ } as q) =
|
|||||||
wait_push q >>= fun () ->
|
wait_push q >>= fun () ->
|
||||||
peek q
|
peek q
|
||||||
|
|
||||||
let peek_all { queue ; closed } =
|
let peek_all { queue ; closed ; _ } =
|
||||||
if closed then
|
if closed then
|
||||||
[]
|
[]
|
||||||
else
|
else
|
@ -2,8 +2,10 @@
|
|||||||
|
|
||||||
(executables
|
(executables
|
||||||
((names (test_tzList
|
((names (test_tzList
|
||||||
test_mbytes_buffer))
|
test_mbytes_buffer
|
||||||
(libraries (tezos-stdlib tezos-test-helpers))
|
test_lwt_pipe))
|
||||||
|
(libraries (tezos-stdlib
|
||||||
|
tezos-test-helpers))
|
||||||
(flags (:standard -w -9-32
|
(flags (:standard -w -9-32
|
||||||
-safe-string
|
-safe-string
|
||||||
-open Tezos_test_helpers
|
-open Tezos_test_helpers
|
||||||
@ -12,7 +14,8 @@
|
|||||||
(alias
|
(alias
|
||||||
((name buildtest)
|
((name buildtest)
|
||||||
(deps (test_tzList.exe
|
(deps (test_tzList.exe
|
||||||
test_mbytes_buffer.exe))))
|
test_mbytes_buffer.exe
|
||||||
|
test_lwt_pipe.exe))))
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
((name runtest_tzList)
|
((name runtest_tzList)
|
||||||
@ -22,10 +25,15 @@
|
|||||||
((name runtest_mbytes_buffer)
|
((name runtest_mbytes_buffer)
|
||||||
(action (run ${exe:test_mbytes_buffer.exe}))))
|
(action (run ${exe:test_mbytes_buffer.exe}))))
|
||||||
|
|
||||||
|
(alias
|
||||||
|
((name runtest_lwt_pipe)
|
||||||
|
(action (run ${exe:test_lwt_pipe.exe}))))
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
((name runtest)
|
((name runtest)
|
||||||
(deps ((alias runtest_tzList)
|
(deps ((alias runtest_tzList)
|
||||||
(alias runtest_mbytes_buffer)))))
|
(alias runtest_mbytes_buffer)
|
||||||
|
(alias runtest_lwt_pipe)))))
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
((name runtest_indent)
|
((name runtest_indent)
|
||||||
|
@ -14,6 +14,7 @@ depends: [
|
|||||||
"hex"
|
"hex"
|
||||||
"ocplib-endian"
|
"ocplib-endian"
|
||||||
"stringext"
|
"stringext"
|
||||||
|
"lwt"
|
||||||
]
|
]
|
||||||
build: [
|
build: [
|
||||||
[ "jbuilder" "build" "-p" name "-j" jobs ]
|
[ "jbuilder" "build" "-p" name "-j" jobs ]
|
||||||
|
@ -1,27 +0,0 @@
|
|||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(executables
|
|
||||||
((names (test_lwt_pipe))
|
|
||||||
(libraries (tezos-stdlib-lwt tezos-test-helpers))
|
|
||||||
(flags (:standard -w -9-32
|
|
||||||
-safe-string
|
|
||||||
-open Tezos_test_helpers
|
|
||||||
-open Tezos_stdlib_lwt))))
|
|
||||||
|
|
||||||
(alias
|
|
||||||
((name buildtest)
|
|
||||||
(deps (test_lwt_pipe.exe))))
|
|
||||||
|
|
||||||
(alias
|
|
||||||
((name runtest_lwt_pipe)
|
|
||||||
(action (run ${exe:test_lwt_pipe.exe}))))
|
|
||||||
|
|
||||||
|
|
||||||
(alias
|
|
||||||
((name runtest)
|
|
||||||
(deps ((alias runtest_lwt_pipe)))))
|
|
||||||
|
|
||||||
(alias
|
|
||||||
((name runtest_indent)
|
|
||||||
(deps ((glob_files *.ml*)))
|
|
||||||
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))
|
|
Loading…
Reference in New Issue
Block a user