Use dune test stanza

Author: vouillon

compiler/tests-env/dune

@@ -1,27 +1,11 @@
-(executable
+(test
  (modes js)
  (js_of_ocaml
+  (javascript_files setup.js)
   (flags :standard --setenv JSOO_C=from-jsoo-args))
- (name test))
-
-(rule
- (target test.js)
- (action
-  (with-outputs-to
-   %{target}
-   (cat %{dep:setup.js} %{dep:./test.bc.js}))))
-
-(rule
- (target test.output)
  (action
-  (with-outputs-to
-   %{target}
-   (setenv
-    JSOO_B
-    from-env
-    (run node %{dep:./test.js})))))
-
-(rule
- (alias runtest)
- (action
-  (diff test.reference test.output)))
+  (setenv
+   JSOO_B
+   from-env
+   (run node %{test})))
+ (name test))

compiler/tests-env/test.reference renamed to compiler/tests-env/test.expected

@@ -5,7 +5,7 @@
   (js_of_ocaml
    (compilation_mode separate))))
 
-(executable
+(test
  (name test)
  (modes byte js)
  (libraries dynlink)
@@ -15,15 +15,3 @@
  ;; Let's use it for the test
  (link_flags
   (:standard -linkall)))
-
-(rule
- (target test.output)
- (action
-  (with-stdout-to
-   %{target}
-   (run node %{dep:test.bc.js}))))
-
-(rule
- (alias runtest)
- (action
-  (diff test.reference test.output)))

compiler/tests-linkall/dune

@@ -1,4 +1,4 @@
-(executable
+(test
  (name main)
  (modules main test_nats test test_big_ints test_ratios test_nums test_io)
  (libraries num)
@@ -9,23 +9,9 @@
   (:standard -linkall -w -3-7-33-35-37 -safe-string -no-strict-sequence)))
 
 (rule
- (target main.referencejs)
- (deps main.bc.js)
- (action
-  (with-stdout-to
-   %{target}
-   (run node ./main.bc.js))))
-
-(rule
- (target main.reference)
+ (target main.expected)
  (deps main.exe)
  (action
   (with-stdout-to
    %{target}
    (run ./main.exe))))
-
-(rule
- (alias runtest)
- (deps main.reference main.referencejs)
- (action
-  (diff main.reference main.referencejs)))

compiler/tests-linkall/test.reference renamed to compiler/tests-linkall/test.expected

@@ -1,18 +1,4 @@
-(executables
+(tests
  (names recursive_module_init)
  (libraries)
  (modes js))
-
-(rule
- (target recursive_module_init.referencejs)
- (deps recursive_module_init.bc.js)
- (action
-  (with-stdout-to
-   %{target}
-   (run node ./recursive_module_init.bc.js))))
-
-(rule
- (alias runtest)
- (deps recursive_module_init.reference recursive_module_init.referencejs)
- (action
-  (diff recursive_module_init.reference recursive_module_init.referencejs)))

compiler/tests-num/dune

@@ -1,10 +1,3 @@
-(executables
- (names test_atomic)
- (libraries)
+(test
+ (name test_atomic)
  (modes js))
-
-(rule
- (alias runtest)
- (deps test_atomic.bc.js)
- (action
-  (run node test_atomic.bc.js)))