Skip to content

Commit 7ddc05b

Browse files
committed
Move all test/ into melange
1 parent 205e860 commit 7ddc05b

File tree

18 files changed

+54
-20
lines changed

18 files changed

+54
-20
lines changed

src/js/dune

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
(name promise_js)
33
(public_name promise.melange)
44
(modes melange)
5+
(wrapped false)
56
(libraries melange.belt)
67
(preprocess
78
(pps melange.ppx))

test/bundle/dune

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
(library
2+
(name bundle)
3+
(modes melange)
4+
(libraries melange.belt promise.melange))

test/dune

Lines changed: 0 additions & 3 deletions
This file was deleted.

test/ffi/js/dune

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
(library
2+
(name test_ffi_js)
3+
(modes melange)
4+
(libraries framework_js)
5+
(wrapped false)
6+
(preprocess
7+
(pps melange.ppx)))
8+
9+
(copy_files
10+
(mode fallback)
11+
(files ../native/*.re))

test/js/test_ffi.re renamed to test/ffi/js/test_ffi.re

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66

7-
[%%bs.raw {|
7+
[%%mel.raw {|
88
function isPromise (p) {
99
return (p instanceof Promise);
1010
}
@@ -14,13 +14,8 @@ function isPromiseLike(v) {
1414
};
1515
|}];
1616

17-
[@bs.val]
1817
external isPromise: Promise.Js.t(_, _) => bool = "isPromise";
19-
20-
[@bs.val]
2118
external jsPromiseIsPromise: Js.Promise.t(_) => bool = "isPromise";
22-
23-
[@bs.val]
2419
external jsPromiseIsPromiseLike: Js.Promise.t(_) => bool = "isPromiseLike";
2520

2621

@@ -70,15 +65,15 @@ let interopTests = Framework.suite("interop", [
7065
}),
7166

7267
test("js promise is reason-promise", () => {
73-
let js_promise: Promise.t(int) = [%bs.raw {|Promise.resolve(1)|}];
68+
let js_promise: Promise.t(int) = [%mel.raw {|Promise.resolve(1)|}];
7469
js_promise
7570
->Promise.flatMap(n => Promise.resolved(n + 1))
7671
->Promise.flatMap(n => Promise.resolved(n == 2));
7772
}),
7873

7974
test("reason-promise as js argument", () => {
8075
module Then = {
81-
[@bs.send.pipe: Promise.t('a)]
76+
[@mel.send.pipe: Promise.t('a)]
8277
external js_then: ('a => Promise.t('b)) => Promise.t('b) =
8378
"then";
8479
};
@@ -243,7 +238,7 @@ let soundnessTests = Framework.suite("soundness", [
243238

244239
[@ocaml.warning "-33"]
245240
test("resolved: Almost-Promise-like", () => {
246-
let open Js_OO;
241+
/* let open Js_OO; */
247242
Promise.resolved(makeAlmostPromiseLike(42))
248243
->Promise.flatMap(x => Promise.resolved(x##_then == 42));
249244
}),

test/ffi/native/dune

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
(library
2+
(name test_ffi)
3+
(libraries framework))
File renamed without changes.

test/framework/dune

Lines changed: 0 additions & 3 deletions
This file was deleted.

test/framework/js/dune

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
(library
2+
(name framework_js)
3+
(modes melange)
4+
(wrapped false)
5+
(libraries promise_js))
6+
7+
(copy_files
8+
(mode fallback)
9+
(files ../native/*.re))

test/framework/native/dune

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
(library
2-
(name run)
2+
(name framework)
33
(libraries promise))
File renamed without changes.
File renamed without changes.

test/isoresult/js/dune

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
(library
2+
(name isoresult_js)
3+
(modes melange)
4+
(wrapped false)
5+
(libraries melange.belt))

test/js/benchmark.re

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ let test = Framework.test;
88

99

1010

11-
[@bs.val]
1211
external hrtime: unit => (int, int) = "process.hrtime";
1312

1413
let hrtime = () => {

test/js/dune

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
; (executable
2+
; (name test_main)
3+
; (libraries isoresult promise test_ffi))
4+
5+
(copy_files
6+
(mode fallback)
7+
(files ../native/*.re))
8+
9+
(melange.emit
10+
(target test)
11+
(libraries framework_js promise_js isoresult_js test_ffi_js)
12+
(preprocess
13+
(pps melange.ppx)))

test/native/dune

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
(library
2-
(name test_ffi)
3-
(libraries framework))
1+
(executable
2+
(name test_main)
3+
(libraries isoresult promise test_ffi))
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)