From 1588ce90f28e601b99637cf8030a5834a40e0249 Mon Sep 17 00:00:00 2001
From: Jeremie Dimino <jdimino@janestreet.com>
Date: Wed, 7 Feb 2018 14:20:56 +0000
Subject: [PATCH] Update js_of_ocaml tests

---
 Makefile                                      |  6 +++
 .../test-cases/js_of_ocaml/run.t              | 38 +++++++++----------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index 265510d3..7f6c8143 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,12 @@ reinstall: uninstall reinstall
 test:
 	$(BIN) runtest --dev
 
+test-js:
+	$(BIN) build @runtest-js --dev
+
+test-all:
+	$(BIN) build @runtest @runtest-js --dev
+
 promote:
 	$(BIN) promote
 
diff --git a/test/blackbox-tests/test-cases/js_of_ocaml/run.t b/test/blackbox-tests/test-cases/js_of_ocaml/run.t
index 4ca877c0..5030227d 100644
--- a/test/blackbox-tests/test-cases/js_of_ocaml/run.t
+++ b/test/blackbox-tests/test-cases/js_of_ocaml/run.t
@@ -1,33 +1,33 @@
   $ $JBUILDER build -j1 --display short --root . --dev bin/technologic.bc.js @install lib/x.cma.js lib/x__Y.cmo.js bin/z.cmo.js
         ocamlc lib/stubs.o
       ocamlopt .ppx/js_of_ocaml-ppx/ppx.exe
-        ocamlc lib/x__.{cmi,cmo,cmt}
+        ocamlc lib/.x.objs/x__.{cmi,cmo,cmt}
     ocamlmklib lib/dllx_stubs.so,lib/libx_stubs.a
            ppx lib/x.pp.ml
            ppx lib/y.pp.ml
            ppx bin/technologic.pp.ml
            ppx bin/z.pp.ml
-      ocamlopt lib/x__.{cmx,o}
+      ocamlopt lib/.x.objs/x__.{cmx,o}
       ocamldep lib/x.pp.ml.d
       ocamldep lib/y.pp.ml.d
       ocamldep bin/technologic.pp.ml.d
       ocamldep bin/z.pp.ml.d
-        ocamlc lib/x__Y.{cmi,cmo,cmt}
+        ocamlc lib/.x.objs/x__Y.{cmi,cmo,cmt}
    js_of_ocaml .js/js_of_ocaml/js_of_ocaml.cma.js
    js_of_ocaml .js/stdlib/stdlib.cma.js
-      ocamlopt lib/x__Y.{cmx,o}
-   js_of_ocaml lib/x__Y.cmo.js
-        ocamlc lib/x.{cmi,cmo,cmt}
-      ocamlopt lib/x.{cmx,o}
+      ocamlopt lib/.x.objs/x__Y.{cmx,o}
+   js_of_ocaml lib/.x.objs/x__Y.cmo.js
+        ocamlc lib/.x.objs/x.{cmi,cmo,cmt}
+      ocamlopt lib/.x.objs/x.{cmx,o}
         ocamlc lib/x.cma
-        ocamlc bin/z.{cmi,cmo,cmt}
+        ocamlc bin/.technologic.eobjs/z.{cmi,cmo,cmt}
       ocamlopt lib/x.{a,cmxa}
    js_of_ocaml lib/x.cma.js
    js_of_ocaml bin/technologic.bc.runtime.js
-   js_of_ocaml bin/z.cmo.js
-        ocamlc bin/technologic.{cmi,cmo,cmt}
+   js_of_ocaml bin/.technologic.eobjs/z.cmo.js
+        ocamlc bin/.technologic.eobjs/technologic.{cmi,cmo,cmt}
       ocamlopt lib/x.cmxs
-   js_of_ocaml bin/technologic.cmo.js
+   js_of_ocaml bin/.technologic.eobjs/technologic.cmo.js
      jsoo_link bin/technologic.bc.js
   $ $NODE ./_build/default/bin/technologic.bc.js
   buy it
@@ -35,15 +35,15 @@
   break it
   fix it
   $ $JBUILDER build -j1 --display short --root . bin/technologic.bc.js @install
-        ocamlc lib/x__.{cmi,cmo,cmt}
-        ocamlc lib/x__Y.{cmi,cmo,cmt}
-      ocamlopt lib/x__.{cmx,o}
-        ocamlc lib/x.{cmi,cmo,cmt}
-      ocamlopt lib/x__Y.{cmx,o}
+        ocamlc lib/.x.objs/x__.{cmi,cmo,cmt}
+        ocamlc lib/.x.objs/x__Y.{cmi,cmo,cmt}
+      ocamlopt lib/.x.objs/x__.{cmx,o}
+        ocamlc lib/.x.objs/x.{cmi,cmo,cmt}
+      ocamlopt lib/.x.objs/x__Y.{cmx,o}
         ocamlc lib/x.cma
-        ocamlc bin/z.{cmi,cmo,cmt}
-      ocamlopt lib/x.{cmx,o}
-        ocamlc bin/technologic.{cmi,cmo,cmt}
+        ocamlc bin/.technologic.eobjs/z.{cmi,cmo,cmt}
+      ocamlopt lib/.x.objs/x.{cmx,o}
+        ocamlc bin/.technologic.eobjs/technologic.{cmi,cmo,cmt}
       ocamlopt lib/x.{a,cmxa}
         ocamlc bin/technologic.bc
       ocamlopt lib/x.cmxs